[incubator-dubbo-website] branch asf-site updated: build htmls
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 7b273b5 build htmls
7b273b5 is described below
commit 7b273b537a91edb540b7d9fe2a64025d761260cc
Author: Xin Wang
AuthorDate: Mon Mar 25 19:41:39 2019 +0800
build htmls
---
en-us/docs/user/demos/local-stub.html | 2 +-
en-us/docs/user/demos/local-stub.json | 2 +-
zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.html | 2 +-
zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json | 2 +-
zh-cn/docs/user/demos/local-stub.html | 4 ++--
zh-cn/docs/user/demos/local-stub.json | 2 +-
zh-cn/docs/user/preface/requirements.html | 2 +-
zh-cn/docs/user/preface/requirements.json | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/en-us/docs/user/demos/local-stub.html
b/en-us/docs/user/demos/local-stub.html
index 24b276d..3d3c7bc 100644
--- a/en-us/docs/user/demos/local-stub.html
+++ b/en-us/docs/user/demos/local-stub.html
@@ -28,7 +28,7 @@
private final BarService barService;
// The real remote proxy object is passed in
through the constructor
-public (BarService barService) {
+public BarServiceStub(BarService
barService){
this.barService = barService;
}
diff --git a/en-us/docs/user/demos/local-stub.json
b/en-us/docs/user/demos/local-stub.json
index 735e29f..280a4ec 100644
--- a/en-us/docs/user/demos/local-stub.json
+++ b/en-us/docs/user/demos/local-stub.json
@@ -1,6 +1,6 @@
{
"filename": "local-stub.md",
- "__html": "Local stub\nWhen using rpc, the client usually only
the interface, but sometimes the client also want to perform part of the logic
in the client. For example: do ThreadLocal cache, verify parameters, return
mock data when call fails., etc.\nTo solve this problem, you can
configure the stub in the API, so that when the client generates the proxy
instance, it passes the proxy to the Stub via the constructor Local stub\nWhen using rpc, the client usually only
the interface, but sometimes the client also want to perform part of the logic
in the client. For example: do ThreadLocal cache, verify parameters, return
mock data when call fails., etc.\nTo solve this problem, you can
configure the stub in the API, so that when the client generates the proxy
instance, it passes the proxy to the Stub via the constructor 首届Dubbo开发者沙龙在北京成功举办, 超过400位开发者参加。这是一个很好的开始！
分享嘉宾及主体如下：
-罗军: Dubbo 的现状现状与未来规划 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf;>PDF
+罗毅: Dubbo 的现状现状与未来规划 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf;>PDF
刘军: 第四届阿里中间件性能挑战赛 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf;>PDF
陈志轩: 通过 Dubbo 和 Spring-boot 快速构建微服务 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/quickly-building-microservice-with-dubbo-and-springboot.pdf;>PDF
王欣: Dubbo 和微店的服务化实践历程分享 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf">PDF
diff --git a/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
b/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
index 2dcc43f..1c268af 100644
--- a/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
+++ b/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
@@ -1,6 +1,6 @@
{
"filename": "dubbo-meetup-beijing-may-12th-2018.md",
- "__html": "首届Dubbo开发者沙龙在北京成功举办\n首届Dubbo开发者沙龙在北京成功举办,
超过400位开发者参加。这是一个很好的开始！\n分享嘉宾及主体如下：\n\n罗军: Dubbo 的现状现状与未来规划
https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf\;>PDF\n刘军:
第四届阿里中间件性能挑战赛 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf\;>PDF\n陈志轩:
通过 Dubbo 和 Spring-b [...]
+ "__html": "首届Dubbo开发者沙龙在北京成功举办\n首届Dubbo开发者沙龙在北京成功举办,
超过400位开发者参加。这是一个很好的开始！\n分享嘉宾及主体如下：\n\n罗毅: Dubbo 的现状现状与未来规划
https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf\;>PDF\n刘军:
第四届阿里中间件性能挑战赛 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf\;>PDF\n陈志轩:
通过 Dubbo 和 Spring-b [...]
"link": "/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.html",
"meta": {
"title": "首届Dubbo开发者沙龙在北京成功举办",
diff --git a/zh-cn/docs/user/demos/local-stub.html
b/zh-cn/docs/user/demos/local-stub.html
index 9ca0623..68c7b6a 100644
--- a/zh-cn/docs/user/demos/local-stub.html
+++ b/zh-cn/docs/user/demos/local-stub.html
@@ -23,11 +23,11 @@
提供 Stub 的实现 [2]：
package
com.foo;
-public
[incubator-dubbo-website] branch asf-site updated: build
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 6200e2d build
6200e2d is described below
commit 6200e2d970c7e9b2dc901a7c7be774ee39cc092a
Author: nzomkxia
AuthorDate: Fri Mar 8 16:51:51 2019 +0800
build
---
en-us/blog/download.html | 2 +
en-us/blog/download.json | 2 +-
en-us/blog/prepare-an-apache-release.html | 39 ++-
en-us/blog/prepare-an-apache-release.json | 2 +-
en-us/community/index.html | 2 +-
.../committer-guide/release-guide_dev.html | 43 +++--
.../committer-guide/release-guide_dev.json | 4 +-
md_json/blog.json | 18 +
md_json/docs.json | 4 +-
zh-cn/blog/download.html | 2 +
zh-cn/blog/download.json | 2 +-
zh-cn/blog/prepare-an-apache-release.html | 41 +++-
zh-cn/blog/prepare-an-apache-release.json | 2 +-
zh-cn/community/index.html | 2 +-
.../committer-guide/release-guide_dev.html | 45 --
.../committer-guide/release-guide_dev.json | 4 +-
16 files changed, 190 insertions(+), 24 deletions(-)
diff --git a/en-us/blog/download.html b/en-us/blog/download.html
index 37351f9..cbc3f98 100644
--- a/en-us/blog/download.html
+++ b/en-us/blog/download.html
@@ -13,6 +13,8 @@
中Verification
+you can follow these https://www.apache.org/info/verification;>procedures and the https://dist.apache.org/repos/dist/release/incubator/dubbo/KEYS;>KEYS
file to verify the download files
https://github.com/apache/incubator-dubbo;>Dubbo-RPC
Release Notes: https://github.com/apache/incubator-dubbo/releases;>https://github.com/apache/incubator-dubbo/releases
diff --git a/en-us/blog/download.json b/en-us/blog/download.json
index 85b889c..0074c0d 100644
--- a/en-us/blog/download.json
+++ b/en-us/blog/download.json
@@ -1,6 +1,6 @@
{
"filename": "download.md",
- "__html": "Downloads\nhttps://github.com/apache/incubator-dubbo\;>Dubbo-RPC\n\nRelease
Notes: https://github.com/apache/incubator-dubbo/releases\;>https://github.com/apache/incubator-dubbo/releases\n\n2.7.0
(2019-01-29)\n\nhttps://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.0/apache-dubbo-incubating-2.7.0-source-release.zip\;>source
|\nhttps://dist.apache.or [...]
+ "__html": "Downloads\nVerification\nyou can follow
these https://www.apache.org/info/verification\;>procedures and
the https://dist.apache.org/repos/dist/release/incubator/dubbo/KEYS\;>KEYS
file to verify the download files\nhttps://github.com/apache/incubator-dubbo\;>Dubbo-RPC\n\nRelease
Notes: https://github.com/apache/incubator-dubbo/releases\;>https://github.com/apache/incubator-dub
[...]
"link": "/en-us/blog/download.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/blog/prepare-an-apache-release.html
b/en-us/blog/prepare-an-apache-release.html
index 25e2673..0cc8f31 100644
--- a/en-us/blog/prepare-an-apache-release.html
+++ b/en-us/blog/prepare-an-apache-release.html
@@ -185,7 +185,8 @@ modifications and taggings related to ${release_version}
Release Candidates are
$ mvn release:prepare
-Prelease -Darguments="-Dmaven.test.skip=true"
-DautoVersionSubmodules=true -Dusername=YOUR
GITHUB ID -DpushChanges=false
-If you are promted to input password for pushing to GitHub (basically
including adding new commits and tags), do not input your login password of
GitHub. Use Personal access tokens instead. You can go to https://github.com/settings/profile;>https://github.com/settings/profile,
click Developer settings - Personal access
tokens, and generate a new token if not. Please refer to this https://help.github.com/articles/creating [...]
+If you are promted to input password for pushing to GitHub (basically
including adding new commits and tags), do not input your login password of
GitHub. Use Personal access tokens instead. You can go to https://github.com/settings/profile;>https://github.com/settings/profile,
click Developer settings - Personal access
tokens, and generate a new token if not. Please refer to this https://help.github.com/articles/creating [...]
+you need to choose the release artifactId, next artifactId and the release
tag, the default tag is dubbo-parent-, you need to change it to
dubbo-
After executing the above commands, you will find that:
@@ -423,8 +424,42 @@ The Apache Dubbo (Incubating) Team
Update the recommend dependency on https://github.com/apache/incubator-dubbo#maven-dependency;>Github to
the latest version, also update the version in other place if necessary.
Add the download
[incubator-dubbo-website] branch asf-site updated: build
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 2a44ac0 build
2a44ac0 is described below
commit 2a44ac07c7c0dfde142097be52d7a9dac6e02bb5
Author: nzomkxia
AuthorDate: Fri Mar 8 11:58:27 2019 +0800
build
---
en-us/blog/download.html | 15 +++
en-us/blog/download.json | 2 +-
en-us/community/index.html| 2 +-
en-us/docs/developers/developers_dev.html | 13 +++--
en-us/docs/developers/developers_dev.json | 2 +-
en-us/docs/user/references/xml/dubbo-consumer.html| 2 +-
en-us/docs/user/references/xml/dubbo-consumer.json| 2 +-
zh-cn/blog/download.html | 18 ++
zh-cn/blog/download.json | 2 +-
zh-cn/docs/developers/developers_dev.html | 13 +++--
zh-cn/docs/developers/developers_dev.json | 2 +-
zh-cn/docs/user/references/metadata/introduction.html | 3 +--
zh-cn/docs/user/references/metadata/introduction.json | 2 +-
zh-cn/docs/user/references/xml/dubbo-consumer.html| 2 +-
zh-cn/docs/user/references/xml/dubbo-consumer.json| 2 +-
15 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/en-us/blog/download.html b/en-us/blog/download.html
index 88e6550..37351f9 100644
--- a/en-us/blog/download.html
+++ b/en-us/blog/download.html
@@ -26,6 +26,15 @@
https://dist.apache.org/repos/dist/release/incubator/dubbo/2.7.0/apache-dubbo-incubating-2.7.0-bin-release.zip.asc;>asc
|
https://dist.apache.org/repos/dist/release/incubator/dubbo/2.7.0/apache-dubbo-incubating-2.7.0-bin-release.zip.sha512;>sha512
+2.6.6 (2019-03-07)
+
+https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.6.6/apache-dubbo-incubating-2.6.6-source-release.zip;>source
|
+https://dist.apache.org/repos/dist/release/incubator/dubbo/2.6.6/apache-dubbo-incubating-2.6.6-source-release.zip.asc;>asc
|
+https://dist.apache.org/repos/dist/release/incubator/dubbo/2.6.6/apache-dubbo-incubating-2.6.6-source-release.zip.sha512;>sha512
+https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.6.6/apache-dubbo-incubating-2.6.6-bin-release.zip;>binary
|
+https://dist.apache.org/repos/dist/release/incubator/dubbo/2.6.6/apache-dubbo-incubating-2.6.6-bin-release.zip.asc;>asc
|
+https://dist.apache.org/repos/dist/release/incubator/dubbo/2.6.6/apache-dubbo-incubating-2.6.6-bin-release.zip.sha512;>sha512
+
2.6.5 (2018-11-23)
https://archive.apache.org/dist/incubator/dubbo/2.6.5/apache-dubbo-incubating-2.6.5-source-release.zip;>source
|
@@ -63,6 +72,9 @@
https://archive.apache.org/dist/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.sha512;>sha512
https://github.com/apache/incubator-dubbo-spring-boot-project;>Dubbo
Spring Boot Starter
+
+Release Notes: https://github.com/apache/incubator-dubbo-spring-boot-project/releases;>https://github.com/apache/incubator-dubbo-spring-boot-project/releases
+
2.7.0 (2019-02-14)
https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/spring-boot-project/2.7.0/apache-dubbo-spring-boot-project-incubating-2.7.0-source-release.zip;>source
|
@@ -91,6 +103,9 @@
https://archive.apache.org/dist/incubator/dubbo/spring-boot-project/0.1.2/apache-dubbo-spring-boot-project-incubating-0.1.2-bin-release.zip.sha512;>sha512
https://github.com/apache/incubator-dubbo-ops;>Dubbo
Admin
+
+Release Notes: https://github.com/apache/incubator-dubbo-ops/releases;>https://github.com/apache/incubator-dubbo-ops/releases
+
0.1 (2019-02-15)
https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/dubbo-ops/0.1/apache-dubbo-ops-incubating-0.1-source-release.zip;>source
|
diff --git a/en-us/blog/download.json b/en-us/blog/download.json
index aed180f..85b889c 100644
--- a/en-us/blog/download.json
+++ b/en-us/blog/download.json
@@ -1,6 +1,6 @@
{
"filename": "download.md",
- "__html": "Downloads\nhttps://github.com/apache/incubator-dubbo\;>Dubbo-RPC\n\nRelease
Notes: https://github.com/apache/incubator-dubbo/releases\;>https://github.com/apache/incubator-dubbo/releases\n\n2.7.0
(2019-01-29)\n\nhttps://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.0/apache-dubbo-incubating-2.7.0-source-release.zip\;>source
|\nhttps://dist.apache.or [...]
+ "__html": "Downloads\nhttps://github.com/apache/incubator-dubbo\;>Dubbo-RPC\n\nRelease
Notes: https://github.com/apache/incubator-dubbo/releases\;>https://github.com/apache/incubator-dubbo/releases\n\n2.7.0
(2019-01-29)\n\nhttps://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.0/apache-dubbo-incubating-2.7.0-source-release.zip\;>source
|\nhttps://dist.apache.or [...]
"link": "/en-us/blog/download.html",
"meta": {}
}
\ No newline at end of file
diff --git
[incubator-dubbo-website] branch asf-site updated: build
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 1a90a25 build
1a90a25 is described below
commit 1a90a25c29e2654d972224b1d01168dea9bf8c41
Author: beiwei30
AuthorDate: Mon Nov 5 10:33:21 2018 +0800
build
---
en-us/docs/user/demos/delay-publish.html | 18 --
en-us/docs/user/demos/delay-publish.json | 2 +-
zh-cn/docs/user/demos/delay-publish.html | 20 +---
zh-cn/docs/user/demos/delay-publish.json | 2 +-
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/en-us/docs/user/demos/delay-publish.html
b/en-us/docs/user/demos/delay-publish.html
index dd3f04d..f796b32 100644
--- a/en-us/docs/user/demos/delay-publish.html
+++ b/en-us/docs/user/demos/delay-publish.html
@@ -13,15 +13,21 @@
中If your service need time to warm up.such as:initialization cache,or
another reference resources has to be http://ready.so;>ready.so
you can use the delay feature for delay publish service.
-Delay five second publish
+If your services need time to warm up, such as: initialization cache or
another reference resources has to be ready. You can use the delay feature to
delay publishing services. We fine-tuned the service delay exposure logic in
Dubbo 2.6.5, delaying the countdown of services that require delayed exposure
until Spring initialization is complete. You won't be aware of this change
while using Dubbo, so please be assured that use.
+Prior to Dubbo-2.6.5
+Delay five second publish
dubbo:service delay="5000"
/
-Delay until Spring initialization is complete before exposing the
service
+Delay until Spring initialization is complete before exposing the
service
dubbo:service delay="-1"
/
-The initialization deadlock problem of Spring 2.x
-Trigger condition
+Dubbo-2.6.5 and later
+All services will be exposed after Spring initialization is complete, and
you don't need to configure delay if you don't need to delay exposing the
service.
+Delay five second publish
+dubbo:service delay="5000"
/
+
+The initialization deadlock problem of Spring 2.x
+Trigger condition
The service has already published when Spring parse the
dubbo:service / element,but the Spring is
still initializing other beans.If there is a request coming in, and the service
implementation class has a call to applicationContext.getBean ()
usage.
@@ -34,7 +40,7 @@
This will cause the getBean thread to lock the singletonObjects first, then
lock the beanDefinitionMap, and lock the singletonObjects again.The Spring
initialization thread, the first lock beanDefinitionMap, then lock
singletonObjects. Reverse lock thread deadlock, can not provide services, can
not start.
-Avoid ways
+Avoid ways
It is highly recommended not to call applicationContext.getBean() in the
service implementation class, all using Spring's beans using IoC injection.
If you really want to tune getBean(), you can put the configuration of
Dubbo Spring final loading.
diff --git a/en-us/docs/user/demos/delay-publish.json
b/en-us/docs/user/demos/delay-publish.json
index c821b35..a8e96c9 100644
--- a/en-us/docs/user/demos/delay-publish.json
+++ b/en-us/docs/user/demos/delay-publish.json
@@ -1,4 +1,4 @@
{
"filename": "delay-publish.md",
- "__html": "Delay publish service\nIf your service need time to
warm up.such as:initialization cache,or another reference resources has to be
http://ready.so\;>ready.so you can use the delay feature for
delay publish service.\nDelay five second publish\ndubbo:service delay=\"5000\"
/ [...]
+ "__html": "Delay publish service\nIf your services need time to
warm up, such as: initialization cache or another reference resources has to be
ready. You can use the delay feature to delay publishing services. We
fine-tuned the service delay exposure logic in Dubbo 2.6.5, delaying the
countdown of services that require delayed exposure until Spring initialization
is complete. You won't be aware of this change while using Dubbo, so please be
assured that use.\nPrior [...]
}
\ No newline at end of file
diff --git a/zh-cn/docs/user/demos/delay-publish.html
b/zh-cn/docs/user/demos/delay-publish.html
index 0630e98..adbe0e8 100644
--- a/zh-cn/docs/user/demos/delay-publish.html
+++ b/zh-cn/docs/user/demos/delay-publish.html
@@ -13,15 +13,21 @@
En如果你的服务需要预热时间，比如初始化缓存，等待相关资源就位等，可以使用 delay 进行延迟暴露。
-延迟 5 秒暴露服务
+如果你的服务需要预热时间，比如初始化缓存，等待相关资源就位等，可以使用 delay 进行延迟暴露。我们在 Dubbo 2.6.5
版本中对服务延迟暴露逻辑进行了细微的调整，将需要延迟暴露（delay 0）服务的倒计时动作推迟到了 Spring 初始化完成后进行。你在使用
Dubbo 的过程中，并不会感知到此变化，因此请放心使用。
+Dubbo-2.6.5 之前版本
+延迟到 Spring 初始化完成后，再暴露服务[1]
+dubbo:service delay="-1"
/
+
+延迟 5 秒暴露服务
dubbo:service delay="5000"
/
-延迟到 Spring 初始化完成后，再暴露服务 [1]
-dubbo:service delay="-1"
/
+Dubbo-2.6.5 及以后版本
+所有服务都将在 Spring 初始化完成后进行暴露，如果你不需要延迟暴露服务，无需配置 delay。
+延迟 5 秒暴露服务
[incubator-dubbo-website] branch asf-site updated: build site
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 3900754 build site
3900754 is described below
commit 3900754eb1046aec6a5edc9d6c8583242c0894d4
Author: 千臂
AuthorDate: Fri Nov 2 09:04:13 2018 +0800
build site
---
en-us/docs/developers/developers_dev.html | 6 +++
en-us/docs/developers/developers_dev.json | 2 +-
en-us/docs/user/demos/group-merger.html | 8 ++--
en-us/docs/user/demos/group-merger.json | 2 +-
zh-cn/docs/developers/developers_dev.html | 6 +++
zh-cn/docs/developers/developers_dev.json | 2 +-
zh-cn/docs/developers/guide_dev.html | 72 +++
zh-cn/docs/developers/guide_dev.json | 2 +-
8 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/en-us/docs/developers/developers_dev.html
b/en-us/docs/developers/developers_dev.html
index 349f01d..3387bf2 100644
--- a/en-us/docs/developers/developers_dev.html
+++ b/en-us/docs/developers/developers_dev.html
@@ -205,6 +205,12 @@
+8
+
+biyuhao
+https://github.com/biyuhao;>https://github.com/biyuhao
+Asiainfo-sec
++8
+
DisclaimerApache
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 [...]
diff --git a/en-us/docs/developers/developers_dev.json
b/en-us/docs/developers/developers_dev.json
index 09e96d6..20f6f6f 100644
--- a/en-us/docs/developers/developers_dev.json
+++ b/en-us/docs/developers/developers_dev.json
@@ -1,4 +1,4 @@
{
"filename": "developers_dev.md",
- "__html": "Developers\nThis page shows Dubbo developers. Please
file PR to add or change
items.\nCommitters\n\n\n\nApache
ID\nName\nOrganization\nRole\nTimeZone\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwav
[...]
+ "__html": "Developers\nThis page shows Dubbo developers. Please
file PR to add or change
items.\nCommitters\n\n\n\nApache
ID\nName\nOrganization\nRole\nTimeZone\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwav
[...]
}
\ No newline at end of file
diff --git a/en-us/docs/user/demos/group-merger.html
b/en-us/docs/user/demos/group-merger.html
index 392773e..b84214a 100644
--- a/en-us/docs/user/demos/group-merger.html
+++ b/en-us/docs/user/demos/group-merger.html
@@ -25,22 +25,22 @@
The specified method to merge the results, other unspecified methods, will
only call one group
dubbo:reference interface="com.xxx.MenuService" group="*"
dubbo:method
name="getMenuItems" merger="true"
/
-/dubbo:service
+/dubbo:reference
The Specified a method does not merge the results, others merge the
results
dubbo:reference interface="com.xxx.MenuService" group="*" merger="true"
dubbo:method
name="getMenuItems" merger="false"
/
-/dubbo:service
+/dubbo:reference
Specify the merge strategy, the default according to the type of return
value automatically match, if the same type has two mergers, you need to
specify the name of the merger[2]
dubbo:reference interface="com.xxx.MenuService" group="*"
dubbo:method
name="getMenuItems" merger="mymerge"
/
-/dubbo:service
+/dubbo:reference
Specify the merge method, it will call the return type's method for
merging, the merging method parameter type must be the return type
dubbo:reference interface="com.xxx.MenuService" group="*"
dubbo:method
name="getMenuItems" merger=".addAll"
/
-/dubbo:service
+/dubbo:reference
diff --git a/en-us/docs/user/demos/group-merger.json
b/en-us/docs/user/demos/group-merger.json
index 2ebc4e7..189100e 100644
--- a/en-us/docs/user/demos/group-merger.json
+++ b/en-us/docs/user/demos/group-merger.json
@@ -1,4 +1,4 @@
{
"filename": "group-merger.md",
- "__html": "Group Merger\nAccording to the group to invoke server
and return the merge result [1], such as the menu service, the same interface, but
there are a variety of implementations, using group distinction, consumers call
each group and get the results, the merger can merge the resules, so that you
can achieve aggregation Menu Item.\nRelated code can refer to https://github.com/apach [...]
+ "__html": "Group Merger\nAccording to the group to invoke server
and return the merge result [1], such as the menu service, the same interface, but
there are a variety of implementations, using group distinction, consumers call
each group and get the results, the merger can merge the resules, so that you
can achieve aggregation Menu Item.\nRelated code can refer to https://github.com/apach [...]
}
\ No newline at end of file
diff --git a/zh-cn/docs/developers/developers_dev.html
[incubator-dubbo-website] branch asf-site updated: build
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 39686c6 build
39686c6 is described below
commit 39686c62559750ae612275863086f10493fd7f50
Author: beiwei30
AuthorDate: Wed Oct 31 14:30:10 2018 +0800
build
---
en-us/docs/developers/developers_dev.html | 13 +
en-us/docs/developers/developers_dev.json | 2 +-
zh-cn/docs/developers/developers_dev.html | 29 +
zh-cn/docs/developers/developers_dev.json | 2 +-
4 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/en-us/docs/developers/developers_dev.html
b/en-us/docs/developers/developers_dev.html
index cf4ff42..349f01d 100644
--- a/en-us/docs/developers/developers_dev.html
+++ b/en-us/docs/developers/developers_dev.html
@@ -173,6 +173,13 @@
Committer
+8
+
+mjk
+Jinkai Ma
+Handuyishe
+Committer
++8
+
Contributors
@@ -192,6 +199,12 @@
+8
+
+chenzhiguo
+https://github.com/chenzhiguo;>https://github.com/chenzhiguo
+
++8
+
DisclaimerApache
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 [...]
diff --git a/en-us/docs/developers/developers_dev.json
b/en-us/docs/developers/developers_dev.json
index eb9f390..09e96d6 100644
--- a/en-us/docs/developers/developers_dev.json
+++ b/en-us/docs/developers/developers_dev.json
@@ -1,4 +1,4 @@
{
"filename": "developers_dev.md",
- "__html": "Developers\nThis page shows Dubbo developers. Please
file PR to add or change
items.\nCommitters\n\n\n\nApache
ID\nName\nOrganization\nRole\nTimeZone\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwav
[...]
+ "__html": "Developers\nThis page shows Dubbo developers. Please
file PR to add or change
items.\nCommitters\n\n\n\nApache
ID\nName\nOrganization\nRole\nTimeZone\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwav
[...]
}
\ No newline at end of file
diff --git a/zh-cn/docs/developers/developers_dev.html
b/zh-cn/docs/developers/developers_dev.html
index 8f3f9bc..52c5a5c 100644
--- a/zh-cn/docs/developers/developers_dev.html
+++ b/zh-cn/docs/developers/developers_dev.html
@@ -13,16 +13,16 @@
En本页面展示了Dubbo的开发团队。请通过提PR的方式把自己的信息添加到列表上。注：排名不分先后
-Committers
+本页面展示了Dubbo的开发团队。请通过提交PR的方式把自己的信息添加到列表上。注：排名不分先后
+提交者
Apache ID
-Name
-Organization
-Role
-TimeZone
+姓名
+组织
+角色
+时区
@@ -173,6 +173,13 @@
Committer
+8
+
+mjk
+Jinkai Ma
+Handuyishe
+Committer
++8
+
贡献者
@@ -181,8 +188,8 @@
Github ID
Github URL
-Organization
-TimeZone
+组织
+时区
@@ -192,6 +199,12 @@
+8
+
+chenzhiguo
+https://github.com/chenzhiguo;>https://github.com/chenzhiguo
+
++8
+
DisclaimerApache
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 [...]
diff --git a/zh-cn/docs/developers/developers_dev.json
b/zh-cn/docs/developers/developers_dev.json
index 068ce0e..9420f64 100644
--- a/zh-cn/docs/developers/developers_dev.json
+++ b/zh-cn/docs/developers/developers_dev.json
@@ -1,4 +1,4 @@
{
"filename": "developers_dev.md",
- "__html":
"开发人员\n本页面展示了Dubbo的开发团队。请通过提PR的方式把自己的信息添加到列表上。注：排名不分先后\nCommitters\n\n\n\nApache
ID\nName\nOrganization\nRole\nTimeZone\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwave\nDave
Fisher\n< [...]
+ "__html":
"开发人员\n本页面展示了Dubbo的开发团队。请通过提交PR的方式把自己的信息添加到列表上。注：排名不分先后\n提交者\n\n\n\nApache
ID\n姓名\n组织\n角色\n时区\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwave\nDave
Fisher\n\nMentor\ [...]
}
\ No newline at end of file
[incubator-dubbo-website] branch asf-site updated: build site
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 7a6d635 build site 7a6d635 is described below commit 7a6d6351021edd6a35b23c55d88bdde915fbe4d3 Author: zhuyong AuthorDate: Wed Oct 10 12:22:31 2018 +0800 build site --- 404.html | 1 + index.html | 1 + redirect.ejs | 1 + 3 files changed, 3 insertions(+) diff --git a/404.html b/404.html index 978e267..9adb33a 100644 --- a/404.html +++ b/404.html @@ -17,6 +17,7 @@ http://www.apache.org/foundation/thanks.html;>Thanks Copyright © 2018 The Apache Software Foundation. Apache and the Apache feather logo are trademarks of The Apache Software Foundation. + https://www.apache.org/security/;> diff --git a/index.html b/index.html index 978e267..9adb33a 100644 --- a/index.html +++ b/index.html @@ -17,6 +17,7 @@http://www.apache.org/foundation/thanks.html";>Thanks + ;>