This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
The following commit(s) were added to refs/heads/master by this push: new 457801b Refresh website based on the latest community updates 457801b is described below commit 457801b4b39fec6ebe1bb60ec0edcf2f9c23554d Author: MabinGo <bin...@huawei.com> AuthorDate: Wed Nov 14 10:41:07 2018 +0800 Refresh website based on the latest community updates Signed-off-by: MabinGo <bin...@huawei.com> --- _developers/cn/contributing.md | 22 ++++++++++---------- _developers/cn/developer-guide.md | 12 +++++------ _developers/cn/release_guide.md | 16 +++++++-------- _developers/cn/setup-develop-environment.md | 4 ++-- _developers/cn/submit-codes.md | 22 ++++++++++---------- _developers/cn/subscribe-mail-list.md | 6 +++--- _developers/contributing.md | 14 ++++++------- _developers/developer-guide.md | 12 +++++------ _developers/release_guide.md | 16 +++++++-------- _developers/setup-develop-environment.md | 4 ++-- _developers/submit-codes.md | 24 +++++++++++----------- _docs/cn/load-balance.md | 2 +- _docs/cn/quick-start-bmi.md | 2 +- _docs/cn/quick-start-dataconsistency.md | 6 +++--- _docs/cn/quick-start.md | 4 ++-- _docs/load-balance.md | 2 +- _docs/quick-start-bmi.md | 2 +- _docs/quick-start-dataconsistency.md | 6 +++--- _docs/quick-start.md | 4 ++-- _faqs/cn/faq.md | 4 ++-- _faqs/faq.md | 2 +- _users/cn/deploy-mode.md | 6 +++--- _users/cn/develop-with-jax-rs.md | 4 ++-- _users/cn/develop-with-springboot-starter.md | 2 +- _users/cn/develop-with-springmvc.md | 4 ++-- _users/cn/develop-with-transparent-rpc.md | 4 ++-- _users/cn/edge-in-1.0.0-m1.md | 2 +- _users/cn/metrics-in-0.5.0.md | 2 +- _users/cn/metrics-in-1.0.0-m1.md | 2 +- ...rics-integration-with-prometheus-in-1.0.0-m1.md | 2 +- ...-write-file-extension-and-sample-in-1.0.0-m1.md | 2 +- _users/cn/setup-environment.md | 6 +++--- _users/develop-with-jax-rs.md | 4 ++-- _users/develop-with-springboot-starter.md | 2 +- _users/develop-with-springmvc.md | 4 ++-- _users/develop-with-transparent-rpc.md | 4 ++-- _users/edge-in-1.0.0-m1.md | 2 +- _users/faq.md | 2 +- _users/metrics-in-1.0.0-m1.md | 2 +- ...rics-integration-with-prometheus-in-1.0.0-m1.md | 2 +- script/bootstrap | 2 +- script/deploy | 2 +- 42 files changed, 124 insertions(+), 124 deletions(-) diff --git a/_developers/cn/contributing.md b/_developers/cn/contributing.md old mode 100644 new mode 100755 index 0b5136c..a058c22 --- a/_developers/cn/contributing.md +++ b/_developers/cn/contributing.md @@ -12,15 +12,15 @@ last_modified_at: 2018-05-20T19:18:43+08:00 * 浏览文档,这样可以加深您对ServiceComb的了解,学习到知识,一旦发现文档写得不清晰或逻辑混乱的地方,请通知我们; * 下载代码,试一试我们介绍的功能,看看它是否与您预想的一样工作; -* 分析源代码,如果希望了解更多技术细节,请在[Gitter](http://servicecomb.incubator.apache.org/cn/developers/use-gitter/)上提问,大家会尽快解答; -* 希望炫一把黑科技体现您的实力?看看我们的 [issue tracker](https://issues.apache.org/jira/browse/SCB) 吧,欢迎您承接Open状态的Issues和未完成的特性,提交[PR](http://servicecomb.incubator.apache.org/cn/developers/submit-codes/),成为贡献者之一; +* 分析源代码,如果希望了解更多技术细节,请在[Gitter](http://servicecomb.apache.org/cn/developers/use-gitter/)上提问,大家会尽快解答; +* 希望炫一把黑科技体现您的实力?看看我们的 [issue tracker](https://issues.apache.org/jira/browse/SCB) 吧,欢迎您承接Open状态的Issues和未完成的特性,提交[PR](http://servicecomb.apache.org/cn/developers/submit-codes/),成为贡献者之一; * 如果您接触 ServiceComb不久并且很希望帮助我们,您可以先从[简单的任务](https://issues.apache.org/jira/browse/SCB-333?jql=project%20%3D%20SCB%20AND%20status%20%3D%20Open%20AND%20fixVersion%20in%20(EMPTY%2C%20java-chassis-1.0.0-m2)%20AND%20labels%20%3D%20newbie)入手,循序渐进,甚至成长为Committer; * 如果在使用ServiceComb的过程中发现有功能无法满足您的需求或出现问题,请在Issues中记录,并Watch项目,这样一旦这个问题有进展,都会第一时间通知到您。 ## 初次接触 有下面的方式加入ServcieComb社区: -- 订阅我们的[邮件列表](http://servicecomb.incubator.apache.org/cn/developers/subscribe-mail-list),并为您关注的话题发表意见; +- 订阅我们的[邮件列表](http://servicecomb.apache.org/cn/developers/subscribe-mail-list),并为您关注的话题发表意见; - 来[Gitter](https://gitter.im/ServiceCombUsers/Lobby)和大家打个招呼吧! ## 改进文档 @@ -28,21 +28,21 @@ last_modified_at: 2018-05-20T19:18:43+08:00 因此如果您对改进文档的质量感兴趣,不论是修订一个页面的地址、更正一个链接、以及写一篇更优秀的入门文档,我们都非常欢迎! -我们的文档大多数是使用markdown格式编写的,您需要同步我们的[Website](https://github.com/apache/incubator-servicecomb-website)项目,直接在 github上编辑后提交PR即可。 +我们的文档大多数是使用markdown格式编写的,您需要同步我们的[Website](https://github.com/apache/servicecomb-website)项目,直接在 github上编辑后提交PR即可。 ## 如果发现了一个Bug或问题 -请提交一个新的Issue在我们的[issue tracker](https://issues.apache.org/jira/browse/SCB)上,如果您能够提供一个JUnit测试用例来复现这个问题,那么我们就能够更快的解决它,例如已经有的[例子](https://github.com/apache/incubator-servicecomb-saga/tree/master/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core),并且我们还能够持续的确认这个问题不会再次出现在未来的版本中。 +请提交一个新的Issue在我们的[issue tracker](https://issues.apache.org/jira/browse/SCB)上,如果您能够提供一个JUnit测试用例来复现这个问题,那么我们就能够更快的解决它,例如已经有的[例子](https://github.com/apache/servicecomb-saga/tree/master/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core),并且我们还能够持续的确认这个问题不会再次出现在未来的版本中。 ## 编写代码 -ServiceComb的所有项目都在 [Github](https://github.com/apache?q=incubator-servicecomb)上,包含下面几个子项目: +ServiceComb的所有项目都在 [Github](https://github.com/search?q=org%3Aapache+servicecomb)上,包含下面几个子项目: | 项目名 | 项目介绍 | 语言 | |-------------------------------------------------------------------------------|----------------------------|----------| -| [Java Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) | Java微服务框架(SDK) | Java | -| [Service Center](https://github.com/apache/incubator-servicecomb-service-center) | 服务注册和发现 | Go | -| [Saga](https://github.com/apache/incubator-servicecomb-saga) | 微服务最终一致性解决方案 | Java | -| [Website](https://github.com/apache/incubator-servicecomb-website) | ServiceComb主站 | Markdown | +| [Java Chassis](https://github.com/apache/servicecomb-java-chassis) | Java微服务框架(SDK) | Java | +| [Service Center](https://github.com/apache/servicecomb-service-center) | 服务注册和发现 | Go | +| [Saga](https://github.com/apache/servicecomb-saga) | 微服务最终一致性解决方案 | Java | +| [Website](https://github.com/apache/servicecomb-website) | ServiceComb主站 | Markdown | -如果希望给ServiceComb提交代码,您需要从github上fork对应的项目至您的项目空间下,为您提交的代码创建一个新的分支,添加源项目为upstream,并提交PR,更详细的步骤可以参考[这篇文档](http://servicecomb.incubator.apache.org/cn/developers/submit-codes/)。 \ No newline at end of file +如果希望给ServiceComb提交代码,您需要从github上fork对应的项目至您的项目空间下,为您提交的代码创建一个新的分支,添加源项目为upstream,并提交PR,更详细的步骤可以参考[这篇文档](http://servicecomb.apache.org/cn/developers/submit-codes/)。 \ No newline at end of file diff --git a/_developers/cn/developer-guide.md b/_developers/cn/developer-guide.md index 7741c2d..675a244 100755 --- a/_developers/cn/developer-guide.md +++ b/_developers/cn/developer-guide.md @@ -8,18 +8,18 @@ last_modified_at: 2017-06-24T19:18:43+08:00 --- {% include toc %} -**ServiceComb** 项目托管在[Github](https://github.com/apache?q=incubator-servicecomb)上,其各子项目如下表所示: +**ServiceComb** 项目托管在[Github](https://github.com/apache?q=servicecomb)上,其各子项目如下表所示: | 项目名 | 项目简介 | 编程语言 | |-------------------------------------------------------------------------------|----------------------------|----------| -| [Java Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) | Java微服务框架(SDK) | Java | -| [Service Center](https://github.com/apache/incubator-servicecomb-service-center) | 服务中心(服务注册及发现) | Go | -| [Saga](https://github.com/apache/incubator-servicecomb-saga) | 微服务数据最终一致性实现 | Java | -| [Website](https://github.com/apache/incubator-servicecomb-website) | ServiceComb网站 | Markdown | +| [Java Chassis](https://github.com/apache/servicecomb-java-chassis) | Java微服务框架(SDK) | Java | +| [Service Center](https://github.com/apache/servicecomb-service-center) | 服务中心(服务注册及发现) | Go | +| [Saga](https://github.com/apache/servicecomb-saga) | 微服务数据最终一致性实现 | Java | +| [Website](https://github.com/apache/servicecomb-website) | ServiceComb网站 | Markdown | 参与 ServiceComb 项目并为其作出贡献的方法有很多:代码实现、测试编写、流程工具改进、文档完善等。您可以选择上述任何一个或多个感兴趣的项目进行贡献。具体贡献事宜可参考以下指南: * [开发环境准备](/cn/developers/setup-develop-environment/):主要介绍git,JDK,Maven以及IDE的安装及配置。 * [代码提交指南](/cn/developers/submit-codes/):主要介绍功能特性需求及现有bug的获取途径,提交代码前的测试事宜,如何提交PR以及如何解决冲突等。 -同时,也欢迎您订阅[ServiceComb邮件列表](mailto:dev-subscr...@servicecomb.incubator.apache.org)了解 ServiceComb 项目的开发动态以及进行话题讨论。订阅的方法可参阅[邮件列表订阅指南](/cn/developers/subscribe-mail-list/)。 +同时,也欢迎您订阅[ServiceComb邮件列表](mailto:dev-subscr...@servicecomb.apache.org)了解 ServiceComb 项目的开发动态以及进行话题讨论。订阅的方法可参阅[邮件列表订阅指南](/cn/developers/subscribe-mail-list/)。 diff --git a/_developers/cn/release_guide.md b/_developers/cn/release_guide.md old mode 100644 new mode 100755 index 0db48df..7f6508e --- a/_developers/cn/release_guide.md +++ b/_developers/cn/release_guide.md @@ -83,22 +83,22 @@ ServiceComb Java-Chassis和Saga使用Maven进行版本发布,我们需要在 1. 克隆service-center代码。 ``` -g...@github.com:apache/incubator-servicecomb-service-center.git -cd incubator-servicecomb-service-center +git clone https://github.com/apache/servicecomb-service-center.git +cd servicecomb-service-center gvt restore ``` 2. 在master分支上打上准备发布版本的标签。 -3. 运行RAT工具,检查所有源文件头都有合法的ASF声明, 请参考[该文档](https://github.com/apache/incubator-servicecomb-service-center/tree/master/docs/release)。 +3. 运行RAT工具,检查所有源文件头都有合法的ASF声明, 请参考[该文档](https://github.com/apache/servicecomb-service-center/tree/master/docs/release)。 -4. 运行`make_release.sh`脚本,请参考[该文档](https://github.com/apache/incubator-servicecomb-service-center/tree/master/scripts/release)。 +4. 运行`make_release.sh`脚本,请参考[该文档](https://github.com/apache/servicecomb-service-center/tree/master/scripts/release)。 5. 上一步将会在根目录下生成发行包。 6. 在Linux与Windows环境下运行前端与service-center。 -7. 进行[集成测试](https://github.com/apache/incubator-servicecomb-service-center/tree/master/integration)。 +7. 进行[集成测试](https://github.com/apache/servicecomb-service-center/tree/master/integration)。 8. 如果以上全部测试都通过了,将发行包分发给同事在不同机器上进行验证。 @@ -106,7 +106,7 @@ gvt restore ***给发行包签名*** -10. 从Github下载要发行版本[标签](https://github.com/apache/incubator-servicecomb-service-center/tags)的源码包。 +10. 从Github下载要发行版本[标签](https://github.com/apache/servicecomb-service-center/tags)的源码包。 11. 生成Linux发行包,Windows发行包和源码包的签名和校验和。 @@ -149,7 +149,7 @@ gvt restore 1. 克隆java-chassis代码。 ``` -git clone g...@github.com:apache/incubator-servicecomb-java-chassis.git +git clone https://github.com/apache/servicecomb-java-chassis.git ``` 2. 使用以下perl命令,替换所有pom.xml文件中的版本号并提交改动至本地。 @@ -226,7 +226,7 @@ mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase 1. 克隆Saga代码。 ``` -g...@github.com:apache/incubator-servicecomb-saga.git +git clone https://github.com/apache/servicecomb-saga.git ``` 2. 使用以下perl命令,替换所有pom.xml文件中的版本号并提交改动至本地。 diff --git a/_developers/cn/setup-develop-environment.md b/_developers/cn/setup-develop-environment.md old mode 100644 new mode 100755 index cf2c242..79dac9f --- a/_developers/cn/setup-develop-environment.md +++ b/_developers/cn/setup-develop-environment.md @@ -28,10 +28,10 @@ last_modified_at: 2017-06-24T18:48:43+08:00 ``` 其中,请将\<your-user-name\>和\<your-email-address\>替换为您在Github上注册用到的用户名和邮箱信息。设置免密码提交代码可参考[Git免密码提交代码教程](https://stackoverflow.com/a/8588786){:target="_blank"}。 -3. 获取项目代码。以 [ServiceComb-Java-Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) 项目为例,可直接执行以下指令获取代码: +3. 获取项目代码。以 [ServiceComb-Java-Chassis](https://github.com/apache/servicecomb-java-chassis) 项目为例,可直接执行以下指令获取代码: ```bash - git clone https://github.com/apache/incubator-servicecomb-java-chassis.git + git clone https://github.com/apache/servicecomb-java-chassis.git ``` ## IDE 环境配置 diff --git a/_developers/cn/submit-codes.md b/_developers/cn/submit-codes.md old mode 100644 new mode 100755 index 0177ab4..bbf35a4 --- a/_developers/cn/submit-codes.md +++ b/_developers/cn/submit-codes.md @@ -12,7 +12,7 @@ last_modified_at: 2017-09-08T20:26:43-20:46 ## 贡献途径 ServiceComb正在不断成长中,也希望能找到更多志同道合的同伴一起成长和进步。向ServiceComb 贡献的途径有多种: * 完善文档。完善网站上的文档或者项目中的介绍文档和API说明文档。其中,网站文档的完善可通过网站最底端的**报告本网页问题**或**在Github上编辑此页**对文档内容进行完善。 -* 实现功能特性需求或修复BUG。项目的功能特性需求或者已发现但未修复的BUG都会在项目中的issue处看到,以[Saga](https://github.com/apache/incubator-servicecomb-saga/issues)项目为例,一般都会带有类似 **enhancement** 或类似 **bug** 的标签来说明这是功能需求还是BUG,读者可以结合自己的兴趣点来选择。此外,您也可以通过日常使用或阅读代码时发现BUG并以Issue的方式进行描述并针对该BUG提交PR,帮助我们进一步改进。同时,也欢迎您提出需求并在实现后提交PR。 +* 实现功能特性需求或修复BUG。项目的功能特性需求或者已发现但未修复的BUG都会在项目中的issue处看到,以[Saga](https://github.com/apache/servicecomb-saga/issues)项目为例,一般都会带有类似 **enhancement** 或类似 **bug** 的标签来说明这是功能需求还是BUG,读者可以结合自己的兴趣点来选择。此外,您也可以通过日常使用或阅读代码时发现BUG并以Issue的方式进行描述并针对该BUG提交PR,帮助我们进一步改进。同时,也欢迎您提出需求并在实现后提交PR。 ![寻觅功能需求示例](/assets/images/find-features-by-example.png){: .align-center} @@ -20,11 +20,11 @@ last_modified_at: 2017-09-08T20:26:43-20:46 在您提交代码前,请先按照项目README中说明的自动测试部分对代码的功能性和实现上的正确性进行验证。 ## PR指南 - 在 [Github](https://github.com/search?q=org%3Aapache+servicecomb) 上面可以很方便地提交 [Pull Request (PR)](https://help.github.com/articles/about-pull-requests/),下面将以本网站项目[apache/incubator-servicecomb-website](https://github.com/apache/incubator-servicecomb-website) 为例(如果是其他项目,请替换项目名incubator-servicecomb-website)。 + 在 [Github](https://github.com/search?q=org%3Aapache+servicecomb) 上面可以很方便地提交 [Pull Request (PR)](https://help.github.com/articles/about-pull-requests/),下面将以本网站项目[apache/servicecomb-website](https://github.com/apache/servicecomb-website) 为例(如果是其他项目,请替换项目名servicecomb-website)。 ### Fork仓库 - 进入 apache/incubator-servicecomb-website 的 [github 页面](https://github.com/apache/incubator-servicecomb-website) ,点击右上角按钮 `Fork` 进行 Fork。 + 进入 apache/servicecomb-website 的 [github 页面](https://github.com/apache/servicecomb-website) ,点击右上角按钮 `Fork` 进行 Fork。 ![体质指数应用运行界面](/assets/images/fork-repo.jpg){: .align-center} @@ -33,7 +33,7 @@ last_modified_at: 2017-09-08T20:26:43-20:46 - 将代码克隆到本地: ```shell - git clone https://github.com/<your_github_name>/incubator-servicecomb-website.git + git clone https://github.com/<your_github_name>/servicecomb-website.git ``` 注意:请将 \<your\_github\_name\> 替换为您的github名字。 @@ -41,11 +41,11 @@ last_modified_at: 2017-09-08T20:26:43-20:46 clone完成后,origin会默认指向github上的远程fork地址。 -- 将 apache/incubator-servicecomb-website 添加为本地仓库的远程分支 upstream: +- 将 apache/servicecomb-website 添加为本地仓库的远程分支 upstream: ```shell - cd incubator-servicecomb-website - git remote add upstream https://github.com/apache/incubator-servicecomb-website.git + cd servicecomb-website + git remote add upstream https://github.com/apache/servicecomb-website.git ``` @@ -53,10 +53,10 @@ last_modified_at: 2017-09-08T20:26:43-20:46 ```shell git remote -v - origin https://github.com/<your_github_name>/incubator-servicecomb-website.git (fetch) - origin https://github.com/<your_github_name>/incubator-servicecomb-website.git (push) - upstream https://github.com/apache/incubator-servicecomb-website.git (fetch) - upstream https://github.com/apache/incubator-servicecomb-website.git (push) + origin https://github.com/<your_github_name>/servicecomb-website.git (fetch) + origin https://github.com/<your_github_name>/servicecomb-website.git (push) + upstream https://github.com/apache/servicecomb-website.git (fetch) + upstream https://github.com/apache/servicecomb-website.git (push) ``` diff --git a/_developers/cn/subscribe-mail-list.md b/_developers/cn/subscribe-mail-list.md index 967f1de..ecf99fd 100755 --- a/_developers/cn/subscribe-mail-list.md +++ b/_developers/cn/subscribe-mail-list.md @@ -1,9 +1,9 @@ --- -title: "如何订阅Apache ServiceComb (incubating) 的邮件列表" +title: "如何订阅Apache ServiceComb的邮件列表" lang: cn ref: subscribe-mail-list permalink: /cn/developers/subscribe-mail-list/ -excerpt: "如何订阅Apache ServiceComb (incubating) 的邮件列表" +excerpt: "如何订阅Apache ServiceComb的邮件列表" last_modified_at: 2017-09-08T20:26:43-20:46 --- @@ -12,7 +12,7 @@ last_modified_at: 2017-09-08T20:26:43-20:46 ## 0 前言 - 邮件列表(Mail List)是一个成熟开源社区的“枢纽”。通常来说,开源社区的提问与解答、技术讨论、事务决策等都通过邮件列表来承载。邮件列表异步、广播的特性,也非常适合开源社区的沟通交流。那么,如何订阅Apache ServiceComb (incubating)的邮件列表呢? + 邮件列表(Mail List)是一个成熟开源社区的“枢纽”。通常来说,开源社区的提问与解答、技术讨论、事务决策等都通过邮件列表来承载。邮件列表异步、广播的特性,也非常适合开源社区的沟通交流。那么,如何订阅Apache ServiceComb的邮件列表呢? diff --git a/_developers/contributing.md b/_developers/contributing.md old mode 100644 new mode 100755 index 2c20ca2..0452f2e --- a/_developers/contributing.md +++ b/_developers/contributing.md @@ -19,7 +19,7 @@ There are many ways that you can help make ServiceComb a better piece of solutio ## Getting in touch There are various ways of communicating with the ServiceComb community. -- Join us on the [mailing list](http://servicecomb.incubator.apache.org/cn/developers/subscribe-mail-list) and take part in any conversations +- Join us on the [mailing list](http://servicecomb.apache.org/cn/developers/subscribe-mail-list) and take part in any conversations - Pop by on [Gitter](https://gitter.im/ServiceCombUsers/Lobby) and say hi ## Improving the documentation @@ -32,19 +32,19 @@ Most of the documentation is stored as the markdown text, you can edit this page Please raise a new issue in our [issue tracker](https://issues.apache.org/jira/browse/SCB) If you can create a JUnit test case then your issue is more likely to be resolved quicker. -e.g. take a look at some of the existing [unit tests cases](https://github.com/apache/incubator-servicecomb-saga/tree/master/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core) +e.g. take a look at some of the existing [unit tests cases](https://github.com/apache/servicecomb-saga/tree/master/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core) Then we can add your issue to git and then we'll know when its really fixed and we can ensure that the problem stays fixed in future releases. ## Working on the code -We recommend to work on the code from [Github](https://github.com/apache?q=incubator-servicecomb), it has the following sub-projects: +We recommend to work on the code from [Github](https://github.com/search?q=org%3Aapache+servicecomb), it has the following sub-projects: | Project Name | Project Introduction | Programming Language | |-------------------------------------------------------------------------------|----------------------------|----------| -| [Java Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) | Java Microservice Framework(SDK) | Java | -| [Service Center](https://github.com/apache/incubator-servicecomb-service-center) | Service registration and discovery | Go | -| [Saga](https://github.com/apache/incubator-servicecomb-saga) | Data Eventually Consistency Solution for Microservice | Java | -| [Website](https://github.com/apache/incubator-servicecomb-website) | ServiceComb Website | Markdown | +| [Java Chassis](https://github.com/apache/servicecomb-java-chassis) | Java Microservice Framework(SDK) | Java | +| [Service Center](https://github.com/apache/servicecomb-service-center) | Service registration and discovery | Go | +| [Saga](https://github.com/apache/servicecomb-saga) | Data Eventually Consistency Solution for Microservice | Java | +| [Website](https://github.com/apache/servicecomb-website) | ServiceComb Website | Markdown | If you intend to work on the code and provide patches and other work you want to submit to the Apache ServiceComb projects, then you can fork the project on github and work on your own fork. The custom work you do should be done on branches you create, which can then be committed and pushed upstream, and then submitted to Apache ServiceComb as PRs (pull requests). You can find many resources online how to work on github projects and how to submit work to these projects. diff --git a/_developers/developer-guide.md b/_developers/developer-guide.md old mode 100644 new mode 100755 index 48e7fb6..336ce41 --- a/_developers/developer-guide.md +++ b/_developers/developer-guide.md @@ -8,18 +8,18 @@ last_modified_at: 2017-06-24T19:18:43+08:00 --- {% include toc %} -**ServiceComb** is hosted on [Github](https://github.com/apache?q=incubator-servicecomb), it has the following sub-projects: +**ServiceComb** is hosted on [Github](https://github.com/search?q=org%3Aapache+servicecomb), it has the following sub-projects: | Project Name | Project Introduction | Programming Language | |-------------------------------------------------------------------------------|----------------------------|----------| -| [Java Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) | Java Microservice Framework(SDK) | Java | -| [Service Center](https://github.com/apache/incubator-servicecomb-service-center) | Service registration and discovery | Go | -| [Saga](https://github.com/apache/incubator-servicecomb-saga) | Data Eventually Consistency Solution for Microservice | Java | -| [Website](https://github.com/apache/incubator-servicecomb-website) | ServiceComb Website | Markdown | +| [Java Chassis](https://github.com/apache/servicecomb-java-chassis) | Java Microservice Framework(SDK) | Java | +| [Service Center](https://github.com/apache/servicecomb-service-center) | Service registration and discovery | Go | +| [Saga](https://github.com/apache/servicecomb-saga) | Data Eventually Consistency Solution for Microservice | Java | +| [Website](https://github.com/apache/servicecomb-website) | ServiceComb Website | Markdown | There are many ways to get involved in ServiceComb and contribute to it, e.g. submit codes, submit tests, tools improvements, document improvements. You can contribute to one or more interested projects. You can refer to the following guide about how to contribute to this community. * [Setup Develop Environment](/developers/setup-develop-environment/). Introduce how to install and setup git, JDK, Maven and IDE(IntelliJ). * [Code Submit Guide](/developers/submit-codes/). Introduce how to get involved with development of ServiceComb and how to submit codes. -In the meanwhile, welcome to subscribe the [ServiceComb mailing list](mailto:dev-subscr...@servicecomb.incubator.apache.org) to keep track of the development status of ServiceComb community and discuss with us. +In the meanwhile, welcome to subscribe the [ServiceComb mailing list](mailto:dev-subscr...@servicecomb.apache.org) to keep track of the development status of ServiceComb community and discuss with us. diff --git a/_developers/release_guide.md b/_developers/release_guide.md old mode 100644 new mode 100755 index 5914646..26db005 --- a/_developers/release_guide.md +++ b/_developers/release_guide.md @@ -82,22 +82,22 @@ Before you deploy anything to the maven repository using Maven 2, you should con 1. Clone the service-center code. ``` -g...@github.com:apache/incubator-servicecomb-service-center.git -cd incubator-servicecomb-service-center +git clone https://github.com/apache/servicecomb-service-center.git +cd servicecomb-service-center gvt restore ``` 2. Create a Tag from the master branch based on the version number which needs to be released. -3. Run RAT tool to ensure no license issues are there, follow the guide over [here](https://github.com/apache/incubator-servicecomb-service-center/tree/master/docs/release) +3. Run RAT tool to ensure no license issues are there, follow the guide over [here](https://github.com/apache/servicecomb-service-center/tree/master/docs/release) -4. Run the make_release.sh to make the release for windows and linux following the guide over [here](https://github.com/apache/incubator-servicecomb-service-center/tree/master/scripts/release). +4. Run the make_release.sh to make the release for windows and linux following the guide over [here](https://github.com/apache/servicecomb-service-center/tree/master/scripts/release). 5. Last Step will make the releases in root folder. 6. Run the releases of frontend and service-center in both linux and windows. -7. Run the [integration test](https://github.com/apache/incubator-servicecomb-service-center/tree/master/integration) on the release. +7. Run the [integration test](https://github.com/apache/servicecomb-service-center/tree/master/integration) on the release. 8. If all the test passes then send the release candidate to peers to test in different machines. @@ -105,7 +105,7 @@ gvt restore ***Sign the Release*** -1. Once the tag is pushed then using the tag download the source code from git [tag](https://github.com/apache/incubator-servicecomb-service-center/tags). +1. Once the tag is pushed then using the tag download the source code from git [tag](https://github.com/apache/servicecomb-service-center/tags). 2. Sign the 3 releases(linux, windows, src) and checksum. @@ -150,7 +150,7 @@ gvt restore 1. Clone the java-chassis code. ``` -git clone g...@github.com:apache/incubator-servicecomb-java-chassis.git +git clone https://github.com/apache/servicecomb-java-chassis.git ``` 2. Cut the release using perl command to replace all the versions in pom.xml files @@ -227,7 +227,7 @@ mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase ***Make and Verify the Release*** 1. Clone the saga code. ``` -g...@github.com:apache/incubator-servicecomb-saga.git +git clone https://github.com/apache/servicecomb-saga.git ``` 2. Cut the release using per command to replace all the versions in pom.xml files diff --git a/_developers/setup-develop-environment.md b/_developers/setup-develop-environment.md old mode 100644 new mode 100755 index 6e3a330..d42cf4f --- a/_developers/setup-develop-environment.md +++ b/_developers/setup-develop-environment.md @@ -29,10 +29,10 @@ Before you start, make sure you have the following tools installed: Substitute \<your-user-name\>和\<your-email-address\> with your name and email. Refer[Git push without username and password](https://stackoverflow.com/a/8588786){:target="_blank"}to setup pushing without username/password. -3. Get the source code. For example, to get [ServiceComb-Java-Chassis](https://github.com/apache/incubator-servicecomb-java-chassis.git), execute the following command: +3. Get the source code. For example, to get [ServiceComb-Java-Chassis](https://github.com/apache/servicecomb-java-chassis.git), execute the following command: ```bash - git clone https://github.com/apache/incubator-servicecomb-java-chassis.git + git clone https://github.com/apache/servicecomb-java-chassis.git ``` ## Configure IDE diff --git a/_developers/submit-codes.md b/_developers/submit-codes.md old mode 100644 new mode 100755 index ec1a5bd..af58ea9 --- a/_developers/submit-codes.md +++ b/_developers/submit-codes.md @@ -12,7 +12,7 @@ last_modified_at: 2017-09-08T20:26:43-20:46 ## Contributing ServiceComb is still growing and we hope that more will join us to share this. There are many ways to contribute: * Improve documents. Help us improve the documents on this site or the API documentation. For the documents on this site, you can find links **Report a Doc Issue** or **Edit This Page on Github** to start. -* Implement feature request or fix bugs. You can find all the feature request and bug reports on the projects' issues pages. Take [Saga](https://github.com/apache/incubator-servicecomb-saga/issues) as an example, issues will be labeled as **enhancement** or **bug**, you can choose the ones you are interested in. Bug reports and new feature requests are also welcomed. +* Implement feature request or fix bugs. You can find all the feature request and bug reports on the projects' issues pages. Take [Saga](https://github.com/apache/servicecomb-saga/issues) as an example, issues will be labeled as **enhancement** or **bug**, you can choose the ones you are interested in. Bug reports and new feature requests are also welcomed. ![Find Features](/assets/images/find-features-by-example.png){: .align-center} @@ -20,11 +20,11 @@ last_modified_at: 2017-09-08T20:26:43-20:46 Before submitting code, make sure that you have properly tested the functionality and verified the implementation according to the auto test section in README. ## How to submit a PR - It's quite convenient to submit a [Pull Request(PR)](https://help.github.com/articles/about-pull-requests/) on [Github](https://github.com/search?q=org%3Aapache+servicecomb). Take the [apache/incubator-servicecomb-website](https://github.com/apache/incubator-servicecomb-website) as an example: + It's quite convenient to submit a [Pull Request(PR)](https://help.github.com/articles/about-pull-requests/) on [Github](https://github.com/search?q=org%3Aapache+servicecomb). Take the [apache/servicecomb-website](https://github.com/apache/servicecomb-website) as an example: ### Fork repository - Visit the apache/incubator-servicecomb-website project's [github page](https://github.com/apache/incubator-servicecomb-website), click `Fork` button on the right left cornor. + Visit the apache/servicecomb-website project's [github page](https://github.com/apache/servicecomb-website), click `Fork` button on the right left cornor. ![Fork Repository](/assets/images/fork-repo.jpg){: .align-center} @@ -33,27 +33,27 @@ last_modified_at: 2017-09-08T20:26:43-20:46 - Clone the source code to local machine: ```shell - git clone https://github.com/<your_github_name>/incubator-servicecomb-website.git + git clone https://github.com/<your_github_name>/servicecomb-website.git ``` Note: substitute \<your\_github\_name\> with your github username. After the clone is done, the origin remote will point to the default branch of the cloned repository. -- Add apache/incubator-servicecomb-website as upstream remote: +- Add apache/servicecomb-website as upstream remote: ```shell - cd incubator-servicecomb-website - git remote add upstream https://github.com/apache/incubator-servicecomb-website.git + cd servicecomb-website + git remote add upstream https://github.com/apache/servicecomb-website.git ``` - Check the local repository's remotes ```shell git remote -v - origin https://github.com/<your_github_name>/incubator-servicecomb-website.git (fetch) - origin https://github.com/<your_github_name>/incubator-servicecomb-website.git (push) - upstream https://github.com/apache/incubator-servicecomb-website.git (fetch) - upstream https://github.com/apache/incubator-servicecomb-website.git (push) + origin https://github.com/<your_github_name>/servicecomb-website.git (fetch) + origin https://github.com/<your_github_name>/servicecomb-website.git (push) + upstream https://github.com/apache/servicecomb-website.git (fetch) + upstream https://github.com/apache/servicecomb-website.git (push) ``` - Create a new branch to start working @@ -75,7 +75,7 @@ last_modified_at: 2017-09-08T20:26:43-20:46 For more on git usages, please visit[Git tutorial](https://www.atlassian.com/git/tutorials/setting-up-a-repository). ### Create PR - Goto your github page, find the apache/incubator-servicecomb-website project, swich to the branch you just pushed, click on `New pull request` and then `Create pull request`, see the image below: + Goto your github page, find the apache/servicecomb-website project, swich to the branch you just pushed, click on `New pull request` and then `Create pull request`, see the image below: ![New Pull Request](/assets/images/new-pr.jpg){: .align-center} fig-1 New pull request diff --git a/_docs/cn/load-balance.md b/_docs/cn/load-balance.md old mode 100644 new mode 100755 index c70d483..49e7aec --- a/_docs/cn/load-balance.md +++ b/_docs/cn/load-balance.md @@ -26,7 +26,7 @@ last_modified_at: 2017-09-03T10:01:43-04:00 mvn spring-boot:run -Drun.jvmArguments="-Dcse.rest.address=0.0.0.0:7778" ``` -为了便于区分不同的运行实例,在体质指数计算器的实现中新增了返回实例ID和运行时间的接口,详情可查看[体质指数计算器的完整实现代码](https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/bmi/calculator)。而为了避免端口冲突,新的实例在另一个端口上运行。 +为了便于区分不同的运行实例,在体质指数计算器的实现中新增了返回实例ID和运行时间的接口,详情可查看[体质指数计算器的完整实现代码](https://github.com/apache/servicecomb-java-chassis/tree/master/samples/bmi/calculator)。而为了避免端口冲突,新的实例在另一个端口上运行。 此时点击 *Submit* 按钮就可以看到如下两个界面中的实例ID交替出现。 diff --git a/_docs/cn/quick-start-bmi.md b/_docs/cn/quick-start-bmi.md old mode 100644 new mode 100755 index ec7c006..8480318 --- a/_docs/cn/quick-start-bmi.md +++ b/_docs/cn/quick-start-bmi.md @@ -41,7 +41,7 @@ last_modified_at: 2017-09-04T10:01:43-04:00 ``` **注意**: `java-chassis-dependencies` 这个依赖是以pom的形式导入来统一项目中的依赖项的版本管理。 -下面将对这两个微服务的实现进行介绍,其代码已托管于[github](https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/bmi)上。 +下面将对这两个微服务的实现进行介绍,其代码已托管于[github](https://github.com/apache/servicecomb-java-chassis/tree/master/samples/bmi)上。 ### 体质指数计算器实现 体质指数计算器提供运算服务,其实现分为三部分: diff --git a/_docs/cn/quick-start-dataconsistency.md b/_docs/cn/quick-start-dataconsistency.md old mode 100644 new mode 100755 index c378ec6..8eca802 --- a/_docs/cn/quick-start-dataconsistency.md +++ b/_docs/cn/quick-start-dataconsistency.md @@ -23,14 +23,14 @@ last_modified_at: 2017-09-19T11:50:10-04:00 ## 运行demo -注:Demo 集成在 [ServiceComb-Saga](https://github.com/apache/incubator-servicecomb-saga) 项目中。 +注:Demo 集成在 [ServiceComb-Saga](https://github.com/apache/servicecomb-saga) 项目中。 1. 准备环境 - [Oracle JDK 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) - [Maven 3.x](https://maven.apache.org/install.html) - [Docker](https://www.docker.com/get-docker) - [MySQL](https://dev.mysql.com/downloads/) -- [Service Center](https://github.com/apache/incubator-servicecomb-service-center) +- [Service Center](https://github.com/apache/servicecomb-service-center) - [Docker compose](https://docs.docker.com/compose/install/) 2. 配置服务 @@ -145,7 +145,7 @@ last_modified_at: 2017-09-19T11:50:10-04:00 ## 验证 -1. 参照 [Saga API](https://github.com/apache/incubator-servicecomb-saga/blob/master/docs/api/api.md) 说明,设定各服务的事务、补偿、依赖和恢复参数,并保存为 *request.json* 文件 +1. 参照 [Saga API](https://github.com/apache/servicecomb-saga/blob/master/docs/api/api.md) 说明,设定各服务的事务、补偿、依赖和恢复参数,并保存为 *request.json* 文件 ```json { diff --git a/_docs/cn/quick-start.md b/_docs/cn/quick-start.md old mode 100644 new mode 100755 index f008044..10c647b --- a/_docs/cn/quick-start.md +++ b/_docs/cn/quick-start.md @@ -19,8 +19,8 @@ last_modified_at: 2017-09-03T10:01:43-04:00 * 安装 ServiceComb Java Chassis(SDK),执行以下指令: ```bash - git clone https://github.com/apache/incubator-servicecomb-java-chassis.git - cd incubator-servicecomb-java-chassis + git clone https://github.com/apache/servicecomb-java-chassis.git + cd servicecomb-java-chassis mvn clean install -DskipTests ``` diff --git a/_docs/load-balance.md b/_docs/load-balance.md old mode 100644 new mode 100755 index 590dd30..761581f --- a/_docs/load-balance.md +++ b/_docs/load-balance.md @@ -25,7 +25,7 @@ Run one more *BMI calculator service* with the following command: mvn spring-boot:run -Drun.jvmArguments="-Dcse.rest.address=0.0.0.0:7778" ``` -To better distinguish different running instances, we added a new interface that returns instance id in the implementation of BMI calculator, details can refer to [the implementation of BMI calculator](https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/bmi/calculator). Besides, a different service port is needed to avoid port conflict. +To better distinguish different running instances, we added a new interface that returns instance id in the implementation of BMI calculator, details can refer to [the implementation of BMI calculator](https://github.com/apache/servicecomb-java-chassis/tree/master/samples/bmi/calculator). Besides, a different service port is needed to avoid port conflict. Now you can see the instance id in the following figures shows up alternately by clicking the *Submit* button. diff --git a/_docs/quick-start-bmi.md b/_docs/quick-start-bmi.md old mode 100644 new mode 100755 index 6133360..a3665de --- a/_docs/quick-start-bmi.md +++ b/_docs/quick-start-bmi.md @@ -41,7 +41,7 @@ Before we start, we need to add some common dependencies in the parent project o ``` **Notice**: The `java-chassis-dependencies` is imported as pom to unify version management of dependencies. -Now we will introduce the detailed implementation of these two microservices. The full code is on [github](https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/bmi). +Now we will introduce the detailed implementation of these two microservices. The full code is on [github](https://github.com/apache/servicecomb-java-chassis/tree/master/samples/bmi). ### Implementation of calculator The calculator service provides capability of calculating BMI. It contains three parts: diff --git a/_docs/quick-start-dataconsistency.md b/_docs/quick-start-dataconsistency.md old mode 100644 new mode 100755 index 76b0fe9..a8a17ec --- a/_docs/quick-start-dataconsistency.md +++ b/_docs/quick-start-dataconsistency.md @@ -22,14 +22,14 @@ Travel application demo including four services ## Running Demo -Note, demo is in the [ServiceComb-Saga](https://github.com/apache/incubator-servicecomb-saga) project. +Note, demo is in the [ServiceComb-Saga](https://github.com/apache/servicecomb-saga) project. 1. Prerequisites - [Oracle JDK 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) - [Maven 3.x](https://maven.apache.org/install.html) - [Docker](https://www.docker.com/get-docker) - [MySQL](https://dev.mysql.com/downloads/) -- [Service Center](https://github.com/apache/incubator-servicecomb-service-center) +- [Service Center](https://github.com/apache/servicecomb-service-center) - [Docker compose](https://docs.docker.com/compose/install/) 2. Configuration @@ -145,7 +145,7 @@ Note, demo is in the [ServiceComb-Saga](https://github.com/apache/incubator-serv ## Verify services -1. Use [Saga API](https://github.com/apache/incubator-servicecomb-saga/blob/master/docs/api/api.md) to set request content and save it to *request.json* +1. Use [Saga API](https://github.com/apache/servicecomb-saga/blob/master/docs/api/api.md) to set request content and save it to *request.json* ```json { diff --git a/_docs/quick-start.md b/_docs/quick-start.md old mode 100644 new mode 100755 index 9d7d291..82bce85 --- a/_docs/quick-start.md +++ b/_docs/quick-start.md @@ -19,8 +19,8 @@ last_modified_at: 2017-09-06T00:50:43-55:00 * Install ServiceComb Java Chassis(SDK) by executing the following commands. ```bash - git clone https://github.com/apache/incubator-servicecomb-java-chassis.git - cd incubator-servicecomb-java-chassis + git clone https://github.com/apache/servicecomb-java-chassis.git + cd servicecomb-java-chassis mvn clean install -DskipTests ``` diff --git a/_faqs/cn/faq.md b/_faqs/cn/faq.md index f14a6a8..3f63b94 100755 --- a/_faqs/cn/faq.md +++ b/_faqs/cn/faq.md @@ -48,7 +48,7 @@ redirect_from: * **Q: 服务接口的返回类型可以是任意类型吗?还是必须是responseEntity?** - A: 可以,具体可以参考java-chassis的[integration-test的实现](https://github.com/apache/incubator-servicecomb-java-chassis/blob/master/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java)。 + A: 可以,具体可以参考java-chassis的[integration-test的实现](https://github.com/apache/servicecomb-java-chassis/blob/master/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java)。 * **Q: 微服务启动后,无法正确调用接口,或返回不存在错误?** @@ -509,4 +509,4 @@ redirect_from: * **Q: 微服务运行时抛出异常:` java.lang.Error:not support def type:calss io.swagger.models.properties BaseIntegerProperty`?** - A: 可将Service Center升级至0.4.0+版本来解决,[Service Center最新版本传送门](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/)。 + A: 可将Service Center升级至最新版本来解决。[ServiceComb版本下载传送门](http://servicecomb.apache.org/cn/release/)。 diff --git a/_faqs/faq.md b/_faqs/faq.md old mode 100644 new mode 100755 index a9944bd..4928c67 --- a/_faqs/faq.md +++ b/_faqs/faq.md @@ -33,7 +33,7 @@ last_modified_at: 2017-10-29T10:01:43-04:00 5. **Q: Are there any restrictions of the return type of our API? Should it be the type of ResponseEntity?** - A: No, examples can refer to [the implementation of integration-test](https://github.com/apache/incubator-servicecomb-java-chassis/blob/master/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java) in java-chassis. + A: No, examples can refer to [the implementation of integration-test](https://github.com/apache/servicecomb-java-chassis/blob/master/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java) in java-chassis. 6. **Q: Our API can not be accessed after microservices are up. It just returns *404 Not Found*. The codes we use is as follows:** diff --git a/_users/cn/deploy-mode.md b/_users/cn/deploy-mode.md old mode 100644 new mode 100755 index 5e2068e..3b6c2a5 --- a/_users/cn/deploy-mode.md +++ b/_users/cn/deploy-mode.md @@ -331,7 +331,7 @@ Kubernetes是谷歌开源的容器集群管理系统,目前已经具备生产 ### 在Kubernetes集群中部署Java Chassis Company演示项目 Company是我们提供的一个有趣味性的演示项目: -1. 源代码地址:https://github.com/ServiceComb/ServiceComb-Company-WorkShop -2. 项目的详细讲解:http://servicecomb.incubator.apache.org/cn/docs/linuxcon-workshop-demo/ +1. 源代码地址:https://github.com/huaweicse/ServiceComb-Company-WorkShop +2. 项目的详细讲解:http://servicecomb.apache.org/cn/docs/linuxcon-workshop-demo/ -如何在Kubernetes集群中部署Company:http://servicecomb.incubator.apache.org/cn/docs/company-on-kubernetes/ \ No newline at end of file +如何在Kubernetes集群中部署Company:http://servicecomb.apache.org/cn/docs/company-on-kubernetes/ \ No newline at end of file diff --git a/_users/cn/develop-with-jax-rs.md b/_users/cn/develop-with-jax-rs.md old mode 100644 new mode 100755 index 51163eb..7e92674 --- a/_users/cn/develop-with-jax-rs.md +++ b/_users/cn/develop-with-jax-rs.md @@ -114,7 +114,7 @@ ServiceComb支持开发者使用JAX-RS注解,使用JAX-RS模式开发服务。 * **步骤 4** 添加服务定义。 - 在resources目录中添加[microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/)。 + 在resources目录中添加[microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html)。 * **步骤 5** 添加Main启动类 @@ -124,7 +124,7 @@ ServiceComb支持开发者使用JAX-RS注解,使用JAX-RS模式开发服务。 public class Application { public static void main(String[] args) throws Exception { - //初始化日志, 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : http://servicecomb.incubator.apache.org/cn/users/application-boot-process/ + //初始化日志, 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html Log4jUtils.init(); BeanUtils.init(); } diff --git a/_users/cn/develop-with-springboot-starter.md b/_users/cn/develop-with-springboot-starter.md old mode 100644 new mode 100755 index ecfb556..38f1e4a --- a/_users/cn/develop-with-springboot-starter.md +++ b/_users/cn/develop-with-springboot-starter.md @@ -114,7 +114,7 @@ Spring Boot已经包含了默认的Bean扫描策略,如果能够保证Spring B * **步骤 4** 添加服务定义。 - 在resources目录中添加[microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/)。 + 在resources目录中添加[microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html)。 * **步骤 5** 添加Main启动类 diff --git a/_users/cn/develop-with-springmvc.md b/_users/cn/develop-with-springmvc.md old mode 100644 new mode 100755 index d422b7f..c7ba156 --- a/_users/cn/develop-with-springmvc.md +++ b/_users/cn/develop-with-springmvc.md @@ -112,7 +112,7 @@ ServiceComb支持SpringMVC注解,允许使用SpringMVC风格开发微服务。 * **步骤 4** 添加服务定义。 - 在resources目录中添加[microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/)。 + 在resources目录中添加[microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html)。 * **步骤 5** 添加Main启动类 @@ -122,7 +122,7 @@ ServiceComb支持SpringMVC注解,允许使用SpringMVC风格开发微服务。 public class Application { public static void main(String[] args) throws Exception { - //初始化日志, 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : http://servicecomb.incubator.apache.org/cn/users/application-boot-process/ + //初始化日志, 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html Log4jUtils.init(); BeanUtils.init(); } diff --git a/_users/cn/develop-with-transparent-rpc.md b/_users/cn/develop-with-transparent-rpc.md old mode 100644 new mode 100755 index 5418869..51012ae --- a/_users/cn/develop-with-transparent-rpc.md +++ b/_users/cn/develop-with-transparent-rpc.md @@ -146,7 +146,7 @@ redirect_from: * **步骤 5** 添加服务定义。 - 在resources目录中添加[microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/)。 + 在resources目录中添加[microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html)。 * **步骤 6** 添加Main启动类 @@ -156,7 +156,7 @@ redirect_from: public class Application { public static void main(String[] args) throws Exception { - //初始化日志, 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : http://servicecomb.incubator.apache.org/cn/users/application-boot-process/ + //初始化日志, 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html Log4jUtils.init(); BeanUtils.init(); } diff --git a/_users/cn/edge-in-1.0.0-m1.md b/_users/cn/edge-in-1.0.0-m1.md old mode 100644 new mode 100755 index 0d008d8..7bcb9b2 --- a/_users/cn/edge-in-1.0.0-m1.md +++ b/_users/cn/edge-in-1.0.0-m1.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -微服务框架从1.0.0-m1版本开始提供内置Edge模块,请通过查看用户手册和Release Note获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.incubator.apache.org)参与讨论。 +微服务框架从1.0.0-m1版本开始提供内置Edge模块,请通过查看用户手册和Release Note获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.apache.org)参与讨论。 ## Edge特性 ### 与微服务松耦合 diff --git a/_users/cn/metrics-in-0.5.0.md b/_users/cn/metrics-in-0.5.0.md old mode 100644 new mode 100755 index a81006a..90cf033 --- a/_users/cn/metrics-in-0.5.0.md +++ b/_users/cn/metrics-in-0.5.0.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -微服务框架从0.5.0版本开始支持监控功能Metrics,请注意这个功能还处于开发(Preview)阶段,并且我们未来会做较大的调整,更多讨论请订阅ServiceComb邮件列表(dev-subscr...@servicecomb.incubator.apache.org)。 +微服务框架从0.5.0版本开始支持监控功能Metrics,请注意这个功能还处于开发(Preview)阶段,并且我们未来会做较大的调整,更多讨论请订阅ServiceComb邮件列表(dev-subscr...@servicecomb.apache.org)。 ## 背景 将系统微服务化是技术潮流和趋势,但是它解决了很多问题的同时也带来了新的问题。 diff --git a/_users/cn/metrics-in-1.0.0-m1.md b/_users/cn/metrics-in-1.0.0-m1.md old mode 100644 new mode 100755 index a50097c..43a1356 --- a/_users/cn/metrics-in-1.0.0-m1.md +++ b/_users/cn/metrics-in-1.0.0-m1.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和[Release Note](https://github.com/apache/incubator-servicecomb-java-chassis/releases)获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.incubator.apache.org)参与讨论。 +微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和[Release Note](https://github.com/apache/servicecomb-java-chassis/releases)获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.apache.org)参与讨论。 ## 背景 将系统微服务化是技术潮流和趋势,但是它解决了很多问题的同时也带来了新的问题。 diff --git a/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md b/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md old mode 100644 new mode 100755 index 63fc23b..24d87a9 --- a/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md +++ b/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和[Release Note](https://github.com/apache/incubator-servicecomb-java-chassis/releases)获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.incubator.apache.org)参与讨论。 +微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和[Release Note](https://github.com/apache/servicecomb-java-chassis/releases)获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.apache.org)参与讨论。 ## 背景 [普罗米修斯](http://www.prometheus.io/)是相似于Google Borgmon的一个开源监控系统,也是[CNCF](https://www.cncf.io/)的成员之一,目前社区非常活跃,Java Chassis Metrics在1.0.0-m1中支持对接普罗米修斯,并进一步实现使用[Grafana](https://grafana.com/)查询Metrics数据。 diff --git a/_users/cn/metrics-write-file-extension-and-sample-in-1.0.0-m1.md b/_users/cn/metrics-write-file-extension-and-sample-in-1.0.0-m1.md old mode 100644 new mode 100755 index bb9056e..6c0a234 --- a/_users/cn/metrics-write-file-extension-and-sample-in-1.0.0-m1.md +++ b/_users/cn/metrics-write-file-extension-and-sample-in-1.0.0-m1.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和[Release Note](https://github.com/apache/incubator-servicecomb-java-chassis/releases)获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.incubator.apache.org)参与讨论。 +微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和[Release Note](https://github.com/apache/servicecomb-java-chassis/releases)获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscr...@servicecomb.apache.org)参与讨论。 ## 背景 0.5.0版本的foundation-metrics实现了将采集到的Metrics数据写入文件,在1.0.0-m1中,此功能以Sample的形式移动到了samples/metrics-write-file-sample中; diff --git a/_users/cn/setup-environment.md b/_users/cn/setup-environment.md old mode 100644 new mode 100755 index c8c7ebb..48e94a1 --- a/_users/cn/setup-environment.md +++ b/_users/cn/setup-environment.md @@ -85,7 +85,7 @@ Service Center是一个无状态的应用因此它很容易以集群的模式部 我们假定你的etcd运行在http://10.12.0.4:2379 上: ##### 第一步 -在所有的VM上从[ServiceComb官网](https://github.com/apache/incubator-servicecomb-service-center/releases)下载最新版本的Service Center并解压: +在所有的VM上从[ServiceComb官网](https://github.com/apache/servicecomb-service-center/releases)下载最新版本的Service Center并解压: ```bash tar -xvf service-center-X.X.X-linux-amd64.tar.gz @@ -178,9 +178,9 @@ curl http://10.12.0.1:30101/v4/default/registry/health ``` -我们可以看到Service Center能够自动发现所有正在集群中运行的实例,[Java-Chassis SDK](https://github.com/apache/incubator-servicecomb-java-chassis)将使用这个特性至少找到一个Service Center实例。 +我们可以看到Service Center能够自动发现所有正在集群中运行的实例,[Java-Chassis SDK](https://github.com/apache/servicecomb-java-chassis)将使用这个特性至少找到一个Service Center实例。 -在你的microservice.yaml中你可以填写一个或多个Service Center实例,如果[Java-Chassis SDK](https://github.com/apache/incubator-servicecomb-java-chassis)发现配置的第一个地址(实例)失败,它将会自动使用下一个地址(实例): +在你的microservice.yaml中你可以填写一个或多个Service Center实例,如果[Java-Chassis SDK](https://github.com/apache/servicecomb-java-chassis)发现配置的第一个地址(实例)失败,它将会自动使用下一个地址(实例): ```yaml servicecomb: service: diff --git a/_users/develop-with-jax-rs.md b/_users/develop-with-jax-rs.md old mode 100644 new mode 100755 index b16ba92..cc9c552 --- a/_users/develop-with-jax-rs.md +++ b/_users/develop-with-jax-rs.md @@ -109,7 +109,7 @@ ServiceComb supports developers in developing services in JAX-RS mode by using J * **Step 4** Add service definition file: - Add [microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/) file into resources folder of your project. + Add [microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html) file into resources folder of your project. * **Step 5** Add Main class: @@ -119,7 +119,7 @@ ServiceComb supports developers in developing services in JAX-RS mode by using J public class Application { public static void main(String[] args) throws Exception { - //initializing log, loading bean(including its parameters), and registering service, more detail can be found here : http://servicecomb.incubator.apache.org/users/application-boot-process/ + //initializing log, loading bean(including its parameters), and registering service, more detail can be found here : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html Log4jUtils.init(); BeanUtils.init(); } diff --git a/_users/develop-with-springboot-starter.md b/_users/develop-with-springboot-starter.md old mode 100644 new mode 100755 index 2c9f0ee..a81775b --- a/_users/develop-with-springboot-starter.md +++ b/_users/develop-with-springboot-starter.md @@ -107,7 +107,7 @@ Spring Boot had include a default Bean discovery policy, if Spring Boot can foun * **Step 4** Add service definition file: - Add [microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/) file into resources folder of your project. + Add [microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html) file into resources folder of your project. * **Step 5** Add Main class: diff --git a/_users/develop-with-springmvc.md b/_users/develop-with-springmvc.md old mode 100644 new mode 100755 index 8a54920..b61f3f1 --- a/_users/develop-with-springmvc.md +++ b/_users/develop-with-springmvc.md @@ -107,7 +107,7 @@ ServiceComb supports Spring MVC remark and allows you to develop microservices i * **Step 4** Add service definition file: - Add [microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/) file into resources folder of your project. + Add [microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html) file into resources folder of your project. * **Step 5** Add Main class: @@ -117,7 +117,7 @@ ServiceComb supports Spring MVC remark and allows you to develop microservices i public class Application { public static void main(String[] args) throws Exception { - //initializing log, loading bean(including its parameters), and registering service, more detail can be found here : http://servicecomb.incubator.apache.org/users/application-boot-process/ + //initializing log, loading bean(including its parameters), and registering service, more detail can be found here : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html Log4jUtils.init(); BeanUtils.init(); } diff --git a/_users/develop-with-transparent-rpc.md b/_users/develop-with-transparent-rpc.md old mode 100644 new mode 100755 index 47dcb2a..c9d32d1 --- a/_users/develop-with-transparent-rpc.md +++ b/_users/develop-with-transparent-rpc.md @@ -138,7 +138,7 @@ Different from the Spring MVC and JAX-RS development modes, the transparent RPC * **Step 5** Add service definition file: - Add [microservice.yaml](http://servicecomb.incubator.apache.org/cn/users/service-definition/) file into resources folder of your project. + Add [microservice.yaml](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/definition/service-definition.html) file into resources folder of your project. * **Step 6** Add Main class: @@ -148,7 +148,7 @@ Different from the Spring MVC and JAX-RS development modes, the transparent RPC public class Application { public static void main(String[] args) throws Exception { - //initializing log, loading bean(including its parameters), and registering service, more detail can be found here : http://servicecomb.incubator.apache.org/users/application-boot-process/ + //initializing log, loading bean(including its parameters), and registering service, more detail can be found here : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html Log4jUtils.init(); BeanUtils.init(); } diff --git a/_users/edge-in-1.0.0-m1.md b/_users/edge-in-1.0.0-m1.md old mode 100644 new mode 100755 index 7429f56..1b2612a --- a/_users/edge-in-1.0.0-m1.md +++ b/_users/edge-in-1.0.0-m1.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -We had provide an edge core module since 1.0.0-m1, please checkout the user guide and [release note](https://github.com/apache/incubator-servicecomb-java-chassis/releases) for more information.Also subscribe ServiceComb mail-list(dev-subscr...@servicecomb.incubator.apache.org) and join discussion is welcome. +We had provide an edge core module since 1.0.0-m1, please checkout the user guide and [release note](https://github.com/apache/servicecomb-java-chassis/releases) for more information.Also subscribe ServiceComb mail-list(dev-subscr...@servicecomb.apache.org) and join discussion is welcome. ## Edge Features ### Loose Coupling diff --git a/_users/faq.md b/_users/faq.md old mode 100644 new mode 100755 index 8e37f41..8da37bf --- a/_users/faq.md +++ b/_users/faq.md @@ -35,7 +35,7 @@ redirect_from: 5. **Q: Are there any restrictions of the return type of our API? Should it be the type of ResponseEntity?** - A: No, examples can refer to [the implementation of integration-test](https://github.com/apache/incubator-servicecomb-java-chassis/blob/master/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java) in java-chassis. + A: No, examples can refer to [the implementation of integration-test](https://github.com/apache/servicecomb-java-chassis/blob/master/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java) in java-chassis. 6. **Q: Our API can not be accessed after microservices are up. It just returns *404 Not Found*. The codes we use is as follows:** diff --git a/_users/metrics-in-1.0.0-m1.md b/_users/metrics-in-1.0.0-m1.md old mode 100644 new mode 100755 index b39fc4c..d673e0a --- a/_users/metrics-in-1.0.0-m1.md +++ b/_users/metrics-in-1.0.0-m1.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -Metrics had supported from Java chassis version 0.5.0,in version 1.0.0-m1,we had reconstruction it and add some more features,please checkout the user guide and [release note](https://github.com/apache/incubator-servicecomb-java-chassis/releases) for more information.Also subscribe ServiceComb mail-list(dev-subscr...@servicecomb.incubator.apache.org) and join discussion is welcome. +Metrics had supported from Java chassis version 0.5.0,in version 1.0.0-m1,we had reconstruction it and add some more features,please checkout the user guide and [release note](https://github.com/apache/servicecomb-java-chassis/releases) for more information.Also subscribe ServiceComb mail-list(dev-subscr...@servicecomb.apache.org) and join discussion is welcome. ## Background Microservice is trend of technology,it resolve many problems also follows new problem. diff --git a/_users/metrics-integration-with-prometheus-in-1.0.0-m1.md b/_users/metrics-integration-with-prometheus-in-1.0.0-m1.md old mode 100644 new mode 100755 index 827c4df..7425cfb --- a/_users/metrics-integration-with-prometheus-in-1.0.0-m1.md +++ b/_users/metrics-integration-with-prometheus-in-1.0.0-m1.md @@ -10,7 +10,7 @@ redirect_from: --- {% include toc %} -Metrics had supported from Java chassis version 0.5.0,in version 1.0.0-m1,we had reconstruction it and add some more features,please checkout the user guide and [release note](https://github.com/apache/incubator-servicecomb-java-chassis/releases) for more information.Also subscribe ServiceComb mail-list(dev-subscr...@servicecomb.incubator.apache.org) and join discussion is welcome. +Metrics had supported from Java chassis version 0.5.0,in version 1.0.0-m1,we had reconstruction it and add some more features,please checkout the user guide and [release note](https://github.com/apache/servicecomb-java-chassis/releases) for more information.Also subscribe ServiceComb mail-list(dev-subscr...@servicecomb.apache.org) and join discussion is welcome. ## Background [Prometheus](http://www.prometheus.io/) is a opensource open-source monitoring solution like Google Borgmon,also member of [CNCF](https://www.cncf.io/),community is very active.Java chassis metrics support integration with prometheus in 1.0.0-m1,and can use [Grafana](https://grafana.com/) to query metrics data further. diff --git a/script/bootstrap b/script/bootstrap index e355715..7fec0b3 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -5,7 +5,7 @@ #Install Jekyll and Bundler sudo gem install jekyll bundler -git clone https://github.com/apache/incubator-servicecomb-website.git +git clone https://github.com/apache/servicecomb-website.git #Install the gems with bundle sudo bundle install diff --git a/script/deploy b/script/deploy index 990e1b7..3ec1e26 100755 --- a/script/deploy +++ b/script/deploy @@ -1,7 +1,7 @@ #!/bin/bash -git clone https://github.com/apache/incubator-servicecomb-docs.git +git clone https://github.com/apache/servicecomb-docs.git gitbook build incubator-servicecomb-docs/java-chassis-reference users/servicecomb-java-chassis-doc