From da09fb28a531fe0ea717f0f764ba77e19e5b414c Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Mon, 11 Mar 2019 11:29:58 +0800 Subject: [PATCH] rename ops to admin and fix some broken links (#331) some links are broken after renaming dubbo-ops to dubbo-admin, though not all of the links are broken, they are updated as well for consistency --- DISCLAIMER | 2 +- LICENSE | 4 ++-- NOTICE | 2 +- README.md | 18 +++++++++--------- README_ZH.md | 14 +++++++------- dubbo-admin-distribution/pom.xml | 2 +- dubbo-admin-distribution/src/LICENSE | 4 ++-- dubbo-admin-distribution/src/NOTICE | 2 +- .../dubbo/admin/config/ConfigCenter.java | 8 ++++---- .../admin/config/SwaggerConfiguration.java | 4 ++-- dubbo-admin-ui/index.html | 2 +- dubbo-admin-ui/src/lang/en.js | 2 +- dubbo-admin-ui/src/lang/zh.js | 2 +- dubbo-admin-ui/src/store/index.js | 2 +- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/DISCLAIMER b/DISCLAIMER index 13b8560..e69787d 100644 --- a/DISCLAIMER +++ b/DISCLAIMER @@ -1 +1 @@ -Apache Dubbo OPS is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. +Apache Dubbo Admin is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/LICENSE b/LICENSE index fe37d29..6b0cc58 100644 --- a/LICENSE +++ b/LICENSE @@ -202,9 +202,9 @@ limitations under the License. -Apache Dubbo Ops Submodules: +Apache Dubbo Admin Submodules: -Apache Dubbo Ops includes a number of submodules with separate copyright notices +Apache Dubbo Admin includes a number of submodules with separate copyright notices and license terms. Your use of these submodules is subject to the terms and conditions of the following licenses. diff --git a/NOTICE b/NOTICE index 320e335..ca90c8b 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache Dubbo OPS (incubating) +Apache Dubbo Admin (incubating) Copyright 2018-2019 The Apache Software Foundation This product includes software developed at diff --git a/README.md b/README.md index bad9e53..45af154 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Dubbo Admin -[![Build Status](https://travis-ci.org/apache/incubator-dubbo-ops.svg?branch=develop)](https://travis-ci.org/apache/incubator-dubbo-ops) -[![codecov](https://codecov.io/gh/apache/incubator-dubbo-ops/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-ops) -![license](https://img.shields.io/github/license/apache/incubator-dubbo-ops.svg) +[![Build Status](https://travis-ci.org/apache/incubator-dubbo-admin.svg?branch=develop)](https://travis-ci.org/apache/incubator-dubbo-admin) +[![codecov](https://codecov.io/gh/apache/incubator-dubbo-admin/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-admin) +![license](https://img.shields.io/github/license/apache/incubator-dubbo-admin.svg) [中文说明](README_ZH.md) ### Demo Address @@ -10,10 +10,10 @@ * this demo is the latest version of `develop` branch, you can try it before building from source code ### Screenshot -![index](https://raw.githubusercontent.com/apache/incubator-dubbo-ops/develop/doc/images/index.png) +![index](https://raw.githubusercontent.com/apache/incubator-dubbo-admin/develop/doc/images/index.png) ### Service Governance -service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.6, please refer to [here](https://github.com/apache/incubator-dubbo-ops/wiki/The-compatibility-of-service-governance) +service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.6, please refer to [here](https://github.com/apache/incubator-dubbo-admin/wiki/The-compatibility-of-service-governance) ### admin UI - [Vue.js](https://vuejs.org) and [Vuetify](https://vuetifyjs.com) @@ -23,12 +23,12 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2. ### admin Server * Standard spring boot project -* [configurations in application.properties](https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin-configuration) +* [configurations in application.properties](https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration) ### Production Setup -1. Clone source code on develop branch `git clone https://github.com/apache/incubator-dubbo-ops.git` +1. Clone source code on develop branch `git clone https://github.com/apache/incubator-dubbo-admin.git` 2. Specify registry address in `dubbo-admin-server/src/main/resources/application-production.properties` 3. Build @@ -57,5 +57,5 @@ Once deployed, you can check http://localhost:8080/swagger-ui.html to check all ### License -Apache Dubbo ops is under the Apache 2.0 license, Version 2.0. -See [LICENSE](https://github.com/apache/incubator-dubbo-ops/blob/develop/LICENSE) for full license text. +Apache Dubbo admin is under the Apache 2.0 license, Version 2.0. +See [LICENSE](https://github.com/apache/incubator-dubbo-admin/blob/develop/LICENSE) for full license text. diff --git a/README_ZH.md b/README_ZH.md index c3c3455..2fbbbb3 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -1,8 +1,8 @@ # Dubbo控制台 -[![Build Status](https://travis-ci.org/apache/incubator-dubbo-ops.svg?branch=develop)](https://travis-ci.org/apache/incubator-dubbo-ops) -[![codecov](https://codecov.io/gh/apache/incubator-dubbo-ops/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-ops) -![license](https://img.shields.io/github/license/apache/incubator-dubbo-ops.svg) +[![Build Status](https://travis-ci.org/apache/incubator-dubbo-admin.svg?branch=develop)](https://travis-ci.org/apache/incubator-dubbo-admin) +[![codecov](https://codecov.io/gh/apache/incubator-dubbo-admin/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-admin) +![license](https://img.shields.io/github/license/apache/incubator-dubbo-admin.svg) [English version](README.md). ### Demo地址 @@ -10,10 +10,10 @@ * 该地址是`develop`分支的最新版本，在从源码构建之前，可以先尝试demo ### 页面截图 -![index](https://raw.githubusercontent.com/apache/incubator-dubbo-ops/develop/doc/images/index.png) +![index](https://raw.githubusercontent.com/apache/incubator-dubbo-admin/develop/doc/images/index.png) ### 服务治理 -服务治理的部分，按照Dubbo 2.7的格式进行配置，同时兼容Dubbo 2.6，详见[这里](https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin%E6%9C%8D%E5%8A%A1%E6%B2%BB%E7%90%86%E5%85%BC%E5%AE%B9%E6%80%A7%E8%AF%B4%E6%98%8E) +服务治理的部分，按照Dubbo 2.7的格式进行配置，同时兼容Dubbo 2.6，详见[这里](https://github.com/apache/incubator-dubbo-admin/wiki/%E6%9C%8D%E5%8A%A1%E6%B2%BB%E7%90%86%E5%85%BC%E5%AE%B9%E6%80%A7%E8%AF%B4%E6%98%8E) ### 前端部分 - 使用[Vue.js](https://vuejs.org)作为javascript框架，[Vuetify](https://vuetifyjs.com)作为UI框架 @@ -23,12 +23,12 @@ ### 后端部分 * 标准spring boot工程 -* [application.properties配置说明](https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E) +* [application.properties配置说明](https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E) ### 生产环境配置 -1. 下载代码: `git clone https://github.com/apache/incubator-dubbo-ops.git` +1. 下载代码: `git clone https://github.com/apache/incubator-dubbo-admin.git` 2. 在 `dubbo-admin-server/src/main/resources/application-production.properties`中指定注册中心地址 3. 构建 diff --git a/dubbo-admin-distribution/pom.xml b/dubbo-admin-distribution/pom.xml index 6bed864..244444e 100644 --- a/dubbo-admin-distribution/pom.xml +++ b/dubbo-admin-distribution/pom.xml @@ -68,7 +68,7 @@ release - apache-dubbo-ops-incubating-${project.version} + apache-dubbo-admin-incubating-${project.version} maven-assembly-plugin diff --git a/dubbo-admin-distribution/src/LICENSE b/dubbo-admin-distribution/src/LICENSE index ba46347..18c5d21 100644 --- a/dubbo-admin-distribution/src/LICENSE +++ b/dubbo-admin-distribution/src/LICENSE @@ -202,9 +202,9 @@ limitations under the License. -Apache Dubbo Ops Submodules: +Apache Dubbo Admin Submodules: -Apache Dubbo Ops includes a number of submodules with separate copyright notices +Apache Dubbo Admin includes a number of submodules with separate copyright notices and license terms. Your use of these submodules is subject to the terms and conditions of the following licenses. diff --git a/dubbo-admin-distribution/src/NOTICE b/dubbo-admin-distribution/src/NOTICE index 3c23515..eba0b22 100644 --- a/dubbo-admin-distribution/src/NOTICE +++ b/dubbo-admin-distribution/src/NOTICE @@ -1,4 +1,4 @@ -Apache Dubbo OPS (incubating) +Apache Dubbo Admin (incubating) Copyright 2018-2019 The Apache Software Foundation This product includes software developed at diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java index 369bb73..e0bbe0d 100644 --- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java +++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java @@ -99,9 +99,9 @@ public class ConfigCenter { dynamicConfiguration = ExtensionLoader.getExtensionLoader(GovernanceConfiguration.class).getExtension(registryUrl.getProtocol()); dynamicConfiguration.setUrl(registryUrl); dynamicConfiguration.init(); - logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin-configuration"); + logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration"); } else { - throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin-configuration"); + throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration"); //throw exception } } @@ -117,7 +117,7 @@ public class ConfigCenter { Registry registry = null; if (registryUrl == null) { if (StringUtils.isBlank(registryAddress)) { - throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin-configuration"); + throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration"); } registryUrl = formUrl(registryAddress, group, username, password); } @@ -143,7 +143,7 @@ public class ConfigCenter { metaDataCollector.setUrl(metadataUrl); metaDataCollector.init(); } else { - logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin-configuration"); + logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration"); } return metaDataCollector; } diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/SwaggerConfiguration.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/SwaggerConfiguration.java index 5814927..a4a4e8a 100644 --- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/SwaggerConfiguration.java +++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/SwaggerConfiguration.java @@ -42,8 +42,8 @@ public class SwaggerConfiguration { private ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("dubbo ops swagger api") - .description("for more information please visit github page: https://github.com/apache/incubator-dubbo-ops") + .title("dubbo admin swagger api") + .description("for more information please visit github page: https://github.com/apache/incubator-dubbo-admin") .version("1.0") .build(); } diff --git a/dubbo-admin-ui/index.html b/dubbo-admin-ui/index.html index cdfd055..2718725 100644 --- a/dubbo-admin-ui/index.html +++ b/dubbo-admin-ui/index.html @@ -20,7 +20,7 @@ - Dubbo OPS + Dubbo Admin diff --git a/dubbo-admin-ui/src/lang/en.js b/dubbo-admin-ui/src/lang/en.js index 85820e8..af39aff 100644 --- a/dubbo-admin-ui/src/lang/en.js +++ b/dubbo-admin-ui/src/lang/en.js @@ -82,7 +82,7 @@ export default { parameterList: 'parameterList', returnType: 'returnType', here: 'here', - configAddress: 'https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin-configuration', + configAddress: 'https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration', whiteList: 'White List', whiteListHint: 'White list IP address, divided by comma: 1.1.1.1,2.2.2.2', blackList: 'Black List', diff --git a/dubbo-admin-ui/src/lang/zh.js b/dubbo-admin-ui/src/lang/zh.js index 3b7a4d6..9a03cfe 100644 --- a/dubbo-admin-ui/src/lang/zh.js +++ b/dubbo-admin-ui/src/lang/zh.js @@ -82,7 +82,7 @@ export default { returnType: '返回值', noMetadataHint: '无元数据信息，请升级至Dubbo2.7及以上版本，或者查看application.properties中关于config center的配置，详见', here: '这里', - configAddress: 'https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E', + configAddress: 'https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E', whiteList: '白名单', whiteListHint: '白名单IP列表, 多个地址用逗号分隔: 1.1.1.1,2.2.2.2', blackList: '黑名单', diff --git a/dubbo-admin-ui/src/store/index.js b/dubbo-admin-ui/src/store/index.js index f894271..97e9947 100644 --- a/dubbo-admin-ui/src/store/index.js +++ b/dubbo-admin-ui/src/store/index.js @@ -22,7 +22,7 @@ Vue.use(Vuex) export const store = new Vuex.Store({ state: { - appTitle: 'Dubbo OPS', + appTitle: 'Dubbo Admin', area: null, serviceItems: null, appItems: null -- GitLab