Skip to content

Commit

Permalink
rename ops to admin and fix some broken links (#331)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kezhenxu94 authored and nzomkxia committed Mar 11, 2019
1 parent 98b4bcd commit da09fb2
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion DISCLAIMER
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# 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
* http://47.91.207.147/#/service
* 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)
Expand All @@ -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

Expand Down Expand Up @@ -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.
14 changes: 7 additions & 7 deletions README_ZH.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# 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地址
* http://47.91.207.147/#/service
* 该地址是`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框架
Expand All @@ -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. 构建

Expand Down
2 changes: 1 addition & 1 deletion dubbo-admin-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<profile>
<id>release</id>
<build>
<finalName>apache-dubbo-ops-incubating-${project.version}</finalName>
<finalName>apache-dubbo-admin-incubating-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions dubbo-admin-distribution/src/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion dubbo-admin-distribution/src/NOTICE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ GovernanceConfiguration getDynamicConfiguration() {
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
}
}
Expand All @@ -117,7 +117,7 @@ Registry getRegistry() {
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);
}
Expand All @@ -143,7 +143,7 @@ MetaDataCollector getMetadataCollector() {
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public Docket createRestApi() {

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();
}
Expand Down
2 changes: 1 addition & 1 deletion dubbo-admin-ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>Dubbo OPS</title>
<title>Dubbo Admin</title>
<link href='/static/OpenSans.css' rel="stylesheet" type="text/css">
<link rel="shortcut icon" href="/static/dubbo.ico" type="image/x-icon">
</head>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-admin-ui/src/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion dubbo-admin-ui/src/lang/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '黑名单',
Expand Down
2 changes: 1 addition & 1 deletion dubbo-admin-ui/src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit da09fb2

Please sign in to comment.