Skip to content

Commit

Permalink
Merge all changes back to master (#398)
Browse files Browse the repository at this point in the history
* Changed package from com.alibaba.dubbo to org.apache.dubbo for docs (#204)

* Build source code guide (#197)

* Add dubbo spi source analysis article
* Add adaptive extension source analysis article.
* Add service export source code analysis article.
* Add service refer source code analysis article.
* Add Directory source code analysis article.
* Minor modification
* Add Router source code analysis article.
* Add Cluster source code analysis article.
* Add LoadBalance source code analysis article.

* update rest doc

* update

* add codecov test coverage address (#208)

* add codecov test coverage address

* change the date of codecov

* delete useless blank

* update site_config/doc.js (#206)

* rebuild

* Update export-service.md (#212)

The isPrimitive() method means whether it is a basic type, not a private type.

* Add huyuechy as contributor (#210)

* Add huyuechy as contributor (#209)

* Fix typos (#214)

* Fix typos
* Fix an error describe

* Fix typo and add new user (#213)

* spelling mistake: "proejct" to "project"
* add new user chuangjinzhitou

* Fix typo (#217)

* Fix admin-console page display extra git HEAD info (#216)

* correct typo and rebuild

* add 'dubbo rest support' blog

* Fix typo (#223)

* Add Chinese blogs (#227)

* Update Content (#229)

* Add Chinese blogs

* Update the content

* Update the blog.json

* Happy new year 2019! #224 (#225)

* Add 2019 year number for copyright year of 'zh-cn', the same as 'en-us', in site.js (#230)

* Fixed some descriptive problems (#235)

* Fix typo (#233)

* Modify errorCode (#232)

* Add blog 《DUBBO协议详解》 (#228)

* add blog 《DUBBO协议详解》
* update article & blog.js

* Add Dubbo context information BLOG (#222)

* [Blog] 《URL 统一模型》&《Dubbo 博客文档中文排版指南》 (#221)

* add
* 增加code style的注意事项
* url统一模型&排版指南
* 修改错误用词;修改中文排版指南的描述;修改rfc文档的引用

* Polish README format.

* Publish website.

* Fix typo: registery -> registry (#236)

* Update readme, add node version requirement.

* Fix wrong grammar (#242)

* Fix typo (#241)

* 修复一些中文语法不通顺的问题 (#246)

* Fixed some dead link and typo (#238)

* fixed dead link online qos
* fix issue :   Dead link problem summary #215
* fixed some dead link and typo
* synchronize the zh-cn doc
* update java ServiceProvider link url

* Polish apache release doc.

* Fix Bug for Dubbo Official WebSite (#249)

* Fix broken links(#244) (#245)

* Polish release document.

* Publish website.

* Add service invoking process analysis article (#239)

* add blog - How to use Fescar to ensure consistency between Dubbo Microservices (#250)

* add doc How to use Fescar to ensure consistency between Dubbo Microservices

* add doc How to use Fescar to ensure consistency between Dubbo Microservices

* Delete dubbo-fescar.html

* Delete dubbo-fescar.json

* revert blog.json index.html

* generate html

* [BLOG] How to use Fescar to ensure consistency between Dubbo Microservices(CHS) (#253)

* add doc How to use Fescar to ensure consistency between Dubbo Microservices

* add doc How to use Fescar to ensure consistency between Dubbo Microservices

* Delete dubbo-fescar.html

* Delete dubbo-fescar.json

* revert blog.json index.html

* [BLOG] How to use Fescar to ensure consistency between Dubbo Microservices(CHS)

* gene htmls

* Fix wrong class name (#256)

* fix wrong class name
* fix punctuation
* Update docs/en-us/dev/SPI.md

* Fix word typo (#258)

* Correct download links.

* Polish release manual page.

* Polish release manual.

* Publish website

* Add blog: guides for upgrading to 2.7.0

* update blog

* update blog: guides for upgrading to 2.7.0

* update blog: guides for upgrading to 2.7.0

* update blog: guides for upgrading to 2.7.0

* update blog: guides for upgrading to 2.7.0

* update blog: guides for upgrading to 2.7.0

* Add blog: Configuration Conclude

* update blog: configuraiton conclude

* update blog: configuraiton conclude

* add img link

* add image

* add new committer infomation (#260)

* add new committer infomation

* format the text

* 1.update ppmc infomation
2.update english version doc

* update ppmc infomation

* 修正文档中某些语法不通和错别字 (#262)

* Add select, shutdown command document (#255)

* [Blog] Dubbo 心跳设计 (#247)

* generate html

* Add 2.7.0 user docs

* fix img path

* 修正与源码不匹配的文档说明/加入订阅邮件列表 (#261)

* add menu for 2.7.0 docs

* polish 2.7.0 docs

* fix consumer address Key (#270)

* polish 2.7.0 docs

* add 'version and upgrade' menu.

* add 'version and upgrade' menu.

* fix md format

* polish 2.7.0 docs

* Release 2.7.0

* Update apache release process

* Publish website

* 2.7.0 doc

* blog about new dubbo admin (#269)

* blog about new dubbo admin

* Fix misspelling

* add service test blog

* update blog.js

* remove illegal character

* change picture

* Update developer page.

* Remove extra files.

* Add release guide

* Add spring-boot project download links

* Publish website

* 2.7.0 doc

*  [Blog] update Fescar link url (#273)

* add doc How to use Fescar to ensure consistency between Dubbo Microservices

* generate htmls

* generate htmls (#274)

* 修改章节 2.7.x升级步骤及注意事项 中的单词拼写错误问题 (#272)

* 修改单词拼写错误

* gene html

* Add release check list link

* Update new contributor guide to participate in the releae vote

* Add an article about how to update dubbo information on apache official site (#263)

* Add an article about how to update dubbo information on apache official site

* Add a article about how to update dubbo information on apache official site.

* Add reference info

* Update develop.js to let the article be displayed in the sidebar

* fix (#280)

* add contributor (#282)

Add contributor info about kezhenxu94

* Wrong text (#284)

* Add config-center schema doc

* Merge pull request #285 from nzomkxia:asf-site, add dubbo ops doc & fix spell issue.

* Merge pull request #283, add new committer information.

* Merge pull request #281, modify the new committer guid content.

* Merge pull request #268, modify Routing Rules description.

* update 2.7.0 related docs

* add update notice for unfinished docs

* polish routing-rule.md

* publish docs

* publish docs

* Wrong word (#289)

Fix wrong word in the doc.

* Fix typo (#287)

* Add Shenzhen meetup and and Chengdu Meetup summary to blog (#279)

* Update contribution.md

* Update dummy.md

* Update general-knowledge.md

* Update redis.md

* Update zookeeper.md

* Update zookeeper.md

* Update redis.md

* Update redis.md

* Update zookeeper.md

* Update redis.md

* Update zookeeper.md

* Update community.jsx

* Create dubbo-meetup-chengdu.html

dubbo-meetup-chengdu.html - first commit

* Create dubbo-meetup-chengdu.json

dubbo-meetup-chengdu.json - first commit

* Create dubbo-meetup-shenzhen.html

dubbo-meetup-shenzhen.html - first commit

* Update dubbo-meetup-chengdu.json

* Create dubbo-meetup-shenzhen.json

dubbo-meetup-shenzhen.json - first commit

* Update index.html

Add English version of Shenzhen Meetup and Chengdu Meetup summary.

* Update zookeeper.md

* Update zookeeper.md

* Delete contribution.md

* Create contribution.md

* Update contribution.md

* Update dummy.md

* Update redis.md

* Update zookeeper.md

* Update dummy.md

* Delete dubbo-meetup-chengdu.html

* Delete dubbo-meetup-chengdu.json

* Delete dubbo-meetup-shenzhen.html

* Delete dubbo-meetup-shenzhen.json

* Update community.jsx

* Create dubbo-meetup-shenzhen.md

* Update dubbo-meetup-shanghai-jun-23rd-2018.md

* Create dubbo-meetup-chengdu.md

* Update dubbo-meetup-shanghai-jun-23rd-2018.md

* Update dubbo-meetup-beijing-may-12th-2018.md

* Update dubbo-meetup-chengdu.md

* Fix and improve  [first-dubbo-filter.md] (#288)

* fix typo (#292)

* add dubbo admin download link (#290)

* update 2.7.0 related docs
* add update notice for unfinished docs
* add dubbo admin download link

* Declare the source version in the first article of the source code guide. (#291)

* Add Spring Boot Project 2.7.0 links

* Update Spring Boot Project links

* Update download link for dubbo-ops 0.1 release (#294)

* Update Apache release guide

* Add empty page for how to become committer

* Add chengdu meetup event

* Update README

* Publish website

* change configCenter to config-center in user docs

* publish user doc

* two new blogs about dubbo-async (#299)

* Merge pull request #300, doc for dubbo echo test.

* Fix typos (#302)

* Fix some typos for [introduction-to-dubbo-spi-2.md] (#301)

* Update committer information

* Add an article of gracefully shutdown (#303)

* Fix typo (#305)

* update metadata-report address

* Fixes apache/dubbo#3216

* genrate htmls

* Update new committer guide

* Update developers

* Update contributors (#308)

* Add release guide blog to developers page (#307)

* add github star and  fork icons in home page  (#309)

* update

* update icon align center

update icon align center

* add imgs

* generate htmls

* generate htmls

* generate htmls

* update committer information (#311)

* Add link to release note in download page (#315)

* add retries description (#318)

* add download address for dubbo 2.6.6

* Update Segmentfault to StackOverflow (#313)

* Update Segmentfault to StackOverflow. resolve #312

* remove malformed line. resolve #321

* build

* Add Hangzhou meetup summary to community (#319)

* update release procedure

* add release announce template & download verify

* build

* add report issue and edit links. resolve #314 (#317)

* highlight stars and forks. resolve #322 (#323)

* rebuild website

* Revert "highlight stars and forks. resolve #322 (#323)" (#324)

This reverts commit 49dc233.

* generate htmls (#325)

* fix KEYS append instruction

* remove star, fork from homepage, it effects load speed too much

* delete incubator-dubbo-website.iml (#332)

*  fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml (#331)

* add doc How to use Fescar to ensure consistency between Dubbo Microservices
* fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml

* fix #327

* Remove redundant symbols

* add blog for dubbo local call, and rebuild website

* fix link error (#335)

* modify dubbo-ops to dubbo-admin (#338)

* 1. new a blog to introduce dubbo2.7 new features 2. fomart blog.js 3. change my chinese name to english nick name (#337)

* method spelling error (#339)

* Add new committer to developer page (#342)

* Fix spelling mistakes (#341)

Fix spelling mistakes.

* feat: 主题色调整,增加start,fork相关信息

* feat: buid

*  Fix something error with local stub introduction (#343)

* 修改错别字 (#344)

* 动态的-->动态地
modify 罗军 to 罗毅

* Revert "修改错别字" (#345)

* Update requirements.md

* build htmls

* Add doc for closing staging repo

* update 2.7.1 download links

* update 2.7.1 download links

* Update EOL date for 2.5.x

* Update developers

* Add documention for how to report security issues.

* Update new contributor guide.

* Update becoming a committer.

* Publish website

* feat: 品牌色,添加字体,Safari跨域拦截导致star fork数获取失败等问题 (#348)

* Update Dubbo Spring Boot 2.7.1 links

* add blog for dubbo stub and dubbo mock, and rebuild

* correct download links

* correct link break between links

* correct links

* rebuild to online download page

* Update download link

* Publish website

* Fix typo Inovker to Invoker (#355)

* fixes apache/dubbo#3877, update link.

* change the local-call info (#356)

* Delete extra styles (#352)

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Delete extra styles

Delete extra styles.

* Translate Design Principals (#310)

* Add english version for Design Principles

fixes #196

* Translate code-detail.md

* Translate introduction.md

* Translate dummy.md

* Update configuration.md

Translate configuration.md

* Translate expansibility.md

Translate expansibility.md

* Translate extension.md

Translate extension.md

* Translate general-knowledge.md

Translate general-knowledge.md

* Update general-knowledge.md

*  Translate robustness.md

 Translate robustness.md

* Translate ‘向后兼容性,可以多向HTML5学习,参见:[HTML5设计原理]’.

Translate ‘向后兼容性,可以多向HTML5学习,参见:[HTML5设计原理]’.

* Update expansibility.md

There are more and more products in our platform >>  Our platform products more and more.

* see here => refer to

see here => refer to

* Update robustness.md

* Update robustness.md

Translate ' 这样操作减少后,保证数据库可以冷却(Cool Down)下来。'

* Update configuration.md

* Translate Design Principals part1 #196 (#297)

* Add english version for Design Principles

fixes #196

* Translate code-detail.md

* Translate introduction.md

* Translate dummy.md

* Remove untranslated files

* update async blog

* update async blog

* update async blog: format source

* publish newly updated sources

* update async blog

* publish async blog

* change local call english info (#357)

* change the local-call info

* change the local-call info for english

* Add license check to release guide

* correct description about install (#359)

* Fix typo in stickiness.md (#361)

* Fix typos in architecture.md & xml.md (#364)

* Add title, keywords, descriptions to blogs (#362)

* fix doc issue, protocolconfig does not support specifying of token  (#369)

fixes apache/dubbo#3922

* Remove incubating word

* [UPDATE] zkclient has remove in 2.7.x(#370)

* fix 404 link (#372)

* Update README.md (#366)

* new acticle: study dubbo network interfaces seletion (#363)

* new acticle: study dubbo network interfaces seletion

* fix some type error

* add new page for docker image build (#373)

* Fix some issues of Blog (#374)

* Update gsoc-2018.md

Add SEO of header in mankdown.

* Update dubbo2-js.md

Fix typo - 'keywords' of SEO in mankdown (跨语言)

* Update prepare-an-apache-release.md

Add 'description' content in SEO header ; 
and add the title('#') in the article.

* Update prepare-an-apache-release.md

Add 'description' content in SEO header.

* Rename dubbo-contribue-to-opensource.md to dubbo-contribute-to-opensource.md

Fix typo: 'contribue' --> 'contribute'.

* Rename dubbo-contribue-to-opensource.html to dubbo-contribute-to-opensource.html

Fix typo: 'contribue' --> 'contribute'.

* Update and rename dubbo-contribue-to-opensource.json to dubbo-contribute-to-opensource.json

Fix typo: 'contribue' --> 'contribute'.

* Blog & Docs translation plan (#375)

* Create gsoc-2018.md

* Update blog.js

Update site_config/develop.js, add a new entry in zh-cn.

* rebuild website

* update README

* remove incubator (#377)

* build htmls

* Add Nacos registry center page. (#380)

* add nacos registry

* Feature nacos registry center (#381)

* Add Nacos registry center page.

* Fix sentence error

* nacos registry

* add a committer (#384)

* fixed service test blog link #379 (#383)

* Add dubbo-erlang user doc (#382)

* update stub-mock (#385)

* htmls generated from e03ad80

* 'fix#389' (#390)

* fix wrong word (#396)

LGTM, and thanks for your contribution

* Fix typo (#397)

* modify 2.7.2-release

* Avoid global install for docsite (#378)

* Update home.jsx (#394)

* Website updated
  • Loading branch information
htynkn committed Jun 12, 2019
1 parent a67e473 commit 9967d9d
Show file tree
Hide file tree
Showing 2,484 changed files with 146,341 additions and 393,540 deletions.
22 changes: 22 additions & 0 deletions .babelrc
@@ -0,0 +1,22 @@
{
"plugins": [
"transform-decorators-legacy",
"transform-class-properties",
"transform-object-rest-spread",
"transform-object-assign",
[
"transform-runtime",
{
"helpers": false,
"polyfill": false,
"regenerator": true,
"moduleName": "babel-runtime"
}
]
],
"presets": [
"react",
"stage-0",
"es2015"
]
}
File renamed without changes.
27 changes: 27 additions & 0 deletions .eslintrc
@@ -0,0 +1,27 @@
{
"extends": "eslint-config-ali/react",
"parser": "babel-eslint",
"env": {
"browser": true,
"node": true,
"mocha": true
},
"globals": {
"AK_GLOBAL": true,
"dd": {},
"_czc": {},
"dplus": {},
"salt": {},
"_": true,
"homePageData": {},
"Lang": {}
},
"rules": {
"max-len": 0, //关闭最大长度限制
"new-cap": [2, { "newIsCap": true, "properties": false }],
"react/jsx-indent": 0,
"react/jsx-indent-props": 0,
"indent": 0,
"radix": ["error", "as-needed"]
}
}
10 changes: 6 additions & 4 deletions .gitignore
@@ -1,5 +1,7 @@
_site
.sass-cache
Gemfile.lock
*.gem
.idea
node_modules/
.DS_Store
npm-debug.log
*.orig
package-lock.json
*.iml
33 changes: 33 additions & 0 deletions 404.html
@@ -0,0 +1,33 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
</head>
<body>
<!-- 添加Apache校验项开始 -->
<!-- 只加a标签和img标签,不要有其余的标签出现,同时设置style="display: none" -->
<a style="display: none" href="http://www.apache.org/events/current-event">Apache Dubbo 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.</a>
<img style="display: none" src="http://dubbo.apache.org/img/apache_logo.png"/>
<ul style="display: none">
<p class="header">ASF</p>
<li><a href="http://www.apache.org">Foundation</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
<li><a href="http://www.apache.org/events/current-event">Events</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
<p style="display: none">Copyright © 2018 The Apache Software Foundation. Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
<a style="display: none" href="http://www.apache.org/security/">Security</a>
<!-- 添加Apache校验项结束 -->
<script src="//cdn.jsdelivr.net/npm/js-cookie@2/src/js.cookie.min.js"></script>
<script>
window.rootPath = '';
window.defaultLanguage = 'en-us';
var lang = Cookies.get('docsite_language');
if (!lang) {
lang = 'en-us';
}
window.location = window.rootPath + '/' + lang;
</script>
</body>
</html>
1 change: 0 additions & 1 deletion CNAME

This file was deleted.

1 change: 0 additions & 1 deletion DISCLAIMER

This file was deleted.

3 changes: 0 additions & 3 deletions Gemfile

This file was deleted.

16 changes: 16 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
## What is the purpose of the change

XXXXX

## Brief changelog

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

- [x] Make sure there is a [GITHUB_issue](https://github.com/apache/dubbo-website/issues) filed for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
- [ ] Format the pull request title like `Fix UnknownException when host config not exist #XXX`. Each commit in the pull request should have a meaningful subject line and body.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Test your code locally by running `docsite start`, and make sure it works as expected.
- [ ] Make sure no files under build directory is added.
- [ ] If this contribution is large, please follow the [Software Donation Guide](https://github.com/apache/dubbo/wiki/Software-donation-guide).
69 changes: 68 additions & 1 deletion README.md
@@ -1 +1,68 @@
# The Official Site [dubbo.io](http://dubbo.io)
# Dubbo Official WebSite

This project keeps all sources used for building up dubbo official website which's served at http://dubbo.io or http://dubbo.apache.org.


## Prerequisite

Dubbo website is powered by [docsite](https://github.com/txd-team/docsite).
If your version of docsite is less than `1.3.3`, please upgrade to `1.3.3`.
Please also make sure your node version is 8.x, versions higher than 8.x is not supported by docsite yet.

## Build instruction

1. Run `npm install docsite -g` to install the dev tool.
2. Run `npm i` in the root directory to install the dependencies.
3. Run `docsite start` in the root directory to start a local server, you will see the website in 'http://127.0.0.1:8080'.
4. Run `docsite build` to build source code.
5. Verify your change locally: `python -m SimpleHTTPServer 8000`, when your python version is 3 use :`python3 -m http.server 8000` instead.

If you have higher version of node installed, you may consider `nvm` to allow different versions of `node` coexisting on your machine.

1. Follow the [instructions](http://nvm.sh) to install nvm
2. Run `nvm install v8.16.0` to install node v8
3. Run `nvm use v8.16.0` to switch the working environment to node v8
4. Run `npm install docsite -g`

then you are all set to run and build the website. Follow the build instruction above for the details.

## How to send a PR

1. Do not use `git add .` to commit all the changes.
2. Just push your changed files, such as:
* `*.md`
* blog.js or docs.js or site.js
3. Send a PR to asf-site branch.

## SEO

Make sure each .md starts with the following texts:

```
---
title: title
keywords: keywords1,keywords2,keywords3
description: some description
---
```

Refer to [this blog](blog/zh-cn/how-to-involve-dubbo-community.md)


## Guide for adding new document

### Add a new blog

1. Add new .md file under blog/en-us or blog/zh-cn.
2. Update site_config/blog.js, add a new entry to the blog in either en-us or zh-cn.
3. Run docsite start locally to verify the blog can be displayed correctly.
4. Send the pull request contains the .md and blog.js only.


### Add a new article for developers

1. Add new .md file under docs/en-us/developers or docs/zh-cn/developers, the file name should end up with _dev.md. Note that the suffix _dev is necessary.
2. Update site_config/develop.js, add a new entry in either en-us or zh-cn.
3. Run docsite start locally to verify the article can be displayed correctly.
4. Send the pull request contains the *_dev.md and develop.js only.

11 changes: 0 additions & 11 deletions _config.yml

This file was deleted.

11 changes: 0 additions & 11 deletions _config_build.yml

This file was deleted.

55 changes: 0 additions & 55 deletions _layouts/default.html

This file was deleted.

7 changes: 0 additions & 7 deletions assets/css/style.scss

This file was deleted.

1 change: 1 addition & 0 deletions baidu_verify_9ea1htgFIo.html
@@ -0,0 +1 @@
9ea1htgFIo
10 changes: 10 additions & 0 deletions blog/en-us/apachecon-na-2018.md
@@ -0,0 +1,10 @@
---
title: The ApacheCon NA schedule has been announced
keywords: Dubbo, ApacheCon NA
description: This article will introduce you that the ApacheCon NA schedule has been announced attention.
---

The ApacheCon NA schedule has been announced
---

Ian Luo(PMC) and Jun Liu(PMC) will talk about "Introducing Apache Dubbo(Incubating): What is Dubbo and How it Works" at ApacheCon NA this year in Montréal! Please check out the schedule [here](https://apachecon.dukecon.org/acna/2018/#/scheduledEvent/b8db9dc580d85853f) and register [here](https://www.eventbrite.com/e/apachecon-north-america-2018-registration-43200327342).

0 comments on commit 9967d9d

Please sign in to comment.