This is an automated email from the ASF dual-hosted git repository.

huxing 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 21317dd  修正与源码不匹配的文档说明/加入订阅邮件列表 (#261)
21317dd is described below

commit 21317dd0a3af8c191b1c5c443be0b9740f882f99
Author: Jia He <[email protected]>
AuthorDate: Mon Jan 28 22:21:07 2019 +0800

    修正与源码不匹配的文档说明/加入订阅邮件列表 (#261)
---
 blog/en-us/dubbo-101.md                                        | 10 +++++-----
 .../contributor-guide/mailing-list-subscription-guide_dev.md   |  6 ++++--
 docs/en-us/user/references/xml/dubbo-service.md                |  3 ++-
 .../contributor-guide/mailing-list-subscription-guide_dev.md   |  6 ++++--
 docs/zh-cn/user/references/xml/dubbo-service.md                |  3 ++-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/blog/en-us/dubbo-101.md b/blog/en-us/dubbo-101.md
index cc98f37..336a03b 100644
--- a/blog/en-us/dubbo-101.md
+++ b/blog/en-us/dubbo-101.md
@@ -31,7 +31,7 @@ Here is how a typical RMI invocation usually works:
 Java RMI is a technique foundation stone of creating distributed applications 
in Java. The following EJB techniques and current framework of distributed 
services still inherit the fundamental concepts of Java RMI. In RMI invocation, 
there are some core concepts:
 
 1.     The invocation is run remotely on **interface**.
-2.     2.      Disguise remote invocation as local invocation by **Stub 
object** on client and **Skeleton object** on server.
+2.     Disguise remote invocation as local invocation by **Stub object** on 
client and **Skeleton object** on server.
 3.     The service is registered and looked up by **RMI** registry service.
 
 For 1. users are dependent on interfaces which should be implemented by server.
@@ -228,7 +228,7 @@ The build is finished when it shows `BUILD SUCCESS`. Then 
comes the running stag
 Run the service provider by the following maven command lines:
 
 ```bash
-$ mvn -Djava.net.preferIPv4Stack=true 
-Dexec.mainClass=com.alibaba.dubbo.samples.server.Application exec:java
+$ mvn -Djava.net.preferIPv4Stack=true 
-Dexec.mainClass=org.apache.dubbo.samples.provider.Application exec:java
 [INFO] Scanning for projects...
 [INFO]                                                                         
 [INFO] ------------------------------------------------------------------------
@@ -236,7 +236,7 @@ $ mvn -Djava.net.preferIPv4Stack=true 
-Dexec.mainClass=com.alibaba.dubbo.samples
 [INFO] ------------------------------------------------------------------------
 [INFO]
 [INFO] --- exec-maven-plugin:1.6.0:java (default-cli) @ dubbo-samples-api ---
-log4j:WARN No appenders could be found for logger 
(com.alibaba.dubbo.common.logger.LoggerFactory).
+log4j:WARN No appenders could be found for logger 
(org.apache.dubbo.common.logger.LoggerFactory).
 log4j:WARN Please initialize the log4j system properly.
 log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more 
info.
 first-dubbo-provider is running.
@@ -249,7 +249,7 @@ When *first-dubbo-provider is running* appears, the service 
provider is ready to
 Run the service consumer by the following maven command lines:
 
 ```bash
-$ mvn -Djava.net.preferIPv4Stack=true 
-Dexec.mainClass=com.alibaba.dubbo.samples.client.Application exec:java
+$ mvn -Djava.net.preferIPv4Stack=true 
-Dexec.mainClass=org.apache.dubbo.samples.consumer.Application exec:java
 [INFO] Scanning for projects...
 [INFO]                                                                         
 [INFO] ------------------------------------------------------------------------
@@ -257,7 +257,7 @@ $ mvn -Djava.net.preferIPv4Stack=true 
-Dexec.mainClass=com.alibaba.dubbo.samples
 [INFO] ------------------------------------------------------------------------
 [INFO]
 [INFO] --- exec-maven-plugin:1.6.0:java (default-cli) @ dubbo-samples-api ---
-log4j:WARN No appenders could be found for logger 
(com.alibaba.dubbo.common.logger.LoggerFactory).
+log4j:WARN No appenders could be found for logger 
(org.apache.dubbo.common.logger.LoggerFactory).
 log4j:WARN Please initialize the log4j system properly.
 log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more 
info.
 hi, dubbo
diff --git 
a/docs/en-us/developers/contributor-guide/mailing-list-subscription-guide_dev.md
 
b/docs/en-us/developers/contributor-guide/mailing-list-subscription-guide_dev.md
index 8dd7e17..b80914a 100644
--- 
a/docs/en-us/developers/contributor-guide/mailing-list-subscription-guide_dev.md
+++ 
b/docs/en-us/developers/contributor-guide/mailing-list-subscription-guide_dev.md
@@ -1,6 +1,8 @@
 # Mailing list subscription guide
 
-The Dubbo developer mailing list ([email protected]) for Apache 
Incubator has been established, please feel free to subscribe and refer to [1] 
for more details.
+The Dubbo developer mailing list ([email protected]) for Apache 
Incubator has been established, please feel free to subscribe and refer to [^1] 
for more details.
+
+You can also view [the archive of the mailing 
list](https://lists.apache.org/[email protected])
 
 Here is a brief guide specific to Dubbo:
 
@@ -75,4 +77,4 @@ subscription address.
 
 > Note that both [email protected] and [email protected] 
 > should work, you can pick any of it.
 
-[1] http://apache.org/foundation/mailinglists.html#subscribing
\ No newline at end of file
+[^1] http://apache.org/foundation/mailinglists.html#subscribing
\ No newline at end of file
diff --git a/docs/en-us/user/references/xml/dubbo-service.md 
b/docs/en-us/user/references/xml/dubbo-service.md
index 396e52c..a559d10 100644
--- a/docs/en-us/user/references/xml/dubbo-service.md
+++ b/docs/en-us/user/references/xml/dubbo-service.md
@@ -59,7 +59,8 @@ The configuration of the service provider. The corresponding 
class is `org.apach
 | connections | connections                 | int            | False       | 
100                                   | Performance optimize      | The maximum 
connections of every provider. For short connection such as rmi, http and 
hessian, it's connection limit, but for long connection such as dubbo, it's 
connection count. | Above 2.0.0   |
 | loadbalance | loadbalance                 | string         | False       | 
random                                | Performance optimize      | Strategy of 
load balance, `random`, `roundrobin` and `leastactive` are available. | Above 
2.0.0   |
 | async       | async                       | boolean        | False       | 
false                                 | Performance optimize      | 
Asynchronous execution, not reliable. It does not block the execution thread 
just only ignores the return value. | Above 2.0.0   |
-| stub        | stub                        | class/boolean  | False       | 
false                                 | Service governance        | `true` 
means use the default proxy class name, which is the interface name with 
`Local` as the suffix. It's used to execute local logic such as caching. The 
proxy class must have a constructor with the remote proxy object as a 
parameter, such as `public XxxServiceLocal(XxxService xxxService)` | Above 
2.0.0   |
+| local       | local                       | class/boolean  | False       | 
false                                 | Service governance        | `true` 
means use the default proxy class name, which is the interface name with 
`Local` as the suffix. But it has been marked as @Deprecated.Pleas see also 
stub.| Above 2.0.0   |
+| stub        | stub                        | class/boolean  | False       | 
false                                 | Service governance        | `true` 
means use the default proxy class name, which is the interface name with `Stub` 
as the suffix. It's used to execute local logic such as caching. The proxy 
class must have a constructor with the remote proxy object as a parameter, such 
as `public XxxServiceStub(XxxService xxxService)` | Above 2.0.0   |
 | mock        | mock                        | class/boolean  | False       | 
false                                 | Service governance        | `true` 
means use the default mock class name, which is the interface name with `Mock` 
suffix. It's called when the RPC is failed, such as timeout or IO exception. 
The mock class must carry a  none parameter constructor. The difference between 
mock and local proxy is that local proxy is always invoked before RPC but mock 
is invoked only when exce [...]
 | token       | token                       | string/boolean | False       | 
false                                 | Service governance        | Enable 
token validation. Disable token if it's null. It will generate token randomly 
when enable, or will use static token.  The token is designed to prevent 
consumers from bypassing the registry direct access to provider. If you want 
peer to peer, token validation must disbable. | Above 2.0.0   |
 | registry    |                             | string         | False       | 
register to all registries by default | Configuration association | Register 
services to specified registry while having multiple registries. It is the `id` 
value of the &lt;dubbo:registry&gt;. If don't want to register to any registry, 
set it as `N/A` | Above 2.0.0   |
diff --git 
a/docs/zh-cn/developers/contributor-guide/mailing-list-subscription-guide_dev.md
 
b/docs/zh-cn/developers/contributor-guide/mailing-list-subscription-guide_dev.md
index 62fd7c2..40200bc 100644
--- 
a/docs/zh-cn/developers/contributor-guide/mailing-list-subscription-guide_dev.md
+++ 
b/docs/zh-cn/developers/contributor-guide/mailing-list-subscription-guide_dev.md
@@ -1,6 +1,8 @@
 # 邮件列表订阅向导
 
-Apache 
incubator的Dubbo开发者邮件列表([email protected])已经建立,请随时订阅并参考[1]获取更多细节。
+Apache 
incubator的Dubbo开发者邮件列表([email protected])已经建立,请随时订阅并参考[^1]获取更多细节。
+
+你也可以直接查看[历史邮件](https://lists.apache.org/[email protected])
 
 下面是一个关于Dubbo邮件列表订阅的简短指南:
 
@@ -75,4 +77,4 @@ subscription address.
 
 > 请注意:[email protected][email protected]都是有效的, 
 > 您可以订阅它们中的任何一个。
 
-[1] http://apache.org/foundation/mailinglists.html#subscribing
\ No newline at end of file
+[^1] http://apache.org/foundation/mailinglists.html#subscribing
\ No newline at end of file
diff --git a/docs/zh-cn/user/references/xml/dubbo-service.md 
b/docs/zh-cn/user/references/xml/dubbo-service.md
index f74ee07..898bf66 100644
--- a/docs/zh-cn/user/references/xml/dubbo-service.md
+++ b/docs/zh-cn/user/references/xml/dubbo-service.md
@@ -59,7 +59,8 @@ table tr:hover {
 | connections | connections | int | 可选 | 100 | 性能调优 | 
对每个提供者的最大连接数,rmi、http、hessian等短连接协议表示限制连接数,dubbo等长连接协表示建立的长连接个数 | 2.0.0以上版本 |
 | loadbalance | loadbalance | string | 可选 | random | 性能调优 | 
负载均衡策略,可选值:random,roundrobin,leastactive,分别表示:随机,轮询,最少活跃调用 | 2.0.0以上版本 |
 | async | async | boolean | 可选 | false | 性能调优 | 是否缺省异步执行,不可靠异步,只是忽略返回值,不阻塞执行线程 
| 2.0.0以上版本 |
-| stub | stub | class/boolean | 可选 | false | 服务治理 | 设为true,表示使用缺省代理类名,即:接口名 + 
Local后缀,服务接口客户端本地代理类名,用于在客户端执行本地逻辑,如本地缓存等,该本地代理类的构造函数必须允许传入远程代理对象,构造函数如:public 
XxxServiceLocal(XxxService xxxService) | 2.0.0以上版本 |
+| local | local | class/boolean | 可选 | false | 服务治理 | 设为true,表示使用缺省代理类名,即:接口名 
+ Local后缀,已废弃,请使用stub| 2.0.0以上版本 |
+| stub | stub | class/boolean | 可选 | false | 服务治理 | 设为true,表示使用缺省代理类名,即:接口名 + 
Stub后缀,服务接口客户端本地代理类名,用于在客户端执行本地逻辑,如本地缓存等,该本地代理类的构造函数必须允许传入远程代理对象,构造函数如:public 
XxxServiceStub(XxxService xxxService) | 2.0.0以上版本 |
 | mock | mock | class/boolean | 可选 | false | 服务治理 | 设为true,表示使用缺省Mock类名,即:接口名 
+ 
Mock后缀,服务接口调用失败Mock实现类,该Mock类必须有一个无参构造函数,与Local的区别在于,Local总是被执行,而Mock只在出现非业务异常(比如超时,网络异常等)时执行,Local在远程调用之前执行,Mock在远程调用后执行。
 | 2.0.0以上版本 |
 | token | token | string/boolean | 可选 | false | 服务治理 | 
令牌验证,为空表示不开启,如果为true,表示随机生成动态令牌,否则使用静态令牌,令牌的作用是防止消费者绕过注册中心直接访问,保证注册中心的授权功能有效,如果使用点对点调用,需关闭令牌功能
 | 2.0.0以上版本 |
 | registry | | string | 可选 | 缺省向所有registry注册 | 配置关联 | 
向指定注册中心注册,在多个注册中心时使用,值为&lt;dubbo:registry&gt;的id属性,多个注册中心ID用逗号分隔,如果不想将该服务注册到任何registry,可将值设为N/A
 | 2.0.0以上版本 |

Reply via email to