date:20180823

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212517977
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/file-download.md
 ##
 @@ -146,13 +147,13 @@ 
org.apache.servicecomb.foundation.vertx.http.ReadStreamPart.saveToFile(String)
 org.apache.servicecomb.foundation.vertx.http.ReadStreamPart.saveToFile(File, 
OpenOptions)
 ```
 
-注意：
+note:
 
-* 在得到ReadStreamPart实例时，并没有完成文件内容的下载，调用save系列方法才开始真正从网络上读取文件数据。
+* When the ReadStreamPart instance is obtained, the file content is not 
downloaded. The save series method is called to start reading the file data 
from the network.
 
 Review comment:
   save series 对吗？


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212517686
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/file-download.md
 ##
 @@ -69,75 +69,76 @@ return ResponseEntity
 .body(stream);
 ```
 
-在下载完成后，ServiceComb会自动关闭stream，开发人员不必再关注
+After the download is complete, ServiceComb will automatically close the 
stream, and developers don't have to pay attention
 
-## 5.文件类型判定
+## 5. File type determination
 
-只要没有通过ResponseEntity直接设置HttpHeaders.CONTENT\_TYPE，ServiceComb都会尝试通过File、Part、Resource中的文件名后缀进行自动判定。
+As long as the HttpHeaders.CONTENT\_TYPE is not set directly via 
ResponseEntity, ServiceComb will try to automatically determine the file name 
suffix in File, Part, and Resource.
 
-ServiceComb使用java的mime 
type机制进行文件类型判定，如果业务场景中的文件后缀无法被识别，ServiceComb会默认处理为application/octet-stream
+ServiceComb uses java's mime type mechanism for file type determination. If 
the file suffix in the business scenario cannot be identified, ServiceComb will 
default to application/octet-stream.
 
-如果这不满足要求，假设文件后缀为xyz，期望文件类型为application/file-xyz，以下方式任选一种均可解决：
+If this does not meet the requirements, assuming the file suffix is, and the 
expected file type is application/file-xyz, any of the following methods can be 
resolved:
 
-### 1）通过Java的mime type机制扩展
+### 1)Expanding through Java's mime type mechanism
 
 Review comment:
   扩展是Extend


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212517073
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/dnsconfig.md
 ##
 @@ -1,41 +1,41 @@
-## 场景描述
+## Scene Description
 
-用户使用域名连接华为公有云或者三方系统时，需要使用到域名解析系统。在不同的系统、不同的框架使用的域名解析机制都可能不太一样。所以我们有必要提供一个统一的配置入口，以便开发运维人员可以自定义DNS解析机制，而不完全受制于系统配置。
+When a user uses a domain name to connect to a Huawei public cloud or a 
three-party system, you need to use the domain name resolution system. The 
domain name resolution mechanisms used in different systems and different 
frameworks may be different. Therefore, it is necessary to provide a unified 
configuration entry so that development and operation personnel can customize 
the DNS resolution mechanism without being completely subject to system 
configuration.
 
-## DNS配置
+## DNS Configuration
 
-DNS配置项写在microservice.yaml文件中，支持统一制定证书，也可以添加tag进行更细粒度的配置，有tag的配置会覆盖全局配置，配置格式如下：
+The DNS configuration item is written in the microservice.yaml file. It 
supports the unified development of certificates. It can also add tags for more 
fine-grained configuration. The tag configuration overrides the global 
configuration. The configuration format is as follows:
 
 ```
 addressResolver.[tag].[property]
 ```
 
-常见的tag如下表：   
+The common tags are as follows:
 
-| 项目 | tag |
+| Project | tag |
 | :--- | :--- |
-| 服务中心 | sc.consumer |
-| 配置中心 | cc.consumer |
-| 看板中心 | mc.consumer |
-| 用户自定义 | self.tag |
+| Service Center | sc.consumer |
+| Configuration Center | cc.consumer |
+| Kanban Center | mc.consumer |
+| User Defined | self.tag |
 
-各个properties详细说明（设置Vertx DNS解析）
+The detailed description of each property (Set Vertx DNS resolution)
 
 ``` yaml
 addressResolver:
-  servers: 8.8.8.8,8.8.4.4   #对应Linux 
/etc/resolv.conf的nameserver,DNS服务器地址，支持配置多个，以逗号隔开
-  ndots: 1   #对应linux /etc/resolv.conf里面的options: ndots, 
作用就是如果给的域名里面包含的点的个数少于该阈值，那么DNS解析的时候就会默认加上searchDomains的值，这个必须和searchDomains搭配使用，Linux默认为1，华为公有云PAAS（包含容器）默认是4
 
 Review comment:
   不要华为公有云PAAS（包含容器）这些内容


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212517350
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/file-download.md
 ##
 @@ -1,34 +1,34 @@
-文件下载，当前在vertx rest通道和servlet rest中可用。
+File downloads are currently available in the vertx rest channel and servlet 
rest.
 
-# 一、Producer
+# First, producer
 
-## 1.下载普通文件
+## 1. Download normal files
 
 ```
 return new File(..);
 ```
 
-## 2.下载临时文件
+## 2. Download temporary files
 
-本场景下，需要根据请求参数动态创建临时文件，下载完成后，需要将临时文件删除
+In this scenario, you need to create temporary files based on the request 
parameters dynamically. After the download is complete, you need to delete the 
temporary files.
 
 ```
 return new FilePart(file).setDeleteAfterFinished(true);
 ```
 
-## 3.下载org.springframework.core.io.Resource
+## 3. Download org.springframework.core.io.Resource
 
-因为resource不一定表示文件下载，所以需要通过swagger annotation（@ApiResponse）标识这是一个文件下载场景
+Because the resource does not necessarily mean file download, you need to 
identify this file download scenario by swagger annotation (@ApiResponse).
 
 Review comment:
   这句翻译请重新整理


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212517502
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/file-download.md
 ##
 @@ -55,11 +55,11 @@ public ResponseEntity resource() {
 }
 ```
 
-## 4.下载InputStream
+## 4.Download InputStream
 
-因为InputStream不一定表示文件下载，所以需要通过swagger annotation（@ApiResponse）标识这是一个文件下载场景
+Because InputStream does not necessarily mean file downloading, it needs to be 
identified by swagger annotation (@ApiResponse). This is a file download 
scenario.
 
-有的场景下，资源并不保存在本地，比如保存在OBS云服务中，而OBS资源是以InputStream方式输出的
 
 Review comment:
   不要OBServer云服务什么的


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212517434
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/file-download.md
 ##
 @@ -55,11 +55,11 @@ public ResponseEntity resource() {
 }
 ```
 
-## 4.下载InputStream
+## 4.Download InputStream
 
-因为InputStream不一定表示文件下载，所以需要通过swagger annotation（@ApiResponse）标识这是一个文件下载场景
+Because InputStream does not necessarily mean file downloading, it needs to be 
identified by swagger annotation (@ApiResponse). This is a file download 
scenario.
 
 Review comment:
   这句翻译请重新整理


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212516130
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/dnsconfig.md
 ##
 @@ -1,41 +1,41 @@
-## 场景描述
+## Scene Description
 
-用户使用域名连接华为公有云或者三方系统时，需要使用到域名解析系统。在不同的系统、不同的框架使用的域名解析机制都可能不太一样。所以我们有必要提供一个统一的配置入口，以便开发运维人员可以自定义DNS解析机制，而不完全受制于系统配置。
 
 Review comment:
   去掉华为云部分


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212511254
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/AlarmEvent.md
 ##
 @@ -1,11 +1,11 @@
-# 获取熔断与实例隔离告警事件
+# Get the fuse and instance isolation alarm events
 
-## 场景描述
-* 在微服务运行期间熔断或实例隔离状态发生变化时，需要监听到相关事件，获取相关信息并进行处理
+## Scene Description
+* When the microservice is running or the instance isolation status changes, 
you need to listen to related events, get relevant information and process it.
 
-## 使用参考
+## Use Reference
 
-* 监听熔断事件
+* Monitor blown events
 
 Review comment:
   熔断这个词怎么翻译比较好？


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212512688
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/context.md
 ##
 @@ -1,36 +1,36 @@
-# 使用Context传递控制消息
+# Delivery Context Control Message
 
-ServiceComb提供了Context在微服务之间传递数据。Context是key/value对，只能够使用String类型的数据。由于Context会序列化为json格式并通过HTTP
 
Header传递，因此也不支持ASCII之外的字符，其他字符需要开发者先自行编码再传递。Context在一次请求中，会在请求链上传递，不需要重新设置。[access
 log](../build-provider/access-log-configuration.md)的trace id等功能都基于这个特性实现的。
+ServiceComb provides a Context to delivery data between microservices. Context 
is a key/value pair and can only use data of type String. Since the Context is 
serialized into the Json format and passed through the HTTP header, characters 
other than ASCII are not supported. Other characters require the developer to 
encode and pass the code. The Context is passed on the request chain in a 
single request and does not need to be reset. The functions such as trace id of 
[access log](../build-provider/access-log-configuration.md) are implemented 
based on this feature.
 
-## 场景描述
-* 在认证场景，Edge Service认证通过以后，需要将会话ID、用户名称等信息传递给微服务，实现鉴权等逻辑
-* 灰度发布场景，需要结合自定义的tag实现引流，tag信息需要传递给微服务
+## Scene Description
+* In the authentication scenario, after the Edge Service authentication is 
passed, the session ID, username, and other information need to be passed to 
the microservice to implement authentication and other logic.
+* Grayscale publishing scenarios, need to be combined with custom tags to 
achieve drainage, tag information needs to be passed to the microservices
 
-## 使用参考
+## Use Reference
 
-* 在Hanlder中获取和设置Context
+* Get and set the Context in Handler
 
-Handler包含了Invocation对象，可以直接调用invocation.addContext和invocation.getContext设置。
+The Handler contains the Invocation object, which can be called directly in 
the invocation.addContext and invocation.getContext settings.
 
-* 在服务接口中获取Context
+* Get Context in the service interface
 
-通过接口注入
+Inject through the interface
 ```
 public Response cseResponse(InvocationContext c1)
 ```
-或者
+or
 ```
 ContextUtils.getInvocationContext()
 ```
 
-* 在Edge Service中设置Context
+* Set the Context in the Edge Service
 
-通过重载EdgeInvocation
+By overloading EdgeInvocation
 
 Review comment:
   overloading  -> override


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212515723
 
 

 ##
 File path: 
java-chassis-reference/en_US/general-development/cross-app-invocation.md
 ##
 @@ -33,14 +33,14 @@ consumer端指定微服务名称调用provider的时候，需要加上provider
 String.class, "ServiceComb");
   ```
 
-- RPC调用方式
+- RPC call method
 
 Review comment:
   method -> mode


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212511879
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/context.md
 ##
 @@ -1,36 +1,36 @@
-# 使用Context传递控制消息
+# Delivery Context Control Message
 
-ServiceComb提供了Context在微服务之间传递数据。Context是key/value对，只能够使用String类型的数据。由于Context会序列化为json格式并通过HTTP
 
Header传递，因此也不支持ASCII之外的字符，其他字符需要开发者先自行编码再传递。Context在一次请求中，会在请求链上传递，不需要重新设置。[access
 log](../build-provider/access-log-configuration.md)的trace id等功能都基于这个特性实现的。
+ServiceComb provides a Context to delivery data between microservices. Context 
is a key/value pair and can only use data of type String. Since the Context is 
serialized into the Json format and passed through the HTTP header, characters 
other than ASCII are not supported. Other characters require the developer to 
encode and pass the code. The Context is passed on the request chain in a 
single request and does not need to be reset. The functions such as trace id of 
[access log](../build-provider/access-log-configuration.md) are implemented 
based on this feature.
 
-## 场景描述
-* 在认证场景，Edge Service认证通过以后，需要将会话ID、用户名称等信息传递给微服务，实现鉴权等逻辑
-* 灰度发布场景，需要结合自定义的tag实现引流，tag信息需要传递给微服务
+## Scene Description
+* In the authentication scenario, after the Edge Service authentication is 
passed, the session ID, username, and other information need to be passed to 
the microservice to implement authentication and other logic.
+* Grayscale publishing scenarios, need to be combined with custom tags to 
achieve drainage, tag information needs to be passed to the microservices
 
 Review comment:
   to achieve drainage -> in order to dispatch request


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212516211
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/dnsconfig.md
 ##
 @@ -1,41 +1,41 @@
-## 场景描述
+## Scene Description
 
-用户使用域名连接华为公有云或者三方系统时，需要使用到域名解析系统。在不同的系统、不同的框架使用的域名解析机制都可能不太一样。所以我们有必要提供一个统一的配置入口，以便开发运维人员可以自定义DNS解析机制，而不完全受制于系统配置。
+When a user uses a domain name to connect to a Huawei public cloud or a 
three-party system, you need to use the domain name resolution system. The 
domain name resolution mechanisms used in different systems and different 
frameworks may be different. Therefore, it is necessary to provide a unified 
configuration entry so that development and operation personnel can customize 
the DNS resolution mechanism without being completely subject to system 
configuration.
 
-## DNS配置
+## DNS Configuration
 
-DNS配置项写在microservice.yaml文件中，支持统一制定证书，也可以添加tag进行更细粒度的配置，有tag的配置会覆盖全局配置，配置格式如下：
+The DNS configuration item is written in the microservice.yaml file. It 
supports the unified development of certificates. It can also add tags for more 
fine-grained configuration. The tag configuration overrides the global 
configuration. The configuration format is as follows:
 
 ```
 addressResolver.[tag].[property]
 ```
 
-常见的tag如下表：   
+The common tags are as follows:
 
-| 项目 | tag |
+| Project | tag |
 | :--- | :--- |
-| 服务中心 | sc.consumer |
-| 配置中心 | cc.consumer |
-| 看板中心 | mc.consumer |
-| 用户自定义 | self.tag |
+| Service Center | sc.consumer |
+| Configuration Center | cc.consumer |
+| Kanban Center | mc.consumer |
 
 Review comment:
   没有看板


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212516058
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/dai-li-she-zhi.md
 ##
 @@ -1,32 +1,29 @@
-## 背景
+## background
 
-作为一名开发者，在公司开发环境，可能是通过公司代理网络接入到因特网。如果调试服务时还必须依赖网上资源，比如直接连接华为共有云服务中心，那么就必须配置代理。
+As a developer, in a company development environment, it is possible to access 
the Internet through a corporate agent network. If debugging services depends 
on online resources, such as directly connecting to public cloud service 
center, you must configure the agent.
 
-配置方式，在microservice.yaml文件增加proxy配置：
+Configuration mode, add proxy configuration in microservice.yaml file:
 
 ```yaml
 servicecomb:
-  proxy:
-enable: true#是否开启代理
-host: yourproxyaddress  #代理地址
-port: 80#代理端口
-username: yourname  #用户名
-passwd: yourpassword#密码
+  proxy:
+enable: true #Do you want to enable the proxy?
+host: yourproxyaddress #proxy address
+port: 80 #proxy port
+username: yourname #username
+passwd: yourpassword #password
 ```
 
-**注意：当前仅支持连接服务中心、配置中心、服务看板支持代理，如果对接其他三方服务，可以读取这个配置，自行配置代理，vertx 
httpclient支持代理设置，例如：**
 
 Review comment:
   没有服务看板


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212506173
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/AlarmEvent.md
 ##
 @@ -1,11 +1,11 @@
-# 获取熔断与实例隔离告警事件
+# Get the fuse and instance isolation alarm events
 
-## 场景描述
-* 在微服务运行期间熔断或实例隔离状态发生变化时，需要监听到相关事件，获取相关信息并进行处理
+## Scene Description
+* When the microservice is running or the instance isolation status changes, 
you need to listen to related events, get relevant information and process it.
 
 Review comment:
   When the microservice is running or the instance isolation status changes 
这句话和原文的意思好像没有对上


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212515913
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/dai-li-she-zhi.md
 ##
 @@ -1,32 +1,29 @@
-## 背景
+## background
 
-作为一名开发者，在公司开发环境，可能是通过公司代理网络接入到因特网。如果调试服务时还必须依赖网上资源，比如直接连接华为共有云服务中心，那么就必须配置代理。
 
 Review comment:
   删掉华为公有云部分


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212515800
 
 

 ##
 File path: 
java-chassis-reference/en_US/general-development/cross-app-invocation.md
 ##
 @@ -33,14 +33,14 @@ consumer端指定微服务名称调用provider的时候，需要加上provider
 String.class, "ServiceComb");
   ```
 
-- RPC调用方式
+- RPC call method
 
-  当consumer端以RPC方式开发微服务消费者时，声明的服务提供者代理如下：
+  When the consumer client develops a microservice consumer in RPC mode, the 
declared service provider proxy is as follows:
   ```java
 @RpcReference(schemaId = "hello", microserviceName = 
"helloApp:helloProvider")
 private Hello hello;
   ```
-  调用方式和调用同应用下的微服务相同：
+  The calling method and calling are the same as the microservices under the 
application:
 
 Review comment:
   这句话的翻译 诡异


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212511326
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/CORS.md
 ##
 @@ -1,29 +1,29 @@
-# CORS机制
+# CORS mechanism
 
-## 概念阐述
+## Concept Description
 
-跨域资源共享(CORS, Cross-Origin Resource Sharing)允许Web服务器进行跨域访问控制，使浏览器可以更安全地进行跨域数据传输。
+Cross-Origin Resource Sharing (CORS) allows Web servers to perform 
cross-domain access control, enabling browsers to more securely transfer data 
across domains.
 
-## 场景描述
+## Scene Description
 
 Review comment:
   Scene -> scenario


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on a change in pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

zhengyangyong commented on a change in pull request #47: General development 
dir translation and include img
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/47#discussion_r212506080
 
 

 ##
 File path: java-chassis-reference/en_US/general-development/AlarmEvent.md
 ##
 @@ -1,11 +1,11 @@
-# 获取熔断与实例隔离告警事件
+# Get the fuse and instance isolation alarm events
 
 Review comment:
   建议改成Get the degradation and isolate points of access events ?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] coveralls commented on issue #269: [SCB-864] Add SQLTransport and JacksonSQLFormat

2018-08-23 Thread GitBox

coveralls commented on issue #269: [SCB-864] Add SQLTransport and 
JacksonSQLFormat
URL: 
https://github.com/apache/incubator-servicecomb-saga/pull/269#issuecomment-415642944
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18645962/badge)](https://coveralls.io/builds/18645962)
   
   Coverage decreased (-0.2%) to 93.708% when pulling 
**85341a149fa1425d5021142efe883e3d2be93470 on KomachiSion:SCB-864** into 
**6dee5988235181f3b0c90c99b0dc1a73d6b612f7 on apache:master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] KomachiSion opened a new pull request #269: [SCB-864] Add SQLTransport and JacksonSQLFormat

2018-08-23 Thread GitBox

KomachiSion opened a new pull request #269: [SCB-864] Add SQLTransport and 
JacksonSQLFormat
URL: https://github.com/apache/incubator-servicecomb-saga/pull/269
 
 
   Add SQLTransport in saga-core and add JacksonSQLFormat in saga-format


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] zhengyangyong commented on issue #40: Using java chassis in spring boot dir translation

2018-08-23 Thread GitBox

zhengyangyong commented on issue #40: Using java chassis in spring boot dir 
translation
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/40#issuecomment-415628732
 
 
   please rebase and solve conflicts


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] coveralls edited a comment on issue #882: [SCB-206] Support setting produces and consumes by @Api

2018-08-23 Thread GitBox

coveralls edited a comment on issue #882: [SCB-206] Support setting produces 
and consumes by @Api
URL: 
https://github.com/apache/incubator-servicecomb-java-chassis/pull/882#issuecomment-414963018
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18636263/badge)](https://coveralls.io/builds/18636263)
   
   Coverage increased (+0.0006%) to 86.187% when pulling 
**43816afb940440b53840482b9f068390b9e45c78 on 
yhs0092:support_setting_produces_and_consumes_by_Api** into 
**3c7f128c9e50239398847126e7857a8db98d85b4 on apache:master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] yhs0092 commented on a change in pull request #882: [SCB-206] Support setting produces and consumes by @Api

2018-08-23 Thread GitBox

yhs0092 commented on a change in pull request #882: [SCB-206] Support setting 
produces and consumes by @Api
URL: 
https://github.com/apache/incubator-servicecomb-java-chassis/pull/882#discussion_r212379475
 
 

 ##
 File path: 
swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessor.java
 ##
 @@ -17,18 +17,69 @@
 
 package org.apache.servicecomb.swagger.generator.core.processor.annotation;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.apache.servicecomb.swagger.generator.core.ClassAnnotationProcessor;
 import org.apache.servicecomb.swagger.generator.core.SwaggerGenerator;
 import org.springframework.util.StringUtils;
 
 import io.swagger.annotations.Api;
+import io.swagger.models.Swagger;
 
 Review comment:
   Integration test has been added.
   In order to test the consumes, I change `BodyProcessor` in 
`BodyProcessorCreator.java` to let users can specify request 
Content-Type(Currently it's `application/json` mandatorily).


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] asifdxtreme commented on issue #422: No 1.0.0 release tag in Docker hub.

2018-08-23 Thread GitBox

asifdxtreme commented on issue #422: No 1.0.0 release tag in Docker hub.
URL: 
https://github.com/apache/incubator-servicecomb-service-center/issues/422#issuecomment-415474053
 
 
   This issue is fixed now, I am going ahead to close this issue, feel free to 
open it if any concerns.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] asifdxtreme commented on issue #425: build script for docker image gives an error

2018-08-23 Thread GitBox

asifdxtreme commented on issue #425: build script for docker image gives an 
error
URL: 
https://github.com/apache/incubator-servicecomb-service-center/issues/425#issuecomment-415473548
 
 
   This bug is fixed, going ahead to close this issue


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] asifdxtreme closed issue #425: build script for docker image gives an error

2018-08-23 Thread GitBox

asifdxtreme closed issue #425: build script for docker image gives an error
URL: https://github.com/apache/incubator-servicecomb-service-center/issues/425
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] coveralls commented on issue #268: SCB-865 Implement reaction of the event in Alpha Server

2018-08-23 Thread GitBox

coveralls commented on issue #268: SCB-865 Implement reaction of the event in 
Alpha Server
URL: 
https://github.com/apache/incubator-servicecomb-saga/pull/268#issuecomment-415440047
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18632941/badge)](https://coveralls.io/builds/18632941)
   
   Coverage decreased (-3.3%) to 90.563% when pulling 
**908b834b05f4e1e8c34dd634e25a8d130ff0571e on cherrylzhao:master** into 
**6dee5988235181f3b0c90c99b0dc1a73d6b612f7 on apache:master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] wujimin commented on a change in pull request #882: [SCB-206] Support setting produces and consumes by @Api

2018-08-23 Thread GitBox

wujimin commented on a change in pull request #882: [SCB-206] Support setting 
produces and consumes by @Api
URL: 
https://github.com/apache/incubator-servicecomb-java-chassis/pull/882#discussion_r212331169
 
 

 ##
 File path: 
swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessor.java
 ##
 @@ -17,18 +17,69 @@
 
 package org.apache.servicecomb.swagger.generator.core.processor.annotation;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.apache.servicecomb.swagger.generator.core.ClassAnnotationProcessor;
 import org.apache.servicecomb.swagger.generator.core.SwaggerGenerator;
 import org.springframework.util.StringUtils;
 
 import io.swagger.annotations.Api;
+import io.swagger.models.Swagger;
 
 public class ApiProcessor implements ClassAnnotationProcessor {
   @Override
   public void process(Object annotation, SwaggerGenerator swaggerGenerator) {
 Api api = (Api) annotation;
 
 setTags(api, swaggerGenerator);
+// except for @Api, @RequestMapping can also set consumes and produces
+// @RequestMapping takes HIGHER priority than @Api for legacy reason
+processConsumes(api, swaggerGenerator.getSwagger());
 
 Review comment:
   ok


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] cherrylzhao opened a new pull request #268: SCB-865 Implement reaction of the event in Alpha Server

2018-08-23 Thread GitBox

cherrylzhao opened a new pull request #268: SCB-865 Implement reaction of the 
event in Alpha Server
URL: https://github.com/apache/incubator-servicecomb-saga/pull/268
 
 
   Implement reaction of TCC event in alpha server, which involves
   -  rpc OnConnected (GrpcServiceConfig) returns (stream 
GrpcTccCordinateCommand)
   - rpc participate(GrpcTccParticipateEvent) returns (GrpcAck)
   - rpc OnTccTransactionEnded (GrpcTccTransactionEndedEvent) returns (GrpcAck)
   - rpc OnDisconnected (GrpcServiceConfig) returns (GrpcAck)
   - Add junit test framework code for alpha TCC workflow.
   - Integrate alpha saga and tcc within same boot which are different with 
port.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-saga] branch master updated: SCB-817 Added the unit tests of TCC related Aspect

2018-08-23 Thread ningjiang

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/incubator-servicecomb-saga.git


The following commit(s) were added to refs/heads/master by this push:
 new 6dee598  SCB-817 Added the unit tests of TCC related Aspect
6dee598 is described below

commit 6dee5988235181f3b0c90c99b0dc1a73d6b612f7
Author: Willem Jiang 
AuthorDate: Thu Aug 23 16:42:40 2018 +0800

SCB-817 Added the unit tests of TCC related Aspect
---
 .../omega/transaction/tcc/TccEventService.java |   2 -
 .../transaction/tcc/TccParticipatorAspect.java |   8 +-
 .../tcc/TccStartAnnotationProcessor.java   |  14 +-
 .../saga/omega/transaction/tcc/TccStartAspect.java |   4 +-
 .../transaction/tcc/events/ParticipatedEvent.java  |  24 +++
 .../transaction/tcc/events/TccEndedEvent.java  |  14 +-
 .../transaction/tcc/events/TccStartedEvent.java|   4 -
 .../transaction/tcc/TccParticipatorAspectTest.java | 169 +
 .../tcc/TccStartAnnotationProcessorTest.java   | 155 +++
 .../omega/transaction/tcc/TccStartAspectTest.java  | 164 
 10 files changed, 534 insertions(+), 24 deletions(-)

diff --git 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
index a722f49..48ad743 100644
--- 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
+++ 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
@@ -38,7 +38,5 @@ public interface TccEventService {
   AlphaResponse TccTransactionStart(TccStartedEvent tccStartEvent);
 
   AlphaResponse TccTransactionStop(TccEndedEvent tccEndEvent);
-
-  AlphaResponse send(TxEvent event);
   
 }
diff --git 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
index e64bc2a..a78d819 100644
--- 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
+++ 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
@@ -61,14 +61,14 @@ public class TccParticipatorAspect {
 try {
   Object result = joinPoint.proceed();
   // Send the participate message back
-  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, cancelMethod, confirmMethod,
-  TransactionStatus.Succeed));
+  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, confirmMethod,
+  cancelMethod, TransactionStatus.Succeed));
   LOG.debug("Participate Transaction with context {} has finished.", 
context);
   return result;
 } catch (Throwable throwable) {
   // Now we don't handle the error message
-  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, cancelMethod,
-  confirmMethod, TransactionStatus.Failed));
+  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, confirmMethod,
+  cancelMethod, TransactionStatus.Failed));
   LOG.error("Participate Transaction with context {} failed.", context, 
throwable);
   throw throwable;
 } finally {
diff --git 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
index 26621d1..55198dd 100644
--- 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
+++ 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
@@ -21,13 +21,11 @@ import javax.transaction.TransactionalException;
 import org.apache.servicecomb.saga.common.TransactionStatus;
 import org.apache.servicecomb.saga.omega.context.OmegaContext;
 import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.EventAwareInterceptor;
 import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.TxAbortedEvent;
 import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
 import 
org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
 
-public class TccStartAnnotationProcessor implements EventAwareInterceptor {
+public class

[GitHub] WillemJiang closed pull request #267: SCB-817 Added the unit tests of TCC related Aspect

2018-08-23 Thread GitBox

WillemJiang closed pull request #267: SCB-817 Added the unit tests of TCC 
related Aspect
URL: https://github.com/apache/incubator-servicecomb-saga/pull/267
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-java-chassis] branch master updated: [SCB-861]490, 590 response not properly used

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
 new ea17cca  [SCB-861]490,590 response not properly used
ea17cca is described below

commit ea17cca3e2e35a2f2b779533189f242b0b1f9324
Author: liubao 
AuthorDate: Wed Aug 22 11:13:17 2018 +0800

[SCB-861]490,590 response not properly used
---
 .../client/CodeFirstRestTemplateSpringmvc.java |  5 ++
 .../demo/springmvc/client/SpringmvcClient.java | 15 --
 .../demo/springmvc/client/TestResponse.java| 10 +---
 .../demo/springmvc/server/CodeFirstSpringmvc.java  | 22 
 .../src/main/resources/microservice.yaml   |  4 +-
 .../swagger/invocation/response/ResponsesMeta.java |  7 +--
 .../rest/client/http/DefaultHttpClientFilter.java  | 21 +++-
 .../client/http/TestDefaultHttpClientFilter.java   | 59 --
 8 files changed, 108 insertions(+), 35 deletions(-)

diff --git 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
index af27ccd..e34b340 100644
--- 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
+++ 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
@@ -173,6 +173,7 @@ public class CodeFirstRestTemplateSpringmvc extends 
CodeFirstRestTemplate {
   }
 
   private void testFallback(RestTemplate template, String cseUrlPrefix) {
+long start = System.currentTimeMillis();
 String result = template.getForObject(cseUrlPrefix + 
"/fallback/returnnull/hello", String.class);
 TestMgr.check(result, "hello");
 result = template.getForObject(cseUrlPrefix + 
"/fallback/returnnull/throwexception", String.class);
@@ -199,6 +200,10 @@ public class CodeFirstRestTemplateSpringmvc extends 
CodeFirstRestTemplate {
 
 result = template.getForObject(cseUrlPrefix + "/fallback/force/hello", 
String.class);
 TestMgr.check(result, "mockedreslut");
+
+// This test case is fallback testing and will return null if failed.
+// In order to check if failed due to some unexpected timeout exception, 
check the time.
+TestMgr.check(System.currentTimeMillis() - start < 1, true);
   }
 
   private void testResponseEntity(String microserviceName, RestTemplate 
template, String cseUrlPrefix) {
diff --git 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
index 37aa870..3e5aa1c 100644
--- 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++ 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -54,12 +54,19 @@ public class SpringmvcClient {
   private static Controller controller;
 
   public static void main(String[] args) throws Exception {
-Log4jUtils.init();
-BeanUtils.init();
+try {
+  Log4jUtils.init();
+  BeanUtils.init();
 
-run();
+  run();
 
-TestMgr.summary();
+  TestMgr.summary();
+} catch (Throwable e) {
+  TestMgr.check("success", "failed");
+  System.err.println("-- test failed -");
+  e.printStackTrace();
+  System.err.println("-- test failed -");
+}
   }
 
   public static void run() {
diff --git 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
index 0cd6028..95db734 100644
--- 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
+++ 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
@@ -146,15 +146,7 @@ public class TestResponse {
 }
 Objects.requireNonNull(exception);
 // 2. CseException: bizKeeper exception
-Throwable wrappedException = exception.getCause();
-TestMgr.check(CseException.class, wrappedException.getClass());
-// 3. InvocationException: decoder wrapping exception
-wrappedException = wrappedException.getCause();
-TestMgr.check(InvocationException.class, wrappedException.getClass());
-TestMgr.check("InvocationException: code=490;msg=CommonExceptionData 
[message=Cse Internal Bad Request]",
-

[GitHub] liubao68 closed pull request #881: [SCB-861]490, 590 response not properly used

2018-08-23 Thread GitBox

liubao68 closed pull request #881: [SCB-861]490,590 response not properly used
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/881
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
index af27ccdf3..e34b340c7 100644
--- 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
+++ 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
@@ -173,6 +173,7 @@ private String testRestTemplateUpload(RestTemplate 
template, String cseUrlPrefix
   }
 
   private void testFallback(RestTemplate template, String cseUrlPrefix) {
+long start = System.currentTimeMillis();
 String result = template.getForObject(cseUrlPrefix + 
"/fallback/returnnull/hello", String.class);
 TestMgr.check(result, "hello");
 result = template.getForObject(cseUrlPrefix + 
"/fallback/returnnull/throwexception", String.class);
@@ -199,6 +200,10 @@ private void testFallback(RestTemplate template, String 
cseUrlPrefix) {
 
 result = template.getForObject(cseUrlPrefix + "/fallback/force/hello", 
String.class);
 TestMgr.check(result, "mockedreslut");
+
+// This test case is fallback testing and will return null if failed.
+// In order to check if failed due to some unexpected timeout exception, 
check the time.
+TestMgr.check(System.currentTimeMillis() - start < 1, true);
   }
 
   private void testResponseEntity(String microserviceName, RestTemplate 
template, String cseUrlPrefix) {
diff --git 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
index 37aa87054..3e5aa1c15 100644
--- 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++ 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -54,12 +54,19 @@
   private static Controller controller;
 
   public static void main(String[] args) throws Exception {
-Log4jUtils.init();
-BeanUtils.init();
+try {
+  Log4jUtils.init();
+  BeanUtils.init();
 
-run();
+  run();
 
-TestMgr.summary();
+  TestMgr.summary();
+} catch (Throwable e) {
+  TestMgr.check("success", "failed");
+  System.err.println("-- test failed -");
+  e.printStackTrace();
+  System.err.println("-- test failed -");
+}
   }
 
   public static void run() {
diff --git 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
index 0cd60284f..95db734ed 100644
--- 
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
+++ 
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
@@ -146,15 +146,7 @@ private void testDecodeResponseError() {
 }
 Objects.requireNonNull(exception);
 // 2. CseException: bizKeeper exception
-Throwable wrappedException = exception.getCause();
-TestMgr.check(CseException.class, wrappedException.getClass());
-// 3. InvocationException: decoder wrapping exception
-wrappedException = wrappedException.getCause();
-TestMgr.check(InvocationException.class, wrappedException.getClass());
-TestMgr.check("InvocationException: code=490;msg=CommonExceptionData 
[message=Cse Internal Bad Request]",
-wrappedException.getMessage());
-// 4. InvalidFormatException: decode exception
-Object cause = wrappedException.getCause();
+Throwable cause = exception.getCause();
 TestMgr.check(InvalidFormatException.class, cause.getClass());
 TestMgr.check(
 "Cannot deserialize value of type `java.util.Date` from String 
\"returnOK\": not a valid representation "
diff --git 
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
 
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
index

[GitHub] imlidian commented on issue #40: Using java chassis in spring boot dir translation

2018-08-23 Thread GitBox

imlidian commented on issue #40: Using java chassis in spring boot dir 
translation
URL: 
https://github.com/apache/incubator-servicecomb-docs/pull/40#issuecomment-415375405
 
 
   @zhengyangyong all done


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] imlidian opened a new pull request #47: General development dir translation and include img

2018-08-23 Thread GitBox

imlidian opened a new pull request #47: General development dir translation and 
include img
URL: https://github.com/apache/incubator-servicecomb-docs/pull/47
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] coveralls edited a comment on issue #265: SCB-865 Implement reaction of the event in Alpha Server

2018-08-23 Thread GitBox

coveralls edited a comment on issue #265: SCB-865 Implement reaction of the 
event in Alpha Server
URL: 
https://github.com/apache/incubator-servicecomb-saga/pull/265#issuecomment-415079111
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18628402/badge)](https://coveralls.io/builds/18628402)
   
   Coverage decreased (-1.1%) to 88.147% when pulling 
**f8962974af33f0c1ad8d57e083300e95262bae42 on cherrylzhao:master** into 
**0ee4c59169224e9a2f4ab76f44216a2784df02bd on apache:master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] coveralls edited a comment on issue #265: SCB-865 Implement reaction of the event in Alpha Server

2018-08-23 Thread GitBox

coveralls edited a comment on issue #265: SCB-865 Implement reaction of the 
event in Alpha Server
URL: 
https://github.com/apache/incubator-servicecomb-saga/pull/265#issuecomment-415079111
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18628348/badge)](https://coveralls.io/builds/18628348)
   
   Coverage decreased (-1.2%) to 88.073% when pulling 
**f8962974af33f0c1ad8d57e083300e95262bae42 on cherrylzhao:master** into 
**0ee4c59169224e9a2f4ab76f44216a2784df02bd on apache:master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] cherrylzhao closed pull request #265: SCB-865 Implement reaction of the event in Alpha Server

2018-08-23 Thread GitBox

cherrylzhao closed pull request #265: SCB-865 Implement reaction of the event 
in Alpha Server
URL: https://github.com/apache/incubator-servicecomb-saga/pull/265
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
index e45acdd4..6e31628f 100644
--- 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
+++ 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
@@ -23,10 +23,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
-
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-
 import org.apache.servicecomb.saga.alpha.core.CommandRepository;
 import org.apache.servicecomb.saga.alpha.core.CompositeOmegaCallback;
 import org.apache.servicecomb.saga.alpha.core.EventScanner;
@@ -37,12 +35,14 @@
 import org.apache.servicecomb.saga.alpha.core.TxEventRepository;
 import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository;
 import org.springframework.beans.factory.annotation.Value;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @EntityScan(basePackages = "org.apache.servicecomb.saga.alpha")
 @Configuration
+@ConditionalOnExpression("'${alpha.mode:SAGA}'.contains('SAGA')")
 class AlphaConfig {
   private final BlockingQueue pendingCompensations = new 
LinkedBlockingQueue<>();
   private final ScheduledExecutorService scheduler = 
Executors.newScheduledThreadPool(1);
@@ -86,13 +86,11 @@ ScheduledExecutorService compensationScheduler() {
   @Bean
   TxConsistentService txConsistentService(
   @Value("${alpha.event.pollingInterval:500}") int eventPollingInterval,
-  GrpcServerConfig serverConfig,
   ScheduledExecutorService scheduler,
   TxEventRepository eventRepository,
   CommandRepository commandRepository,
   TxTimeoutRepository timeoutRepository,
-  OmegaCallback omegaCallback,
-  Map> omegaCallbacks) {
+  OmegaCallback omegaCallback) {
 
 new EventScanner(scheduler,
 eventRepository, commandRepository, timeoutRepository,
@@ -100,16 +98,16 @@ TxConsistentService txConsistentService(
 
 TxConsistentService consistentService = new 
TxConsistentService(eventRepository);
 
-ServerStartable startable = buildGrpc(serverConfig, consistentService, 
omegaCallbacks);
-new Thread(startable::start).start();
-
 return consistentService;
   }
 
-  private ServerStartable buildGrpc(GrpcServerConfig serverConfig, 
TxConsistentService txConsistentService,
+  @Bean
+  ServerStartable sagaServerBootstrap(SagaGrpcServerConfig serverConfig, 
TxConsistentService txConsistentService,
   Map> omegaCallbacks) {
-return new GrpcStartable(serverConfig,
+ServerStartable bootstrap = new GrpcStartable(serverConfig,
 new GrpcTxEventEndpointImpl(txConsistentService, omegaCallbacks));
+new Thread(bootstrap::start).start();
+return bootstrap;
   }
 
   @PostConstruct
diff --git 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
index 66dd9925..bb4c880f 100644
--- 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
+++ 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
@@ -17,10 +17,8 @@
 
 package org.apache.servicecomb.saga.alpha.server;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.beans.factory.annotation.Value;
 
-@Configuration
 public class GrpcServerConfig {
   @Value("${alpha.server.host:0.0.0.0}")
   private String host;
diff --git 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java
 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java
index 4d993748..a5999672 100644
--- 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java
+++ 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java
@@ -41,12 +41,12 @@
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslProvider;
 
-class GrpcStartable implements ServerStartable {
+public class

[GitHub] coveralls commented on issue #267: SCB-817 Added the unit tests of TCC related Aspect

2018-08-23 Thread GitBox

coveralls commented on issue #267: SCB-817 Added the unit tests of TCC related 
Aspect
URL: 
https://github.com/apache/incubator-servicecomb-saga/pull/267#issuecomment-415359097
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18627948/badge)](https://coveralls.io/builds/18627948)
   
   Coverage increased (+3.0%) to 93.816% when pulling 
**5e5aadef15cbd69f6c04dcb575f12ef6fce6f697 on SCB-817** into 
**e8b46be0855d819fc300f2f3fb8ba624e83e9111 on master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-java-chassis.wiki] branch master updated: Updated Home (markdown)

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.wiki.git


The following commit(s) were added to refs/heads/master by this push:
 new 9978be7  Updated Home (markdown)
9978be7 is described below

commit 9978be7f4cb64e0d45ca9c1a506f9713f7448a35
Author: bao liu 
AuthorDate: Thu Aug 23 17:45:23 2018 +0800

Updated Home (markdown)
---
 Home.md | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Home.md b/Home.md
index f68befc..cd604b3 100644
--- a/Home.md
+++ b/Home.md
@@ -1,5 +1,8 @@
 # 关于ServiceComb
-1. 源代码托管：https://github.com/ServiceComb 可以在这里fork代码，提交PR。
+1. 源代码托管：https://github.com/apache/incubator-servicecomb-java-chassis 
可以在这里fork代码，提交PR。
 2. 官网主页：http://servicecomb.io 获取开发资料、邮件列表等、博文等。
-3. 开发指南：https://huawei-servicecomb.gitbooks.io/developerguide/content/ 
如果发现文档错漏，烦请在线提交检视意见。
-4. JIRA和项目管理：https://servicecomb.atlassian.net 。可以在这里提交issue和需求。
+3. 开发指南：
+   * java-chassis: https://docs.servicecomb.io/java-chassis
+   * service-center: https://docs.servicecomb.io/service-center
+   * saga：https://docs.servicecomb.io/saga
+4. JIRA和项目管理：https://issues.apache.org/jira/browse/。可以在这里提交issue和需求。

[GitHub] WillemJiang opened a new pull request #267: SCB-817 Added the unit tests of TCC related Aspect

2018-08-23 Thread GitBox

WillemJiang opened a new pull request #267: SCB-817 Added the unit tests of TCC 
related Aspect
URL: https://github.com/apache/incubator-servicecomb-saga/pull/267
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-saga] branch SCB-817 created (now 5e5aade)

2018-08-23 Thread ningjiang

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

ningjiang pushed a change to branch SCB-817
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.


  at 5e5aade  SCB-817 Added the unit tests of TCC related Aspect

This branch includes the following new commits:

 new 5e5aade  SCB-817 Added the unit tests of TCC related Aspect

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[incubator-servicecomb-saga] 01/01: SCB-817 Added the unit tests of TCC related Aspect

2018-08-23 Thread ningjiang

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

ningjiang pushed a commit to branch SCB-817
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git

commit 5e5aadef15cbd69f6c04dcb575f12ef6fce6f697
Author: Willem Jiang 
AuthorDate: Thu Aug 23 16:42:40 2018 +0800

SCB-817 Added the unit tests of TCC related Aspect
---
 .../omega/transaction/tcc/TccEventService.java |   2 -
 .../transaction/tcc/TccParticipatorAspect.java |   8 +-
 .../tcc/TccStartAnnotationProcessor.java   |  14 +-
 .../saga/omega/transaction/tcc/TccStartAspect.java |   4 +-
 .../transaction/tcc/events/ParticipatedEvent.java  |  24 +++
 .../transaction/tcc/events/TccEndedEvent.java  |  14 +-
 .../transaction/tcc/events/TccStartedEvent.java|   4 -
 .../transaction/tcc/TccParticipatorAspectTest.java | 169 +
 .../tcc/TccStartAnnotationProcessorTest.java   | 155 +++
 .../omega/transaction/tcc/TccStartAspectTest.java  | 164 
 10 files changed, 534 insertions(+), 24 deletions(-)

diff --git 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
index a722f49..48ad743 100644
--- 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
+++ 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
@@ -38,7 +38,5 @@ public interface TccEventService {
   AlphaResponse TccTransactionStart(TccStartedEvent tccStartEvent);
 
   AlphaResponse TccTransactionStop(TccEndedEvent tccEndEvent);
-
-  AlphaResponse send(TxEvent event);
   
 }
diff --git 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
index e64bc2a..a78d819 100644
--- 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
+++ 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
@@ -61,14 +61,14 @@ public class TccParticipatorAspect {
 try {
   Object result = joinPoint.proceed();
   // Send the participate message back
-  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, cancelMethod, confirmMethod,
-  TransactionStatus.Succeed));
+  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, confirmMethod,
+  cancelMethod, TransactionStatus.Succeed));
   LOG.debug("Participate Transaction with context {} has finished.", 
context);
   return result;
 } catch (Throwable throwable) {
   // Now we don't handle the error message
-  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, cancelMethod,
-  confirmMethod, TransactionStatus.Failed));
+  tccEventService.participate(new ParticipatedEvent(context.globalTxId(), 
context.localTxId(), localTxId, confirmMethod,
+  cancelMethod, TransactionStatus.Failed));
   LOG.error("Participate Transaction with context {} failed.", context, 
throwable);
   throw throwable;
 } finally {
diff --git 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
index 26621d1..55198dd 100644
--- 
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
+++ 
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
@@ -21,13 +21,11 @@ import javax.transaction.TransactionalException;
 import org.apache.servicecomb.saga.common.TransactionStatus;
 import org.apache.servicecomb.saga.omega.context.OmegaContext;
 import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.EventAwareInterceptor;
 import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.TxAbortedEvent;
 import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
 import 
org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
 
-public class TccStartAnnotationProcessor implements EventAwareInterceptor {
+public class TccStartAnnotationProcessor {
 
   private final OmegaContext omegaContext;
   private final TccEventService eventService;
@@ -37,9 +35,7 @@ public class

[GitHub] asifdxtreme commented on issue #422: No 1.0.0 release tag in Docker hub.

2018-08-23 Thread GitBox

asifdxtreme commented on issue #422: No 1.0.0 release tag in Docker hub.
URL: 
https://github.com/apache/incubator-servicecomb-service-center/issues/422#issuecomment-415339852
 
 
   @veily 1.0.0 tag has been added to the docker hub of service-center.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-docs] 02/05: update general-development/file-upload.md

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit 50d65acab06064460c4ff32525c9a6f84b5bbf85
Author: DeanLee 
AuthorDate: Wed Aug 22 17:22:17 2018 +0800

update general-development/file-upload.md
---
 .../en_US/general-development/file-upload.md   | 60 +++---
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/java-chassis-reference/en_US/general-development/file-upload.md 
b/java-chassis-reference/en_US/general-development/file-upload.md
index 0f99b7b..8eeacb0 100644
--- a/java-chassis-reference/en_US/general-development/file-upload.md
+++ b/java-chassis-reference/en_US/general-development/file-upload.md
@@ -1,54 +1,54 @@
-文件上传，当前支持在vertx rest通道和servlet rest中使用。
+File upload, currently supported in vertx rest channel and servlet rest.
 
-文件上传使用标准的http form格式，可与浏览器的上传直接对接。
+File uploads use the standard http form format, which can directly upload the 
file from the browser.
 
-## Producer：
-支持jaxrs和springmvc开发模式
+## Producer:
+Support jaxrs and springmvc development mode
 
-jaxrs开发模式：
-* 支持servlet定义的javax.servlet.http.Part类型
+Jaxrs development model:
+* javax.servlet.http.Part type that supports servlet definitions
 
-* 可以直接使用@FormParam传递文件类型及普通参数
+* You can directly use @FormParam to pass file types and common parameters
 
-springmvc开发模式：
+Springmvc development mode:
 
-* 
支持servlet定义的javax.servlet.http.Part类型，也支持org.springframework.web.multipart.MultipartFile类型
+* Supports servlet-defined javax.servlet.http.Part type, also supports 
org.springframework.web.multipart.MultipartFile type
 
-* 两种数据类型功能是一致的，MultipartFile的底层也是Part
+* The two datatype functions are consistent, and the underlying part of 
MultipartFile is also Part
 
-* 两种数据类型可以混合使用，比如第一个参数是Part，第二个参数是MultipartFile
+* Two data types can be mixed, for example, the first parameter is Part and 
the second parameter is MultipartFile
 
-* 可以直接使用@RequestPart传递文件类型及普通参数
+* You can directly use @RequestPart to pass file types and common parameters
 
-注意：
+note:
 
-* 先配置文件上传临时目录，默认为null不支持文件上传，文件上传请求Content-Type必须为multipart/form-data
+* First file upload temporary directory, the default is null does not support 
file upload, file upload request Content-Type must be multipart/form-data
 
-* 同名参数只支持一个文件
+* The same name parameter only supports one file
 
-* 支持一次传输多个不同参数名的文件
+* Supports transferring files with multiple different parameter names at one 
time
 
-* 通过MultipartFile或Part打开流后，记得关闭，否则上传的临时文件会无法删除，最终导致上传临时目录被撑爆
+* After opening the stream through MultipartFile or Part, remember to close 
it. Otherwise the uploaded temporary file will not be deleted, and eventually, 
the upload temporary directory will be exploded.
 
-Springmvc模式下的代码样例：
+Sample code in Springmvc mode:
 
 ```java
 @PostMapping(path = "/upload", consumes = MediaType.MULTIPART_FORM_DATA)
 public String fileUpload(@RequestPart(name = "file1") MultipartFile file1, 
@RequestPart(name = "file2") Part file2, @RequestPart String param1) {
-  ……
+  ..
 }
 ```
 
-### 配置说明：
+### Configuration instructions:
 
-| 配置项 | 默认值 | 取值范围 | 含义 |
+| Configuration Item | Default Value | Range of Value |
 | :--- | :--- | :--- | :--- |
-| servicecomb.uploads.directory | null |  | 
上传的临时文件保存在哪个目录，**默认值null表示不支持文件上传** |
-| servicecomb.uploads.maxSize | -1 |  | http body的最大允许大小，默认值-1表示无限制 |
+| servicecomb.uploads.directory | null | | In which directory the uploaded 
temporary file is saved, **default value null means file upload is not 
supported** |
+| servicecomb.uploads.maxSize | -1 | | The maximum allowable size of http 
body, the default value of -1 means unlimited |
 
-## Consumer：
+## Consumer:
 
-支持以下数据类型：
+The following data types are supported:
 
 * java.io.File
 
@@ -58,11 +58,11 @@ public String fileUpload(@RequestPart(name = "file1") 
MultipartFile file1, @Requ
 
 * org.springframework.core.io.Resource
 
-使用InputStream时，因为是流的方式，此时没有客户端文件名的概念，所以producer获取客户端文件名会得到null
+When using InputStream, because it is a stream, there is no concept of client 
file name at this time, so the producer will get the client file name will get 
null.
 
-如果既要使用内存数据，又想让producer可以获取客户端文件名，可以使用resource类型，继承org.springframework.core.io.ByteArrayResource，且override
 getFilename即可。
+If you want to use both memory data and the producer to get the client file 
name, you can use the resource type, inherit 
org.springframework.core.io.ByteArrayResource, and override getFilename.
 
-### 透明RPC代码样例：
+### Transparent RPC Code Sample:
 
 ```java
 interface UploadIntf {
@@ -70,13 +70,13 @@ interface UploadIntf {
 }
 ```
 
-获得接口引用后，直接调用即可：
+After getting the interface reference, you can call it directly:
 
 ```java
 String result = uploadIntf.upload(file);
 ```
 
-### RestTemplate代码样例：
+### RestTemplate code example:
 
 ```java
 Map map = new HashMap<>();

[incubator-servicecomb-docs] 05/05: update ../general-development/local-develop-test.md

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit 7cc583de04eeb5c89bc44f308bd480c35434515a
Author: DeanLee 
AuthorDate: Wed Aug 22 18:25:59 2018 +0800

update ../general-development/local-develop-test.md
---
 .../general-development/local-develop-test.md  | 127 +++--
 1 file changed, 67 insertions(+), 60 deletions(-)

diff --git 
a/java-chassis-reference/en_US/general-development/local-develop-test.md 
b/java-chassis-reference/en_US/general-development/local-develop-test.md
index e38f946..eee5812 100644
--- a/java-chassis-reference/en_US/general-development/local-develop-test.md
+++ b/java-chassis-reference/en_US/general-development/local-develop-test.md
@@ -1,21 +1,21 @@
-## 概念阐述
+# Local Development and Test  
+## Concept Description
 
-本小节介绍如何在开发者本地进行消费者/提供者应用的开发调试。开发服务提供者请参考3 开发服务提供者章节，开发服务消费者请参考4 
开发服务消费者。服务提供者和消费提供者均需要连接到在远程的服务中心，为了本地微服务的开发和调试，本小节介绍了两种搭建本地服务中心的方法进行本地微服务调试：
+This section describes how developers can locally develop and commission 
consumer and provider applications. Both service providers and consumers need 
to connect to the remote service center. Two methods of building Local  
ServiceCenter for local microservice commissioning are as follows:
 
-* 启动[本地服务中心](#section2945986191314)；
+* Starting [Local Service Center](#section2945986191314)。
 
-* 通过local file模拟启动服务中心\([Mock机制](#section960893593759)\)。
+* Starting Local Service Center [Mock mechanism](#section960893593759)。
 
-* 通过设置环境信息方便本地调试
+### Local debugging by setting up environmental information 
 
-服务中心是微服务框架中的重要组件，用于服务元数据以及服务实例元数据的管理和处理注册、发现。服务中心与微服务提供/消费者的逻辑关系下图所示：  
-![](/start/develop-test.png)
+Service center is an important component in the microservice architecture, and 
is used for managing, registering, and detecting metadata and instance 
metadata. The logic relationship between the service center and microservice 
provider/consumer is as follows:![](../assets/images/local_develop_test_en.png)
 
-## 启动本地服务中心
+## Starting Local ServiceCenter
 
-* **步骤 1 **启动本地服务中心
+* **Step 1** Starting local service center 
 
-1. 以可执行文件的方式运行
+1. run in executable files  
 

  Windows
@@ -24,65 +24,68 @@


  
-   1. 
下载[服务注册中心可执行文件压缩包](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz)
-   2. 解压缩到当前文件夹
-   3. 进入解压缩后的目录，然后双击运行**start-service-center.bat**文件
- 
- 
-   1. 下载服务注册中心可执行文件压缩包并解压缩
+    (1) Download the [Service Registry Executable Compressor] 
(http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-
 Incubating-service-center-1.0.0-m1-windows-amd64.tar.gz)  
+    (2) Extract to the current folder  
+    (3) Go to the unzipped directory and double-click to run the 
**start-service-center.bat** file.  
+  
+  
+  
+    1) Download the Service Registry executable file archive and extract it  
```bash
wget 
http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
tar xvf 
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
-   ```
-   2. 运行服务注册中心
-   ```bash
-   bash 
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
-   ```
-   
-
注意：前端（frontend）在Linux环境下默认会绑定ipv6地址，导致浏览器报错，修复办法为：先修改conf/app.conf中的httpaddr为外部可达网卡ip，之后修改app/appList/apiList.js中`ip
 : 'http://127.0.0.1'`为对应ip，最后重启ServiceCenter即可。
-  
-
-   
+  ```  
+   2) Run the service registry  
+   ```bash
+   Bash 
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
+   ```  
+   
+Note: The frontend (frontend) will be bound to the ipv6 address by default 
in the Linux environment, causing the browser to report an error. The repair 
method is: first modify the httpaddr in conf/app.conf to the external reachable 
network card ip, and then modify the app/appList/apiList. .js `ip : 
'http://127.0.0.1'` for the corresponding ip, and finally restart ServiceCenter.
+  
+
+   
 
-   注意：Window和Linux版本均只支持64位系统。
+   Note: Both Windows and Linux versions only support 64-bit systems.  
 
-2. 以Docker的方式运行
+2. Run as Docker  
 
 ```bash
-docker pull servicecomb/service-center
-docker run -d -p 30100:30100 servicecomb/service-center:latest
+Docker pull servicecomb/service-center
+Docker run -d -p 30100:30100 servicecomb/service-center:latest
 ```
 
-* **步骤 2 **启动本地服务中心后，在服务提供/消费者的microservice.yaml文件中配置ServerCenter的地址和端口，示例代码：
+* **Step 2 ** After starting the local service center, configure the 
ServerCenter address and port in the service provider/consumer's 
microservice.yaml file. Example code:
 
 ```yaml
-servicecomb:
-  service:
-registry:
-

[incubator-servicecomb-docs] branch master updated (3648d43 -> 7cc583d)

2018-08-23 Thread liubao

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

liubao pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git.


from 3648d43  tiny change for char: *
 new 15fc327  update general-development/file-download.md
 new 50d65ac  update general-development/file-upload.md
 new 4d0ffcb  update ../general-development/http-filter.md
 new 7940467  add images dir ../assets/images/
 new 7cc583d  update ../general-development/local-develop-test.md

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../en_US/assets/images/ConsumerList.PNG   | Bin 0 -> 51406 bytes
 .../en_US/assets/images/Dashboard.PNG  | Bin 0 -> 82572 bytes
 .../en_US/assets/images/DockerDeployment.png   | Bin 0 -> 68208 bytes
 .../en_US/assets/images/DockerPackageAssembly.png  | Bin 0 -> 79706 bytes
 .../en_US/assets/images/HealthCheck.png| Bin 0 -> 27349 bytes
 .../en_US/assets/images/InstanceList.PNG   | Bin 0 -> 52659 bytes
 java-chassis-reference/en_US/assets/images/K8S.png | Bin 0 -> 150042 bytes
 .../en_US/assets/images/Mail.png   | Bin 0 -> 351 bytes
 .../en_US/assets/images/MetricsDependency.png  | Bin 0 -> 10323 bytes
 .../en_US/assets/images/MetricsInGrafana.png   | Bin 0 -> 108063 bytes
 .../en_US/assets/images/MetricsInPrometheus.png| Bin 0 -> 47642 bytes
 .../en_US/assets/images/MetricsWriteFileResult.png | Bin 0 -> 74432 bytes
 .../en_US/assets/images/MicroserviceArch.png   | Bin 0 -> 133917 bytes
 .../en_US/assets/images/MonolithicArch.png | Bin 0 -> 112212 bytes
 .../en_US/assets/images/ProviderList.PNG   | Bin 0 -> 47134 bytes
 java-chassis-reference/en_US/assets/images/Rss.png | Bin 0 -> 2558 bytes
 .../en_US/assets/images/SchemaList.PNG | Bin 0 -> 59937 bytes
 .../en_US/assets/images/SchemaView.PNG | Bin 0 -> 27108 bytes
 .../en_US/assets/images/Schematest.PNG | Bin 0 -> 104363 bytes
 .../en_US/assets/images/SelectInstance.PNG | Bin 0 -> 38459 bytes
 .../assets/images}/Service-Center-UI-Preview.gif   | Bin
 .../en_US/assets/images/ServiceComb-logo-1.png | Bin 0 -> 5654 bytes
 .../en_US/assets/images/ServiceComb-logo-2.png | Bin 0 -> 17582 bytes
 .../en_US/assets/images/ServiceComb-logo-3.jpg | Bin 0 -> 8 bytes
 .../en_US/assets/images/ServiceCombBasic.png   | Bin 0 -> 9778 bytes
 .../en_US/assets/images/ServiceCombInK8S.png   | Bin 0 -> 172082 bytes
 .../en_US/assets/images/ServiceList.PNG| Bin 0 -> 85794 bytes
 .../en_US/assets/images/SimpleDeployment.png   | Bin 0 -> 19863 bytes
 .../en_US/assets/images/TimeWindowComment.png  | Bin 0 -> 40476 bytes
 .../en_US/assets/images/Twitter.png| Bin 0 -> 1102 bytes
 .../en_US/assets/images/Users.png  | Bin 0 -> 1156 bytes
 .../en_US/assets/images/add-node.png   | Bin 0 -> 60206 bytes
 .../en_US/assets/images/api_manager.png| Bin 0 -> 47467 bytes
 .../best_practices_for_legacy_system_reform.jpeg   | Bin 0 -> 24022 bytes
 .../en_US/assets/images/bmi-interface.png  | Bin 0 -> 57307 bytes
 .../assets/images/booking-microservice-yaml.png| Bin 0 -> 204660 bytes
 .../en_US/assets/images/booking-start-success.png  | Bin 0 -> 145253 bytes
 .../en_US/assets/images/case_mengtuo_new_mode.png  | Bin 0 -> 22686 bytes
 .../case_mengtuo_reform_before_and_after.png   | Bin 0 -> 39806 bytes
 .../images/case_mengtuo_traditional_mode.png   | Bin 0 -> 24621 bytes
 .../en_US/assets/images/client_initialization.png  | Bin 0 -> 20471 bytes
 .../en_US/assets/images/code-adjust.png| Bin 0 -> 234001 bytes
 .../en_US/assets/images}/communication.PNG | Bin
 .../en_US/assets/images/company-autoscale-1.png| Bin 0 -> 9361 bytes
 .../en_US/assets/images/company-autoscale-2.png| Bin 0 -> 39000 bytes
 .../en_US/assets/images/company-autoscale-3.png| Bin 0 -> 45654 bytes
 .../en_US/assets/images/company-autoscale-4.png| Bin 0 -> 160122 bytes
 .../en_US/assets/images/company-autoscale-5.png| Bin 0 -> 35491 bytes
 .../images/company_concurrency_performance.png | Bin 0 -> 10965 bytes
 .../en_US/assets/images/company_cpu_load.png   | Bin 0 -> 231156 bytes
 .../images/company_different_log_memory_usage.png  | Bin 0 -> 322781 bytes
 .../en_US/assets/images/company_log_and_jmeter.png | Bin 0 -> 9743 bytes
 .../en_US/assets/images/company_memory_used.png| Bin 0 -> 132849 bytes
 .../en_US/assets/images/company_response_time.png  | Bin 0 -> 49797 bytes
 .../en_US/assets/images/company_test_plan.png  | Bin 0 -> 13497 bytes
 .../en_US/assets/images/compile.png| Bin 0 -> 54298 bytes

[incubator-servicecomb-docs] 01/05: update general-development/file-download.md

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit 15fc3276950cbd4be5537c05ea09c3daa3a2ddd9
Author: DeanLee 
AuthorDate: Wed Aug 22 17:22:01 2018 +0800

update general-development/file-download.md
---
 .../en_US/general-development/file-download.md | 85 +++---
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/java-chassis-reference/en_US/general-development/file-download.md 
b/java-chassis-reference/en_US/general-development/file-download.md
index 1a039aa..d6d274b 100644
--- a/java-chassis-reference/en_US/general-development/file-download.md
+++ b/java-chassis-reference/en_US/general-development/file-download.md
@@ -1,26 +1,26 @@
-文件下载，当前在vertx rest通道和servlet rest中可用。
+File downloads are currently available in the vertx rest channel and servlet 
rest.
 
-# 一、Producer
+# First, producer
 
-## 1.下载普通文件
+## 1. Download normal files
 
 ```
 return new File(..);
 ```
 
-## 2.下载临时文件
+## 2. Download temporary files
 
-本场景下，需要根据请求参数动态创建临时文件，下载完成后，需要将临时文件删除
+In this scenario, you need to create temporary files based on the request 
parameters dynamically. After the download is complete, you need to delete the 
temporary files.
 
 ```
 return new FilePart(file).setDeleteAfterFinished(true);
 ```
 
-## 3.下载org.springframework.core.io.Resource
+## 3. Download org.springframework.core.io.Resource
 
-因为resource不一定表示文件下载，所以需要通过swagger annotation（@ApiResponse）标识这是一个文件下载场景
+Because the resource does not necessarily mean file download, you need to 
identify this file download scenario by swagger annotation (@ApiResponse).
 
-以ByteArrayResource为例说明：
+Take ByteArrayResource as an example:
 
 ```
 @GetMapping(path = "/resource")
@@ -28,7 +28,7 @@ return new FilePart(file).setDeleteAfterFinished(true);
   @ApiResponse(code = 200, response = File.class, message = "")
 })
 public Resource resource() {
-  ……
+  ..
   return new ByteArrayResource(bytes) {
 @Override
 public String getFilename() {
@@ -38,7 +38,7 @@ public Resource resource() {
 }
 ```
 
-上例中，因为ByteArrayResource没有文件名的概念，所以需要实现Resource的getFilename方法，也可以通过ResponseEntity进行包装：
+In the above example, because ByteArrayResource does not have the concept of a 
file name, you need to implement the resource's getFilename method, or you can 
wrap it with ResponseEntity:
 
 ```
 @GetMapping(path = "/resource")
@@ -46,7 +46,7 @@ public Resource resource() {
   @ApiResponse(code = 200, response = File.class, message = "")
 })
 public ResponseEntity resource() {
-  ……
+  ..
   return ResponseEntity
   .ok()
   .header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_VALUE)
@@ -55,11 +55,11 @@ public ResponseEntity resource() {
 }
 ```
 
-## 4.下载InputStream
+## 4.Download InputStream
 
-因为InputStream不一定表示文件下载，所以需要通过swagger annotation（@ApiResponse）标识这是一个文件下载场景
+Because InputStream does not necessarily mean file downloading, it needs to be 
identified by swagger annotation (@ApiResponse). This is a file download 
scenario.
 
-有的场景下，资源并不保存在本地，比如保存在OBS云服务中，而OBS资源是以InputStream方式输出的
+In some scenarios, resources are not stored locally, such as in OBS cloud 
services, and OBS resources are output in InputStream mode.
 
 ```
 return ResponseEntity
@@ -69,75 +69,76 @@ return ResponseEntity
 .body(stream);
 ```
 
-在下载完成后，ServiceComb会自动关闭stream，开发人员不必再关注
+After the download is complete, ServiceComb will automatically close the 
stream, and developers don't have to pay attention
 
-## 5.文件类型判定
+## 5. File type determination
 
-只要没有通过ResponseEntity直接设置HttpHeaders.CONTENT\_TYPE，ServiceComb都会尝试通过File、Part、Resource中的文件名后缀进行自动判定。
+As long as the HttpHeaders.CONTENT\_TYPE is not set directly via 
ResponseEntity, ServiceComb will try to automatically determine the file name 
suffix in File, Part, and Resource.
 
-ServiceComb使用java的mime 
type机制进行文件类型判定，如果业务场景中的文件后缀无法被识别，ServiceComb会默认处理为application/octet-stream
+ServiceComb uses java's mime type mechanism for file type determination. If 
the file suffix in the business scenario cannot be identified, ServiceComb will 
default to application/octet-stream.
 
-如果这不满足要求，假设文件后缀为xyz，期望文件类型为application/file-xyz，以下方式任选一种均可解决：
+If this does not meet the requirements, assuming the file suffix is, and the 
expected file type is application/file-xyz, any of the following methods can be 
resolved:
 
-### 1）通过Java的mime type机制扩展
+### 1)Expanding through Java's mime type mechanism
 
-在META-INF目录下，创建mime.types文件，其内容为：
+In the META-INF directory, create a mime.  Types file with the contents:
 
 ```
 application/file-xyz xyz
 ```
 
-### 2）在业务代码中通过Part指定
+### 2) Specify by Part in the business code
 
 ```
 return new FilePart(null, file).contentType("application/file-xyz");
 ```
 
-### 3）在业务代码中通过ResponseEntity指定
+### 3) specified in the business code by ResponseEntity
 
 ```
 return ResponseEntity
 .ok()
 .header(HttpHeaders.CONTENT_TYPE,

[GitHub] liubao68 closed pull request #46: General development dir translation

2018-08-23 Thread GitBox

liubao68 closed pull request #46: General development dir translation 
URL: https://github.com/apache/incubator-servicecomb-docs/pull/46
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/java-chassis-reference/en_US/assets/images/ConsumerList.PNG 
b/java-chassis-reference/en_US/assets/images/ConsumerList.PNG
new file mode 100644
index 000..4da2c2d
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/ConsumerList.PNG differ
diff --git a/java-chassis-reference/en_US/assets/images/Dashboard.PNG 
b/java-chassis-reference/en_US/assets/images/Dashboard.PNG
new file mode 100644
index 000..c365aa2
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/Dashboard.PNG differ
diff --git a/java-chassis-reference/en_US/assets/images/DockerDeployment.png 
b/java-chassis-reference/en_US/assets/images/DockerDeployment.png
new file mode 100644
index 000..bdb0530
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/DockerDeployment.png differ
diff --git 
a/java-chassis-reference/en_US/assets/images/DockerPackageAssembly.png 
b/java-chassis-reference/en_US/assets/images/DockerPackageAssembly.png
new file mode 100644
index 000..d688bb6
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/DockerPackageAssembly.png differ
diff --git a/java-chassis-reference/en_US/assets/images/HealthCheck.png 
b/java-chassis-reference/en_US/assets/images/HealthCheck.png
new file mode 100644
index 000..dce7bd5
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/HealthCheck.png differ
diff --git a/java-chassis-reference/en_US/assets/images/InstanceList.PNG 
b/java-chassis-reference/en_US/assets/images/InstanceList.PNG
new file mode 100644
index 000..87f2a58
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/InstanceList.PNG differ
diff --git a/java-chassis-reference/en_US/assets/images/K8S.png 
b/java-chassis-reference/en_US/assets/images/K8S.png
new file mode 100644
index 000..7c06ccb
Binary files /dev/null and b/java-chassis-reference/en_US/assets/images/K8S.png 
differ
diff --git a/java-chassis-reference/en_US/assets/images/Mail.png 
b/java-chassis-reference/en_US/assets/images/Mail.png
new file mode 100644
index 000..0477351
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/Mail.png differ
diff --git a/java-chassis-reference/en_US/assets/images/MetricsDependency.png 
b/java-chassis-reference/en_US/assets/images/MetricsDependency.png
new file mode 100644
index 000..9cfb146
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/MetricsDependency.png differ
diff --git a/java-chassis-reference/en_US/assets/images/MetricsInGrafana.png 
b/java-chassis-reference/en_US/assets/images/MetricsInGrafana.png
new file mode 100644
index 000..3e9c73c
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/MetricsInGrafana.png differ
diff --git a/java-chassis-reference/en_US/assets/images/MetricsInPrometheus.png 
b/java-chassis-reference/en_US/assets/images/MetricsInPrometheus.png
new file mode 100644
index 000..2ac6a95
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/MetricsInPrometheus.png differ
diff --git 
a/java-chassis-reference/en_US/assets/images/MetricsWriteFileResult.png 
b/java-chassis-reference/en_US/assets/images/MetricsWriteFileResult.png
new file mode 100644
index 000..66bb5e7
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/MetricsWriteFileResult.png differ
diff --git a/java-chassis-reference/en_US/assets/images/MicroserviceArch.png 
b/java-chassis-reference/en_US/assets/images/MicroserviceArch.png
new file mode 100644
index 000..5890dd0
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/MicroserviceArch.png differ
diff --git a/java-chassis-reference/en_US/assets/images/MonolithicArch.png 
b/java-chassis-reference/en_US/assets/images/MonolithicArch.png
new file mode 100644
index 000..6a695de
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/MonolithicArch.png differ
diff --git a/java-chassis-reference/en_US/assets/images/ProviderList.PNG 
b/java-chassis-reference/en_US/assets/images/ProviderList.PNG
new file mode 100644
index 000..c286971
Binary files /dev/null and 
b/java-chassis-reference/en_US/assets/images/ProviderList.PNG differ
diff --git a/java-chassis-reference/en_US/assets/images/Rss.png 
b/java-chassis-reference/en_US/assets/images/Rss.png
new file mode 100644
index 000..4b16d61
Binary files /dev/null and b/java-chassis-reference/en_US/assets/images/Rss.png 
differ
diff --git a/java-chassis-reference/en_US/assets/images/SchemaList.PNG

[incubator-servicecomb-docs] 04/05: add images dir ../assets/images/

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit 7940467ebb40d928f2f7ae4be2019eeae0dcb564
Author: DeanLee 
AuthorDate: Wed Aug 22 17:22:53 2018 +0800

add images dir ../assets/images/
---
 .../en_US/assets/images/ConsumerList.PNG  | Bin 0 -> 51406 bytes
 .../en_US/assets/images/Dashboard.PNG | Bin 0 -> 82572 bytes
 .../en_US/assets/images/DockerDeployment.png  | Bin 0 -> 68208 bytes
 .../en_US/assets/images/DockerPackageAssembly.png | Bin 0 -> 79706 bytes
 .../en_US/assets/images/HealthCheck.png   | Bin 0 -> 27349 bytes
 .../en_US/assets/images/InstanceList.PNG  | Bin 0 -> 52659 bytes
 java-chassis-reference/en_US/assets/images/K8S.png| Bin 0 -> 150042 bytes
 java-chassis-reference/en_US/assets/images/Mail.png   | Bin 0 -> 351 bytes
 .../en_US/assets/images/MetricsDependency.png | Bin 0 -> 10323 bytes
 .../en_US/assets/images/MetricsInGrafana.png  | Bin 0 -> 108063 bytes
 .../en_US/assets/images/MetricsInPrometheus.png   | Bin 0 -> 47642 bytes
 .../en_US/assets/images/MetricsWriteFileResult.png| Bin 0 -> 74432 bytes
 .../en_US/assets/images/MicroserviceArch.png  | Bin 0 -> 133917 bytes
 .../en_US/assets/images/MonolithicArch.png| Bin 0 -> 112212 bytes
 .../en_US/assets/images/ProviderList.PNG  | Bin 0 -> 47134 bytes
 java-chassis-reference/en_US/assets/images/Rss.png| Bin 0 -> 2558 bytes
 .../en_US/assets/images/SchemaList.PNG| Bin 0 -> 59937 bytes
 .../en_US/assets/images/SchemaView.PNG| Bin 0 -> 27108 bytes
 .../en_US/assets/images/Schematest.PNG| Bin 0 -> 104363 bytes
 .../en_US/assets/images/SelectInstance.PNG| Bin 0 -> 38459 bytes
 .../en_US/assets/images/Service-Center-UI-Preview.gif | Bin 0 -> 616202 bytes
 .../en_US/assets/images/ServiceComb-logo-1.png| Bin 0 -> 5654 bytes
 .../en_US/assets/images/ServiceComb-logo-2.png| Bin 0 -> 17582 bytes
 .../en_US/assets/images/ServiceComb-logo-3.jpg| Bin 0 -> 8 bytes
 .../en_US/assets/images/ServiceCombBasic.png  | Bin 0 -> 9778 bytes
 .../en_US/assets/images/ServiceCombInK8S.png  | Bin 0 -> 172082 bytes
 .../en_US/assets/images/ServiceList.PNG   | Bin 0 -> 85794 bytes
 .../en_US/assets/images/SimpleDeployment.png  | Bin 0 -> 19863 bytes
 .../en_US/assets/images/TimeWindowComment.png | Bin 0 -> 40476 bytes
 .../en_US/assets/images/Twitter.png   | Bin 0 -> 1102 bytes
 java-chassis-reference/en_US/assets/images/Users.png  | Bin 0 -> 1156 bytes
 .../en_US/assets/images/add-node.png  | Bin 0 -> 60206 bytes
 .../en_US/assets/images/api_manager.png   | Bin 0 -> 47467 bytes
 .../best_practices_for_legacy_system_reform.jpeg  | Bin 0 -> 24022 bytes
 .../en_US/assets/images/bmi-interface.png | Bin 0 -> 57307 bytes
 .../en_US/assets/images/booking-microservice-yaml.png | Bin 0 -> 204660 bytes
 .../en_US/assets/images/booking-start-success.png | Bin 0 -> 145253 bytes
 .../en_US/assets/images/case_mengtuo_new_mode.png | Bin 0 -> 22686 bytes
 .../images/case_mengtuo_reform_before_and_after.png   | Bin 0 -> 39806 bytes
 .../assets/images/case_mengtuo_traditional_mode.png   | Bin 0 -> 24621 bytes
 .../en_US/assets/images/client_initialization.png | Bin 0 -> 20471 bytes
 .../en_US/assets/images/code-adjust.png   | Bin 0 -> 234001 bytes
 .../en_US/assets/images/communication.PNG | Bin 0 -> 26597 bytes
 .../en_US/assets/images/company-autoscale-1.png   | Bin 0 -> 9361 bytes
 .../en_US/assets/images/company-autoscale-2.png   | Bin 0 -> 39000 bytes
 .../en_US/assets/images/company-autoscale-3.png   | Bin 0 -> 45654 bytes
 .../en_US/assets/images/company-autoscale-4.png   | Bin 0 -> 160122 bytes
 .../en_US/assets/images/company-autoscale-5.png   | Bin 0 -> 35491 bytes
 .../assets/images/company_concurrency_performance.png | Bin 0 -> 10965 bytes
 .../en_US/assets/images/company_cpu_load.png  | Bin 0 -> 231156 bytes
 .../images/company_different_log_memory_usage.png | Bin 0 -> 322781 bytes
 .../en_US/assets/images/company_log_and_jmeter.png| Bin 0 -> 9743 bytes
 .../en_US/assets/images/company_memory_used.png   | Bin 0 -> 132849 bytes
 .../en_US/assets/images/company_response_time.png | Bin 0 -> 49797 bytes
 .../en_US/assets/images/company_test_plan.png | Bin 0 -> 13497 bytes
 .../en_US/assets/images/compile.png   | Bin 0 -> 54298 bytes
 .../en_US/assets/images/components.png| Bin 0 -> 23883 bytes
 .../en_US/assets/images/config-file.png   | Bin 0 -> 208021 bytes
 .../en_US/assets/images/config/create_project.png | Bin 0 -> 17864 bytes

[incubator-servicecomb-docs] 05/05: fix errorThresholdPercentage value issue

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit 78153767fd04265b3bbeafc40e20123ff1857cbe
Author: DeanLee 
AuthorDate: Thu Aug 23 12:05:49 2018 +0800

fix errorThresholdPercentage value issue
---
 java-chassis-reference/en_US/references-handlers/loadbalance.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-chassis-reference/en_US/references-handlers/loadbalance.md 
b/java-chassis-reference/en_US/references-handlers/loadbalance.md
index 6dfab0d..cfa8220 100644
--- a/java-chassis-reference/en_US/references-handlers/loadbalance.md
+++ b/java-chassis-reference/en_US/references-handlers/loadbalance.md
@@ -71,7 +71,7 @@ servicecomb:
   loadbalance:
 isolation:
   enabled: true
-  errorThresholdPercentage: 20
+  errorThresholdPercentage: 0
   enableRequestThreshold: 5
   singleTestTime: 6
   continuousFailureThreshold: 2

[incubator-servicecomb-docs] 02/05: java-chassis-reference/en_US/references-handlers/loadbalance.md

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit cb7c40ef126e2b226111ce41a3139b427bc0380b
Author: DeanLee 
AuthorDate: Mon Aug 20 15:08:22 2018 +0800

java-chassis-reference/en_US/references-handlers/loadbalance.md
---
 .../en_US/references-handlers/loadbalance.md   | 96 +++---
 1 file changed, 46 insertions(+), 50 deletions(-)

diff --git a/java-chassis-reference/en_US/references-handlers/loadbalance.md 
b/java-chassis-reference/en_US/references-handlers/loadbalance.md
index 0265379..6dfab0d 100644
--- a/java-chassis-reference/en_US/references-handlers/loadbalance.md
+++ b/java-chassis-reference/en_US/references-handlers/loadbalance.md
@@ -1,13 +1,14 @@
-# 负载均衡
+# load balancing
 
-## 场景描述
+## Scene Description
 
-ServiceComb提供了非常强大的负载均衡能力。它的核心包括两部分，第一部分是DiscoveryTree，通过将微服务实例根据接口兼容性、数据中心、实例状态等分组，DiscoveryFilter是其主要组成部分；第二部分是基于Ribbon的负载均衡方案，支持随机、顺序、基于响应时间的权值等多种负载均衡路由策略IRule，以及可以支持Invocation状态的ServerListFilterExt。
+ServiceComb provides very powerful load balancing capabilities. Its core 
consists of two parts. The first part is DiscoveryTree. DiscoveryFilter is its 
main component by grouping microservice instances according to interface 
compatibility, data center, instance status, etc. The second part is based on 
Ribbon's load balancing scheme, which supports random. Various load balancing 
routing policies IRule, such as order, response time-based weights, and 
ServerListFilterExt that can support th [...]
 
-DiscoveryTree的逻辑比较复杂，可以通过下面的处理流程了解其处理过程。
+DiscoveryTree's logic is more complex. You can understand its processing 
through the following process.
 ![](/assets/loadbalance-001.png)
 
-负载均衡适用于Consumer处理链，名称为loadbalance，示例如下：
+Load balancing is applied to the Consumer processing chain. The name is 
loadbalance. The examples are as follows:
+
 ```
 servicecomb:
   handler:
@@ -16,7 +17,7 @@ servicecomb:
 default: loadbalance
 ```
 
-POM依赖：
+POM dependence:
 ```
  
   org.apache.servicecomb
@@ -24,8 +25,8 @@ POM依赖：
   
 ```
 
-## 按照数据中心信息进行路由转发
-服务提供者和消费者都可以通过在microservice.yaml中声明自己的服务中心信息：
+## Routing and forwarding according to data center information
+Service providers and consumers can declare their service center information 
in microservice.yaml:
 ```yaml
 servicecomb:
   datacenter:
@@ -34,21 +35,21 @@ servicecomb:
 availableZone: my-Zone
 ```
 
-消费者通过比较自己的数据中心信息和提供者的信息，优先将请求转发到region和availableZone都相同的实例；如果不存在，则转发到region相同的实例；如果仍然不存在，则转发到其他实例。
+Consumers compare their own data center information and provider information, 
preferentially forward the request to the same instance of region and 
availableZone; if it does not exist, it forwards to the same instance of the 
region; if it still does not exist, it forwards to other Example.
 
-这里的region和availableZone是一般性的概念，用户可以自行确定其业务含义以便应用于资源隔离的场景中。可以参见[微服务实例之间的逻辑隔离关系](/build-provider/definition/isolate-relationship.md)，了解更多其他实例发现相关的隔离机制。
+The region and availableZone here are general concepts, and users can 
determine their business meanings to apply them to resource-isolated scenarios. 
See [Logical isolation relationships between microservice instances] 
(/build-provider/definition/isolate-relationship.md) for more isolation and 
isolation mechanisms.
 
-该规则默认启用，如果不需要使用，可以通过servicecomb.loadbalance.filter.zoneaware.enabled进行关闭。数据中心信息隔离功能在ZoneAwareDiscoveryFilter实现。
+This rule is enabled by default. If it is not needed, it can be closed by 
servicecomb.loadbalance.filter.zoneaware.enabled. Data center information 
isolation is implemented in ZoneAwareDiscoveryFilter.
 
-## 根据实例属性进行路由转发
-微服务可以指定实例的属性。实例属性可以在microservice.yaml中指定，也可以通过服务中心的API进行修改。
+## Routing and forwarding based on instance attributes
+Microservices can specify the properties of an instance. Instance properties 
can be specified in microservice.yaml or modified through the API of the 
service center.
 ```
 instance_description:
   properties:
 tag: mytag
 ```
 
-消费者可以指定消费具备某些属性的实例，不访问其他实例
+Consumers can specify to consume instances with certain attributes without 
accessing other instances.
 ```
 servicecomb:
   loadbalance:
@@ -57,40 +58,35 @@ servicecomb:
 options:
   tag: mytag
 ```
-上面的配置表示只访问myservice所有实例中tag属性为mytag的实例。
+The above configuration means that only instances with the tag attribute mytag 
in all instances of myservice are accessed.
 
-该规则需要给每个服务单独配置，未配置表示不启用该规则，不支持对于所有服务的全局配置。
+This rule needs to be configured separately for each service. Unconfigured 
means that the rule is not enabled and global configuration for all services is 
not supported.
 
-该规则默认启用，如果不需要使用，可以通过servicecomb.loadbalance.filter.instanceProperty.enabled进行关闭。根据实例属性进行路由转发功能在InstancePropertyDiscoveryFilter实现。
+This rule is enabled by default. If it is not needed, it can be closed by 
servicecomb.loadbalance.filter.instanceProperty.enabled. The route forwarding 
function based on the instance

[incubator-servicecomb-docs] 01/05: java-chassis-reference/en_US/references-handlers/intruduction.md

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit d1949172f692e2922d6fad24e20fae01435ab8c4
Author: DeanLee 
AuthorDate: Mon Aug 20 15:08:07 2018 +0800

java-chassis-reference/en_US/references-handlers/intruduction.md
---
 .../en_US/references-handlers/intruduction.md  | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/java-chassis-reference/en_US/references-handlers/intruduction.md 
b/java-chassis-reference/en_US/references-handlers/intruduction.md
index 1a3131f..ee9fe8d 100644
--- a/java-chassis-reference/en_US/references-handlers/intruduction.md
+++ b/java-chassis-reference/en_US/references-handlers/intruduction.md
@@ -1,9 +1,9 @@
-## 处理链参考
-处理链(Handlers)是ServiceComb的核心组成部分，它们构成服务运行管控的基础。ServiceComb通过处理链来处理负载均衡、熔断容错、流量控制等。
+## Processing Chain Reference
+Handlers are the core components of ServiceComb, which form the basis of 
service operation and control. ServiceComb handles load balancing, fuse 
tolerance, flow control, and more through the processing chain.
 
-## 开发处理链
-开发者自定义处理链包含如下几个步骤。由于ServiceComb的核心组成就是处理链，开发者可以参考handlers目录的实现详细了解处理链。下面简单总结下几个关键步骤：
+## Development Processing Chain
+The developer's custom processing chain consists of the following steps. Since 
the core component of ServiceComb is the processing chain, developers can refer 
to the implementation of the handlers directory to learn more about the 
processing chain. Here are a few key steps to summarize:
 
-* 实现Handler接口
-* 增加*.handler.xml文件，给Handler取一个名字
-* 在microservice.yaml中启用新增加的处理链
+* Implement Handler interface
+* Add *.handler.xml file, give Handler a name
+* Enable the newly added processing chain in microservice.yaml

[GitHub] liubao68 closed pull request #45: tiny change for char: *

2018-08-23 Thread GitBox

liubao68 closed pull request #45: tiny change for char: *
URL: https://github.com/apache/incubator-servicecomb-docs/pull/45
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md 
b/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md
index 9a3dd77..a451b01 100644
--- a/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md
+++ b/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md
@@ -72,7 +72,7 @@ REST over Servlet对应使用web容器部署运行，需要新建一个servlet
   ```
 * ServiceComb servlet  
   url pattern根据业务自身规划设置即可，下面的/rest/*仅仅是示例，不是固定值。  
-  url pattern必须以/*结尾  
+  url pattern必须以/\*结尾  
   以下两种声明方式也是多选一的关系，不要同时使用
   * 标准声明
   ```xml
@@ -199,5 +199,4 @@ REST over Servlet在microservice.yaml文件中的配置项见表3-9。
 | servicecomb.rest.server.timeout | 3000 | - | 否 | 超时时间 | 单位为毫秒 |
 | servicecomb.rest.servlet.urlPattern | 无 |  | 否 | 用于简化servlet+servlet 
mapping配置 | 只有在web.xml中未配置servlet+servlet mapping时，才使用此配置项，配置格式为：/\* 或  
/path/\*，其中path可以是多次目录 |
 
-```
 
diff --git 
a/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md 
b/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md
index 9a3dd77..a451b01 100644
--- a/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md
+++ b/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md
@@ -72,7 +72,7 @@ REST over Servlet对应使用web容器部署运行，需要新建一个servlet
   ```
 * ServiceComb servlet  
   url pattern根据业务自身规划设置即可，下面的/rest/*仅仅是示例，不是固定值。  
-  url pattern必须以/*结尾  
+  url pattern必须以/\*结尾  
   以下两种声明方式也是多选一的关系，不要同时使用
   * 标准声明
   ```xml
@@ -199,5 +199,4 @@ REST over Servlet在microservice.yaml文件中的配置项见表3-9。
 | servicecomb.rest.server.timeout | 3000 | - | 否 | 超时时间 | 单位为毫秒 |
 | servicecomb.rest.servlet.urlPattern | 无 |  | 否 | 用于简化servlet+servlet 
mapping配置 | 只有在web.xml中未配置servlet+servlet mapping时，才使用此配置项，配置格式为：/\* 或  
/path/\*，其中path可以是多次目录 |
 
-```
 


 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-docs] branch master updated: tiny change for char: *

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git


The following commit(s) were added to refs/heads/master by this push:
 new 3648d43  tiny change for char: *
3648d43 is described below

commit 3648d43453d10637b1eed4668350ef6033f6f82f
Author: wujimin 
AuthorDate: Wed Aug 22 15:58:50 2018 +0800

tiny change for char: *
---
 .../en_US/build-provider/protocol/rest-over-servlet.md | 3 +--
 .../zh_CN/build-provider/protocol/rest-over-servlet.md | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md 
b/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md
index 9a3dd77..a451b01 100644
--- a/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md
+++ b/java-chassis-reference/en_US/build-provider/protocol/rest-over-servlet.md
@@ -72,7 +72,7 @@ REST over Servlet对应使用web容器部署运行，需要新建一个servlet
   ```
 * ServiceComb servlet  
   url pattern根据业务自身规划设置即可，下面的/rest/*仅仅是示例，不是固定值。  
-  url pattern必须以/*结尾  
+  url pattern必须以/\*结尾  
   以下两种声明方式也是多选一的关系，不要同时使用
   * 标准声明
   ```xml
@@ -199,5 +199,4 @@ REST over Servlet在microservice.yaml文件中的配置项见表3-9。
 | servicecomb.rest.server.timeout | 3000 | - | 否 | 超时时间 | 单位为毫秒 |
 | servicecomb.rest.servlet.urlPattern | 无 |  | 否 | 用于简化servlet+servlet 
mapping配置 | 只有在web.xml中未配置servlet+servlet mapping时，才使用此配置项，配置格式为：/\* 或  
/path/\*，其中path可以是多次目录 |
 
-```
 
diff --git 
a/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md 
b/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md
index 9a3dd77..a451b01 100644
--- a/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md
+++ b/java-chassis-reference/zh_CN/build-provider/protocol/rest-over-servlet.md
@@ -72,7 +72,7 @@ REST over Servlet对应使用web容器部署运行，需要新建一个servlet
   ```
 * ServiceComb servlet  
   url pattern根据业务自身规划设置即可，下面的/rest/*仅仅是示例，不是固定值。  
-  url pattern必须以/*结尾  
+  url pattern必须以/\*结尾  
   以下两种声明方式也是多选一的关系，不要同时使用
   * 标准声明
   ```xml
@@ -199,5 +199,4 @@ REST over Servlet在microservice.yaml文件中的配置项见表3-9。
 | servicecomb.rest.server.timeout | 3000 | - | 否 | 超时时间 | 单位为毫秒 |
 | servicecomb.rest.servlet.urlPattern | 无 |  | 否 | 用于简化servlet+servlet 
mapping配置 | 只有在web.xml中未配置servlet+servlet mapping时，才使用此配置项，配置格式为：/\* 或  
/path/\*，其中path可以是多次目录 |
 
-```

[GitHub] liubao68 closed pull request #39: References handlers dir translation

2018-08-23 Thread GitBox

liubao68 closed pull request #39: References handlers dir translation
URL: https://github.com/apache/incubator-servicecomb-docs/pull/39
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/java-chassis-reference/en_US/references-handlers/intruduction.md 
b/java-chassis-reference/en_US/references-handlers/intruduction.md
index 1a3131f..9835e7c 100644
--- a/java-chassis-reference/en_US/references-handlers/intruduction.md
+++ b/java-chassis-reference/en_US/references-handlers/intruduction.md
@@ -1,9 +1,9 @@
-## 处理链参考
-处理链(Handlers)是ServiceComb的核心组成部分，它们构成服务运行管控的基础。ServiceComb通过处理链来处理负载均衡、熔断容错、流量控制等。
+## Handlers Reference
+Handlers are the core components of ServiceComb, which form the basis of 
service operation and control. ServiceComb handles load balancing, fuse 
tolerance, flow control, and more through the Handlers.
 
-## 开发处理链
-开发者自定义处理链包含如下几个步骤。由于ServiceComb的核心组成就是处理链，开发者可以参考handlers目录的实现详细了解处理链。下面简单总结下几个关键步骤：
+## Development Handlers
+The developer's custom handlers consists of the following steps. Since the 
core component of ServiceComb is the handlers, developers can refer to the 
implementation of the handlers directory to learn more about the Handlers. Here 
are a few key steps to summarize:
 
-* 实现Handler接口
-* 增加*.handler.xml文件，给Handler取一个名字
-* 在microservice.yaml中启用新增加的处理链
+* Implement Handler interface
+* Add *.handler.xml file, give handler a name
+* Enable the newly added Handlers in microservice.yaml
diff --git a/java-chassis-reference/en_US/references-handlers/loadbalance.md 
b/java-chassis-reference/en_US/references-handlers/loadbalance.md
index 0265379..cfa8220 100644
--- a/java-chassis-reference/en_US/references-handlers/loadbalance.md
+++ b/java-chassis-reference/en_US/references-handlers/loadbalance.md
@@ -1,13 +1,14 @@
-# 负载均衡
+# load balancing
 
-## 场景描述
+## Scene Description
 
-ServiceComb提供了非常强大的负载均衡能力。它的核心包括两部分，第一部分是DiscoveryTree，通过将微服务实例根据接口兼容性、数据中心、实例状态等分组，DiscoveryFilter是其主要组成部分；第二部分是基于Ribbon的负载均衡方案，支持随机、顺序、基于响应时间的权值等多种负载均衡路由策略IRule，以及可以支持Invocation状态的ServerListFilterExt。
+ServiceComb provides very powerful load balancing capabilities. Its core 
consists of two parts. The first part is DiscoveryTree. DiscoveryFilter is its 
main component by grouping microservice instances according to interface 
compatibility, data center, instance status, etc. The second part is based on 
Ribbon's load balancing scheme, which supports random. Various load balancing 
routing policies IRule, such as order, response time-based weights, and 
ServerListFilterExt that can support the Invocation state.
 
-DiscoveryTree的逻辑比较复杂，可以通过下面的处理流程了解其处理过程。
+DiscoveryTree's logic is more complex. You can understand its processing 
through the following process.
 ![](/assets/loadbalance-001.png)
 
-负载均衡适用于Consumer处理链，名称为loadbalance，示例如下：
+Load balancing is applied to the Consumer processing chain. The name is 
loadbalance. The examples are as follows:
+
 ```
 servicecomb:
   handler:
@@ -16,7 +17,7 @@ servicecomb:
 default: loadbalance
 ```
 
-POM依赖：
+POM dependence:
 ```
  
   org.apache.servicecomb
@@ -24,8 +25,8 @@ POM依赖：
   
 ```
 
-## 按照数据中心信息进行路由转发
-服务提供者和消费者都可以通过在microservice.yaml中声明自己的服务中心信息：
+## Routing and forwarding according to data center information
+Service providers and consumers can declare their service center information 
in microservice.yaml:
 ```yaml
 servicecomb:
   datacenter:
@@ -34,21 +35,21 @@ servicecomb:
 availableZone: my-Zone
 ```
 
-消费者通过比较自己的数据中心信息和提供者的信息，优先将请求转发到region和availableZone都相同的实例；如果不存在，则转发到region相同的实例；如果仍然不存在，则转发到其他实例。
+Consumers compare their own data center information and provider information, 
preferentially forward the request to the same instance of region and 
availableZone; if it does not exist, it forwards to the same instance of the 
region; if it still does not exist, it forwards to other Example.
 
-这里的region和availableZone是一般性的概念，用户可以自行确定其业务含义以便应用于资源隔离的场景中。可以参见[微服务实例之间的逻辑隔离关系](/build-provider/definition/isolate-relationship.md)，了解更多其他实例发现相关的隔离机制。
+The region and availableZone here are general concepts, and users can 
determine their business meanings to apply them to resource-isolated scenarios. 
See [Logical isolation relationships between microservice instances] 
(/build-provider/definition/isolate-relationship.md) for more isolation and 
isolation mechanisms.
 
-该规则默认启用，如果不需要使用，可以通过servicecomb.loadbalance.filter.zoneaware.enabled进行关闭。数据中心信息隔离功能在ZoneAwareDiscoveryFilter实现。
+This rule is enabled by default. If it is not needed, it can be closed by 
servicecomb.loadbalance.filter.zoneaware.enabled. Data center information 
isolation is implemented in ZoneAwareDiscoveryFilter.
 
-## 根据实例属性进行路由转发
-微服务可以指定实例的属性。实例属性可以在microservice.yaml中指定，也可以通过服务中心的API进行修改。
+## Routing and forwarding based on instance attributes

[incubator-servicecomb-docs] 03/05: java-chassis-reference/en_US/references-handlers/publickey.md

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit d630cb8fd058a055392e994ee61241b327df1ffc
Author: DeanLee 
AuthorDate: Mon Aug 20 15:08:32 2018 +0800

java-chassis-reference/en_US/references-handlers/publickey.md
---
 .../en_US/references-handlers/publickey.md | 40 +++---
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/java-chassis-reference/en_US/references-handlers/publickey.md 
b/java-chassis-reference/en_US/references-handlers/publickey.md
index 4d540d7..7594221 100644
--- a/java-chassis-reference/en_US/references-handlers/publickey.md
+++ b/java-chassis-reference/en_US/references-handlers/publickey.md
@@ -1,14 +1,14 @@
-# 公钥认证
+# public key authentication
 
-## 场景描述
+## Scene Description
 
-公钥认证是ServiceComb提供的一种简单高效的微服务之间认证机制，它的安全性建立在微服务与服务中心之间的交互是可信的基础之上，即微服务和服务中心之间必须先启用认证机制。它的基本流程如下：
+Public key authentication is a simple and efficient authentication mechanism 
between microservices provided by ServiceComb. Its security is based on the 
trust between microservices and service centers, namely microservices and 
service centers. The authentication mechanism must be enabled first. Its basic 
process is as follows:
 
-1. 微服务启动的时候，生成秘钥对，并将公钥注册到服务中心。
-2. 消费者访问提供者之前，使用自己的私钥对消息进行签名。
-3. 提供者从服务中心获取消费者公钥，对签名的消息进行校验。
+1. When the microservice starts, generate a secret key pair and register the 
public key to the service center.
+2. The consumer signs the message with his or her private key before accessing 
the provider.
+3. The provider obtains the consumer public key from the service center and 
verifies the signed message.
 
-公钥认证需要在消费者、提供者都启用。
+Public key authentication needs to be enabled for both consumers and providers.
 
 ```
 servicecomb:
@@ -20,20 +20,20 @@ servicecomb:
 default: auth-provider
 ```
 
-POM依赖：
+POM Dependency:
 
-* 在pom.xml中增加依赖：
+* Add dependencies in pom.xml:
 
   ```
-
-  org.apache.servicecomb 
-  handler-publickey-auth 
+   
+  org.apache.servicecomb
+  handler-publickey-auth
 
   ```
 
-## 配置黑白名单
+## Configuring black and white list
 
-基于公钥认证机制，ServiceComb提供了黑白名单功能。通过黑白名单，可以控制微服务允许其他哪些服务访问。目前支持通过配置服务属性来控制，配置项如下：
+Based on the public key authentication mechanism, ServiceComb provides a black 
and white list function. Through the black and white list, you can control 
which other services are allowed to be accessed by the microservice. Currently 
supported by configuring service attributes, the configuration items are as 
follows:
 
 ```
 servicecomb:
@@ -43,10 +43,10 @@ servicecomb:
 list01:
   category: property ## property, fixed value
   propertyName: serviceName ## property name
-# property value match expression. 
-# only supports prefix match and postfix match and exactly match. 
-# e.g. hacker*, *hacker, hacker
-  rule: hacker 
+# property value matches expression.
+# only supports prefix match and postfix match and exactly match.
+#, e.g., hacker*, *hacker, hacker
+  rule: hacker
   white:
 list02:
   category: property
@@ -54,6 +54,6 @@ servicecomb:
   rule: cust*
 ```
 
-以上规则配置了黑名单，不允许微服务名称为hacker的访问；白名单，允许微服务名称为cust前缀的服务访问。
+The above rules are configured with blacklists, which do not allow 
microservice names to be accessed by hackers; whitelists allow access to 
services with microservice names named cust.
 
-ServiceComb提供了[trust-sample](https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/trust-sample)来演示黑白名单功能。
\ No newline at end of file
+ServiceComb provides [trust-sample] 
(https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/trust-sample)
 to demonstrate the black and white list feature.

[incubator-servicecomb-docs] 04/05: correct Processing Chain --> handlers

2018-08-23 Thread liubao

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git

commit 6a49a91783f9bd974c3f802a7ad79b97f09238ed
Author: DeanLee 
AuthorDate: Tue Aug 21 16:59:33 2018 +0800

correct Processing Chain --> handlers
---
 .../en_US/references-handlers/intruduction.md| 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/java-chassis-reference/en_US/references-handlers/intruduction.md 
b/java-chassis-reference/en_US/references-handlers/intruduction.md
index ee9fe8d..9835e7c 100644
--- a/java-chassis-reference/en_US/references-handlers/intruduction.md
+++ b/java-chassis-reference/en_US/references-handlers/intruduction.md
@@ -1,9 +1,9 @@
-## Processing Chain Reference
-Handlers are the core components of ServiceComb, which form the basis of 
service operation and control. ServiceComb handles load balancing, fuse 
tolerance, flow control, and more through the processing chain.
+## Handlers Reference
+Handlers are the core components of ServiceComb, which form the basis of 
service operation and control. ServiceComb handles load balancing, fuse 
tolerance, flow control, and more through the Handlers.
 
-## Development Processing Chain
-The developer's custom processing chain consists of the following steps. Since 
the core component of ServiceComb is the processing chain, developers can refer 
to the implementation of the handlers directory to learn more about the 
processing chain. Here are a few key steps to summarize:
+## Development Handlers
+The developer's custom handlers consists of the following steps. Since the 
core component of ServiceComb is the handlers, developers can refer to the 
implementation of the handlers directory to learn more about the Handlers. Here 
are a few key steps to summarize:
 
 * Implement Handler interface
-* Add *.handler.xml file, give Handler a name
-* Enable the newly added processing chain in microservice.yaml
+* Add *.handler.xml file, give handler a name
+* Enable the newly added Handlers in microservice.yaml

[incubator-servicecomb-docs] branch master updated (cfd7b38 -> 7815376)

2018-08-23 Thread liubao

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

liubao pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-docs.git.


from cfd7b38  improve description of rest-over-servlet
 new d194917  
java-chassis-reference/en_US/references-handlers/intruduction.md
 new cb7c40e  
java-chassis-reference/en_US/references-handlers/loadbalance.md
 new d630cb8  java-chassis-reference/en_US/references-handlers/publickey.md
 new 6a49a91  correct Processing Chain --> handlers
 new 7815376  fix errorThresholdPercentage value issue

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../en_US/references-handlers/intruduction.md  | 14 ++--
 .../en_US/references-handlers/loadbalance.md   | 94 +++---
 .../en_US/references-handlers/publickey.md | 40 -
 3 files changed, 72 insertions(+), 76 deletions(-)

[GitHub] WillemJiang closed pull request #266: SCB-864

2018-08-23 Thread GitBox

WillemJiang closed pull request #266: SCB-864
URL: https://github.com/apache/incubator-servicecomb-saga/pull/266
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
 
b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
index b34b5bdf..053149fa 100644
--- 
a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
+++ 
b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
@@ -17,7 +17,9 @@
 
 package org.apache.servicecomb.saga.transports;
 
-public interface TransportFactory {
+import org.apache.servicecomb.saga.core.Transport;
 
-  RestTransport restTransport();
+public interface TransportFactory {
+
+  T getTransport();
 }
diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
index a70aafbb..c6cbd476 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
@@ -20,6 +20,7 @@
 import org.apache.servicecomb.saga.core.Fallback;
 import org.apache.servicecomb.saga.core.Operation;
 import org.apache.servicecomb.saga.core.SagaResponse;
+import org.apache.servicecomb.saga.core.Transport;
 import org.apache.servicecomb.saga.transports.TransportFactory;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -39,7 +40,7 @@
 @Type(value = JacksonRestFallback.class, name = Operation.TYPE_REST),
 @Type(value = NopJacksonFallback.class, name = Operation.TYPE_NOP)
 })
-public interface JacksonFallback extends Fallback, TransportAware {
+public interface JacksonFallback extends Fallback, 
TransportAware {
 
   JacksonFallback NOP_TRANSPORT_AWARE_FALLBACK = new 
NopJacksonFallback(TYPE_NOP);
 
diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
index 35c54fe3..92db35af 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
@@ -19,10 +19,12 @@
 
 import java.util.Map;
 
+import org.apache.servicecomb.saga.transports.RestTransport;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-class JacksonRestFallback extends JacksonRestOperation implements 
JacksonFallback {
+class JacksonRestFallback extends JacksonRestOperation implements 
JacksonFallback {
 
   private final String type;
 
diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
index c2921689..e9dd762a 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
@@ -28,7 +28,7 @@
 import org.apache.servicecomb.saga.core.SagaResponse;
 import org.apache.servicecomb.saga.transports.RestTransport;
 
-class JacksonRestOperation extends RestOperation implements TransportAware {
+class JacksonRestOperation extends RestOperation implements 
TransportAware {
 
   @JsonIgnore
   private RestTransport transport;
@@ -38,8 +38,8 @@
   }
 
   @Override
-  public JacksonRestOperation with(TransportFactory transport) {
-this.transport = transport.restTransport();
+  public JacksonRestOperation with(TransportFactory transport) {
+this.transport = transport.getTransport();
 return this;
   }
 
diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
index 9660eb4e..f91d29b3 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
@@ -20,6 +20,7 @@
 import static 
org.apache.servicecomb.saga.format.JacksonFallback.NOP_TRANSPORT_AWARE_FALLBACK;
 
 import org.apache.servicecomb.saga.core.SagaRequestImpl;
+import org.apache.servicecomb.saga.transports.RestTransport;
 import org.apache.servicecomb.saga.transports.TransportFactory;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,7 +28,7 @@
 
 import org.apache.servicecomb.saga.core.Operation;
 
-public class JsonRestSagaRequest extends SagaRequestImpl implements

[incubator-servicecomb-saga] 01/02: SCB-866 generalize TransportFactory to extend Transport

2018-08-23 Thread ningjiang

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/incubator-servicecomb-saga.git

commit 3a0cdf4f48f313ce0db4fb0dfc267134b22fae84
Author: KomachiSion <263976...@qq.com>
AuthorDate: Thu Aug 23 14:41:40 2018 +0800

SCB-866 generalize TransportFactory to extend Transport
---
 .../org/apache/servicecomb/saga/transports/TransportFactory.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
 
b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
index b34b5bd..053149f 100644
--- 
a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
+++ 
b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
@@ -17,7 +17,9 @@
 
 package org.apache.servicecomb.saga.transports;
 
-public interface TransportFactory {
+import org.apache.servicecomb.saga.core.Transport;
 
-  RestTransport restTransport();
+public interface TransportFactory {
+
+  T getTransport();
 }

[incubator-servicecomb-saga] 02/02: SCB-867 Adapting Rest json to the generalization of TransportFactory

2018-08-23 Thread ningjiang

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/incubator-servicecomb-saga.git

commit e8b46be0855d819fc300f2f3fb8ba624e83e9111
Author: KomachiSion <263976...@qq.com>
AuthorDate: Thu Aug 23 14:43:56 2018 +0800

SCB-867 Adapting Rest json to the generalization of TransportFactory
---
 .../java/org/apache/servicecomb/saga/format/JacksonFallback.java| 3 ++-
 .../org/apache/servicecomb/saga/format/JacksonRestFallback.java | 4 +++-
 .../org/apache/servicecomb/saga/format/JacksonRestOperation.java| 6 +++---
 .../org/apache/servicecomb/saga/format/JsonRestSagaRequest.java | 3 ++-
 .../java/org/apache/servicecomb/saga/format/JsonSagaRequest.java| 3 ++-
 .../java/org/apache/servicecomb/saga/format/TransportAware.java | 5 +++--
 .../apache/servicecomb/saga/format/JacksonFromJsonFormatTest.java   | 2 +-
 .../apache/servicecomb/saga/format/JacksonRestOperationTest.java| 2 +-
 .../org/apache/servicecomb/saga/format/JsonRestSagaRequestTest.java | 2 +-
 .../org/apache/servicecomb/saga/format/SagaEventFormatTest.java | 4 ++--
 10 files changed, 20 insertions(+), 14 deletions(-)

diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
index a70aafb..c6cbd47 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
@@ -20,6 +20,7 @@ package org.apache.servicecomb.saga.format;
 import org.apache.servicecomb.saga.core.Fallback;
 import org.apache.servicecomb.saga.core.Operation;
 import org.apache.servicecomb.saga.core.SagaResponse;
+import org.apache.servicecomb.saga.core.Transport;
 import org.apache.servicecomb.saga.transports.TransportFactory;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -39,7 +40,7 @@ import 
org.apache.servicecomb.saga.format.JacksonFallback.NopJacksonFallback;
 @Type(value = JacksonRestFallback.class, name = Operation.TYPE_REST),
 @Type(value = NopJacksonFallback.class, name = Operation.TYPE_NOP)
 })
-public interface JacksonFallback extends Fallback, TransportAware {
+public interface JacksonFallback extends Fallback, 
TransportAware {
 
   JacksonFallback NOP_TRANSPORT_AWARE_FALLBACK = new 
NopJacksonFallback(TYPE_NOP);
 
diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
index 35c54fe..92db35a 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
@@ -19,10 +19,12 @@ package org.apache.servicecomb.saga.format;
 
 import java.util.Map;
 
+import org.apache.servicecomb.saga.transports.RestTransport;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-class JacksonRestFallback extends JacksonRestOperation implements 
JacksonFallback {
+class JacksonRestFallback extends JacksonRestOperation implements 
JacksonFallback {
 
   private final String type;
 
diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
index c292168..e9dd762 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
@@ -28,7 +28,7 @@ import org.apache.servicecomb.saga.core.RestOperation;
 import org.apache.servicecomb.saga.core.SagaResponse;
 import org.apache.servicecomb.saga.transports.RestTransport;
 
-class JacksonRestOperation extends RestOperation implements TransportAware {
+class JacksonRestOperation extends RestOperation implements 
TransportAware {
 
   @JsonIgnore
   private RestTransport transport;
@@ -38,8 +38,8 @@ class JacksonRestOperation extends RestOperation implements 
TransportAware {
   }
 
   @Override
-  public JacksonRestOperation with(TransportFactory transport) {
-this.transport = transport.restTransport();
+  public JacksonRestOperation with(TransportFactory transport) {
+this.transport = transport.getTransport();
 return this;
   }
 
diff --git 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
index 9660eb4..f91d29b 100644
--- 
a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
+++ 
b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
@@ -20,6 +20,7 @@ package

[incubator-servicecomb-saga] branch master updated (0ee4c59 -> e8b46be)

2018-08-23 Thread ningjiang

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

ningjiang pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.


from 0ee4c59  SCB-817 Fixed typo of the GrpcTccEvent.proto
 new 3a0cdf4  SCB-866 generalize TransportFactory to extend Transport
 new e8b46be  SCB-867 Adapting Rest json to the generalization of 
TransportFactory

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/servicecomb/saga/transports/TransportFactory.java| 6 --
 .../java/org/apache/servicecomb/saga/format/JacksonFallback.java| 3 ++-
 .../org/apache/servicecomb/saga/format/JacksonRestFallback.java | 4 +++-
 .../org/apache/servicecomb/saga/format/JacksonRestOperation.java| 6 +++---
 .../org/apache/servicecomb/saga/format/JsonRestSagaRequest.java | 3 ++-
 .../java/org/apache/servicecomb/saga/format/JsonSagaRequest.java| 3 ++-
 .../java/org/apache/servicecomb/saga/format/TransportAware.java | 5 +++--
 .../apache/servicecomb/saga/format/JacksonFromJsonFormatTest.java   | 2 +-
 .../apache/servicecomb/saga/format/JacksonRestOperationTest.java| 2 +-
 .../org/apache/servicecomb/saga/format/JsonRestSagaRequestTest.java | 2 +-
 .../org/apache/servicecomb/saga/format/SagaEventFormatTest.java | 4 ++--
 11 files changed, 24 insertions(+), 16 deletions(-)

[incubator-servicecomb-service-center] branch master updated: SCB-857 Provider rule of consumer can not be removed (#429)

2018-08-23 Thread asifdxtreme

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

asifdxtreme pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
 new 77ae91e  SCB-857 Provider rule of consumer can not be removed (#429)
77ae91e is described below

commit 77ae91e5adc580861358a814096dd0f824073dc5
Author: little-cui 
AuthorDate: Thu Aug 23 15:51:13 2018 +0800

SCB-857 Provider rule of consumer can not be removed (#429)
---
 server/service/util/dependency_util.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/service/util/dependency_util.go 
b/server/service/util/dependency_util.go
index 288aeea..0041130 100644
--- a/server/service/util/dependency_util.go
+++ b/server/service/util/dependency_util.go
@@ -444,13 +444,13 @@ loop:
continue loop
}
 
-   id := 
apt.GenerateProviderDependencyRuleKey(domainProject, key)
+   id := apt.GenerateProviderDependencyRuleKey(key.Tenant, 
key)
exist, ok := cache[id]
if !ok {
_, exist, err = FindServiceIds(ctx, 
key.Version, key)
if err != nil {
return nil, fmt.Errorf("%v, find 
service %s/%s/%s/%s",
-   err, domainProject, key.AppId, 
key.ServiceName, key.Version)
+   err, key.Tenant, key.AppId, 
key.ServiceName, key.Version)
}
cache[id] = exist
}
@@ -497,7 +497,7 @@ func removeProviderRuleKeys(ctx context.Context, 
domainProject string, cache map
_, exist, err = FindServiceIds(ctx, key.Version, key)
if err != nil {
return nil, fmt.Errorf("find service 
%s/%s/%s/%s, %v",
-   domainProject, key.AppId, 
key.ServiceName, key.Version, err)
+   key.Tenant, key.AppId, key.ServiceName, 
key.Version, err)
}
cache[id] = exist
}

[GitHub] asifdxtreme closed pull request #429: SCB-857 Provider rule of consumer can not be removed

2018-08-23 Thread GitBox

asifdxtreme closed pull request #429: SCB-857 Provider rule of consumer can not 
be removed
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/429
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/server/service/util/dependency_util.go 
b/server/service/util/dependency_util.go
index 288aeea2..00411305 100644
--- a/server/service/util/dependency_util.go
+++ b/server/service/util/dependency_util.go
@@ -444,13 +444,13 @@ loop:
continue loop
}
 
-   id := 
apt.GenerateProviderDependencyRuleKey(domainProject, key)
+   id := apt.GenerateProviderDependencyRuleKey(key.Tenant, 
key)
exist, ok := cache[id]
if !ok {
_, exist, err = FindServiceIds(ctx, 
key.Version, key)
if err != nil {
return nil, fmt.Errorf("%v, find 
service %s/%s/%s/%s",
-   err, domainProject, key.AppId, 
key.ServiceName, key.Version)
+   err, key.Tenant, key.AppId, 
key.ServiceName, key.Version)
}
cache[id] = exist
}
@@ -497,7 +497,7 @@ func removeProviderRuleKeys(ctx context.Context, 
domainProject string, cache map
_, exist, err = FindServiceIds(ctx, key.Version, key)
if err != nil {
return nil, fmt.Errorf("find service 
%s/%s/%s/%s, %v",
-   domainProject, key.AppId, 
key.ServiceName, key.Version, err)
+   key.Tenant, key.AppId, key.ServiceName, 
key.Version, err)
}
cache[id] = exist
}


 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] coveralls commented on issue #266: SCB-864

2018-08-23 Thread GitBox

coveralls commented on issue #266: SCB-864
URL: 
https://github.com/apache/incubator-servicecomb-saga/pull/266#issuecomment-415323504
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18626252/badge)](https://coveralls.io/builds/18626252)
   
   Coverage increased (+1.6%) to 90.826% when pulling 
**07edd07d126b354abc01686c95eb576113d850f7 on KomachiSion:SCB-864** into 
**0ee4c59169224e9a2f4ab76f44216a2784df02bd on apache:master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] coveralls commented on issue #429: SCB-857 Provider rule of consumer can not be removed

2018-08-23 Thread GitBox

coveralls commented on issue #429: SCB-857 Provider rule of consumer can not be 
removed
URL: 
https://github.com/apache/incubator-servicecomb-service-center/pull/429#issuecomment-415321595
 
 
   
   [![Coverage 
Status](https://coveralls.io/builds/18626480/badge)](https://coveralls.io/builds/18626480)
   
   Coverage decreased (-0.2%) to 71.911% when pulling 
**ceb32a65eca80eb2ecf2b2ef56f9e9f1237d0bc7 on little-cui:deps** into 
**92a3b48b76ff9cbfbdee5f7730b925fa018fa668 on apache:master**.
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] codecov-io commented on issue #429: SCB-857 Provider rule of consumer can not be removed

2018-08-23 Thread GitBox

codecov-io commented on issue #429: SCB-857 Provider rule of consumer can not 
be removed
URL: 
https://github.com/apache/incubator-servicecomb-service-center/pull/429#issuecomment-415321015
 
 
   # 
[Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429?src=pr=h1)
 Report
   > Merging 
[#429](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429?src=pr=desc)
 into 
[master](https://codecov.io/gh/apache/incubator-servicecomb-service-center/commit/92a3b48b76ff9cbfbdee5f7730b925fa018fa668?src=pr=desc)
 will **decrease** coverage by `0.09%`.
   > The diff coverage is `0%`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/graphs/tree.svg?width=650=150=GAaF7zrg8R=pr)](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429?src=pr=tree)
   
   ```diff
   @@   Coverage Diff@@
   ##   master#429 +/-   ##
   
   - Coverage69.2%   69.1%   -0.1% 
   
 Files 139 139 
 Lines   10770   10770 
   
   - Hits 74537443 -10 
   - Misses   28392848  +9 
   - Partials  478 479  +1
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429?src=pr=tree)
 | Coverage Δ | |
   |---|---|---|
   | 
[server/service/util/dependency\_util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC9kZXBlbmRlbmN5X3V0aWwuZ28=)
 | `44.47% <0%> (ø)` | :arrow_up: |
   | 
[server/service/notification/listwatcher.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL2xpc3R3YXRjaGVyLmdv)
 | `69.01% <0%> (-9.86%)` | :arrow_down: |
   | 
[server/plugin/infra/registry/etcd/tracing.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/diff?src=pr=tree#diff-c2VydmVyL3BsdWdpbi9pbmZyYS9yZWdpc3RyeS9ldGNkL3RyYWNpbmcuZ28=)
 | `72.72% <0%> (-9.1%)` | :arrow_down: |
   | 
[server/service/notification/websocket.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL3dlYnNvY2tldC5nbw==)
 | `81.93% <0%> (-1.94%)` | :arrow_down: |
   | 
[server/broker/util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/diff?src=pr=tree#diff-c2VydmVyL2Jyb2tlci91dGlsLmdv)
 | `53.2% <0%> (-0.27%)` | :arrow_down: |
   | 
[server/govern/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/diff?src=pr=tree#diff-c2VydmVyL2dvdmVybi9zZXJ2aWNlLmdv)
 | `73.66% <0%> (+0.33%)` | :arrow_up: |
   | 
[server/admin/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429/diff?src=pr=tree#diff-c2VydmVyL2FkbWluL3NlcnZpY2UuZ28=)
 | `91.17% <0%> (+2.94%)` | :arrow_up: |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429?src=pr=continue).
   > **Legend** - [Click here to learn 
more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute  (impact)`, `ø = not affected`, `? = missing data`
   > Powered by 
[Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429?src=pr=footer).
 Last update 
[92a3b48...ceb32a6](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/429?src=pr=lastupdated).
 Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] little-cui opened a new pull request #429: SCB-857 Provider rule of consumer can not be removed

2018-08-23 Thread GitBox

little-cui opened a new pull request #429: SCB-857 Provider rule of consumer 
can not be removed
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/429
 
 
   Follow this checklist to help us incorporate your contribution quickly and 
easily:
   
- [ ] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually 
before you start working on it).  Trivial changes like typos do not require a 
JIRA issue.  Your pull request should address just this issue, without pulling 
in other changes.
- [ ] Each commit in the pull request should have a meaningful subject line 
and body.
- [ ] Format the pull request title like `[SCB-XXX] Fixes bug in 
ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA 
issue.
- [ ] Write a pull request description that is detailed enough to 
understand what the pull request does, how, and why.
- [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks 
pass. A more thorough check will be performed on your pull request 
automatically.
- [ ] If this contribution is large, please file an Apache [Individual 
Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
   
   ---
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] KomachiSion opened a new pull request #266: SCB-864

2018-08-23 Thread GitBox

KomachiSion opened a new pull request #266: SCB-864
URL: https://github.com/apache/incubator-servicecomb-saga/pull/266
 
 
   Generalize TransportFactory to support to call SQL component


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-website] branch asf-site updated (2a1efdd -> b924df8)

2018-08-23 Thread ningjiang

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

ningjiang pushed a change to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git.


from 2a1efdd  Published the  website
 add 03cfdbb  fix user guide link in footer of website
 new 9b05503  Merge branch 'master' into asf-site
 new b924df8  Publish the website

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 _includes/footer.html   | 2 +-
 content/404.html| 2 +-
 content/cn/404.html | 2 +-
 content/cn/developers/becomming-a-commiter.html | 2 +-
 content/cn/developers/contributing.html | 2 +-
 content/cn/developers/index.html| 2 +-
 content/cn/developers/release-guide/index.html  | 2 +-
 content/cn/developers/release-validation-guide/index.html   | 2 +-
 content/cn/developers/setup-committer-rights/index.html | 2 +-
 content/cn/developers/setup-develop-environment/index.html  | 2 +-
 content/cn/developers/submit-codes/index.html   | 2 +-
 content/cn/developers/subscribe-mail-list/index.html| 2 +-
 content/cn/developers/team/index.html   | 2 +-
 content/cn/developers/use-gitter/index.html | 2 +-
 content/cn/developers/use-jira/index.html   | 2 +-
 content/cn/docs/apache-servicecomb-day-slides/index.html| 2 +-
 content/cn/docs/apache-servicecomb-incubating-day/index.html| 2 +-
 content/cn/docs/autoscale-on-company/index.html | 2 +-
 .../cn/docs/build-java-chassis-microservices-using-gradle/index.html| 2 +-
 content/cn/docs/communication-btw-sc-ms/index.html  | 2 +-
 content/cn/docs/company-on-kubernetes/index.html| 2 +-
 content/cn/docs/config_center_integration/index.html| 2 +-
 content/cn/docs/consul-servicemesh.html | 2 +-
 content/cn/docs/distributed-transactions-saga-implementation/index.html | 2 +-
 content/cn/docs/distributed_saga_1/index.html   | 2 +-
 content/cn/docs/distributed_saga_2/index.html   | 2 +-
 content/cn/docs/distributed_saga_3/index.html   | 2 +-
 content/cn/docs/easy-build-microservice-system-part-I/index.html| 2 +-
 content/cn/docs/easy-build-microservice-system-part-II/index.html   | 2 +-
 content/cn/docs/easy-build-microservice-system-part-III/index.html  | 2 +-
 content/cn/docs/easy-build-microservice-system-part-IV/index.html   | 2 +-
 content/cn/docs/go-to-cloud/index.html  | 2 +-
 content/cn/docs/how-to-grow-up-to-be-an-apache-committer/index.html | 2 +-
 content/cn/docs/how-to-reform-a-legacy-system/index.html| 2 +-
 content/cn/docs/jira_beginner_guide/index.html  | 2 +-
 content/cn/docs/join_the_community/index.html   | 2 +-
 content/cn/docs/linuxcon-workshop-demo/index.html   | 2 +-
 content/cn/docs/maven_dependency_management/index.html  | 2 +-
 content/cn/docs/open-design/index.html  | 2 +-
 content/cn/docs/performance-test-on-seckill-with-jmeter/index.html  | 2 +-
 content/cn/docs/quick-start-advance/distributed-tracing/index.html  | 2 +-
 content/cn/docs/quick-start-advance/flow-control/index.html | 2 +-
 content/cn/docs/quick-start-advance/index.html  | 2 +-
 content/cn/docs/quick-start-advance/load-balance/index.html | 2 +-
 content/cn/docs/quick-start-advance/service-management/index.html   | 2 +-
 content/cn/docs/quick-start-bmi/index.html  | 2 +-
 content/cn/docs/quick-start-dataconsistency/index.html  | 2 +-
 content/cn/docs/quick-start/index.html  | 2 +-
 content/cn/docs/release_note_1_0_0.html | 2 +-
 content/cn/docs/saga_pack_design/index.html | 2 +-
 content/cn/docs/saga_with_cucumber/index.html   | 2 +-
 content/cn/docs/seckill-development-journey-part-I/index.html   | 2 +-
 content/cn/docs/seckill-development-journey-part-II/index.html  | 2 +-
 content/cn/docs/seckill-development-journey-part-III/index.html | 2 +-

[incubator-servicecomb-website] 02/02: Publish the website

2018-08-23 Thread ningjiang

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

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit b924df8bee4d261420a6f9d7bf8d9a616dee9857
Author: Willem Jiang 
AuthorDate: Thu Aug 23 14:36:01 2018 +0800

Publish the website
---
 content/404.html| 2 +-
 content/cn/404.html | 2 +-
 content/cn/developers/becomming-a-commiter.html | 2 +-
 content/cn/developers/contributing.html | 2 +-
 content/cn/developers/index.html| 2 +-
 content/cn/developers/release-guide/index.html  | 2 +-
 content/cn/developers/release-validation-guide/index.html   | 2 +-
 content/cn/developers/setup-committer-rights/index.html | 2 +-
 content/cn/developers/setup-develop-environment/index.html  | 2 +-
 content/cn/developers/submit-codes/index.html   | 2 +-
 content/cn/developers/subscribe-mail-list/index.html| 2 +-
 content/cn/developers/team/index.html   | 2 +-
 content/cn/developers/use-gitter/index.html | 2 +-
 content/cn/developers/use-jira/index.html   | 2 +-
 content/cn/docs/apache-servicecomb-day-slides/index.html| 2 +-
 content/cn/docs/apache-servicecomb-incubating-day/index.html| 2 +-
 content/cn/docs/autoscale-on-company/index.html | 2 +-
 .../cn/docs/build-java-chassis-microservices-using-gradle/index.html| 2 +-
 content/cn/docs/communication-btw-sc-ms/index.html  | 2 +-
 content/cn/docs/company-on-kubernetes/index.html| 2 +-
 content/cn/docs/config_center_integration/index.html| 2 +-
 content/cn/docs/consul-servicemesh.html | 2 +-
 content/cn/docs/distributed-transactions-saga-implementation/index.html | 2 +-
 content/cn/docs/distributed_saga_1/index.html   | 2 +-
 content/cn/docs/distributed_saga_2/index.html   | 2 +-
 content/cn/docs/distributed_saga_3/index.html   | 2 +-
 content/cn/docs/easy-build-microservice-system-part-I/index.html| 2 +-
 content/cn/docs/easy-build-microservice-system-part-II/index.html   | 2 +-
 content/cn/docs/easy-build-microservice-system-part-III/index.html  | 2 +-
 content/cn/docs/easy-build-microservice-system-part-IV/index.html   | 2 +-
 content/cn/docs/go-to-cloud/index.html  | 2 +-
 content/cn/docs/how-to-grow-up-to-be-an-apache-committer/index.html | 2 +-
 content/cn/docs/how-to-reform-a-legacy-system/index.html| 2 +-
 content/cn/docs/jira_beginner_guide/index.html  | 2 +-
 content/cn/docs/join_the_community/index.html   | 2 +-
 content/cn/docs/linuxcon-workshop-demo/index.html   | 2 +-
 content/cn/docs/maven_dependency_management/index.html  | 2 +-
 content/cn/docs/open-design/index.html  | 2 +-
 content/cn/docs/performance-test-on-seckill-with-jmeter/index.html  | 2 +-
 content/cn/docs/quick-start-advance/distributed-tracing/index.html  | 2 +-
 content/cn/docs/quick-start-advance/flow-control/index.html | 2 +-
 content/cn/docs/quick-start-advance/index.html  | 2 +-
 content/cn/docs/quick-start-advance/load-balance/index.html | 2 +-
 content/cn/docs/quick-start-advance/service-management/index.html   | 2 +-
 content/cn/docs/quick-start-bmi/index.html  | 2 +-
 content/cn/docs/quick-start-dataconsistency/index.html  | 2 +-
 content/cn/docs/quick-start/index.html  | 2 +-
 content/cn/docs/release_note_1_0_0.html | 2 +-
 content/cn/docs/saga_pack_design/index.html | 2 +-
 content/cn/docs/saga_with_cucumber/index.html   | 2 +-
 content/cn/docs/seckill-development-journey-part-I/index.html   | 2 +-
 content/cn/docs/seckill-development-journey-part-II/index.html  | 2 +-
 content/cn/docs/seckill-development-journey-part-III/index.html | 2 +-
 content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html| 2 +-
 content/cn/docs/tracing-with-servicecomb/index.html | 2 +-
 content/cn/faqs/faqs-huawei-cloud/index.html| 2 +-
 content/cn/faqs/index.html  | 2 +-
 content/cn/index.html   | 2 +-

[incubator-servicecomb-website] 01/02: Merge branch 'master' into asf-site

2018-08-23 Thread ningjiang

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

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 9b055030ca9c150fc6b5bec063cdaa2fe0a51dce
Merge: 2a1efdd 03cfdbb
Author: Willem Jiang 
AuthorDate: Thu Aug 23 14:34:59 2018 +0800

Merge branch 'master' into asf-site

 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[GitHub] WillemJiang closed pull request #133: fix user guide link in footer of website

2018-08-23 Thread GitBox

WillemJiang closed pull request #133: fix user guide link in footer of website
URL: https://github.com/apache/incubator-servicecomb-website/pull/133
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/_includes/footer.html b/_includes/footer.html
index dee7eae3..10766616 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -9,7 +9,7 @@
   
 {{ site.data.ui-text[page.lang].resources | default: 
"Resources" }}
 {{ 
site.data.ui-text[page.lang].quick_start | default: "Quick Start" }}
-{{ 
site.data.ui-text[page.lang].user_guide | default: "User Guide" }}
+{{ 
site.data.ui-text[page.lang].user_guide | default: "User Guide" }}
 {{ 
site.data.ui-text[page.lang].slides | default: "Workshop Slides" }}
 {{ 
site.data.ui-text[page.lang].faq | default: "Frequently Asked Questions" 
}}
   


 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[incubator-servicecomb-website] branch master updated: fix user guide link in footer of website

2018-08-23 Thread ningjiang

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/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 03cfdbb  fix user guide link in footer of website
03cfdbb is described below

commit 03cfdbb28f0380120c5d088fc38d09d4bc511581
Author: DeanLee 
AuthorDate: Thu Aug 23 14:17:37 2018 +0800

fix user guide link in footer of website
---
 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/footer.html b/_includes/footer.html
index dee7eae..1076661 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -9,7 +9,7 @@
   
 {{ site.data.ui-text[page.lang].resources | default: 
"Resources" }}
 {{ 
site.data.ui-text[page.lang].quick_start | default: "Quick Start" }}
-{{ 
site.data.ui-text[page.lang].user_guide | default: "User Guide" }}
+{{ 
site.data.ui-text[page.lang].user_guide | default: "User Guide" }}
 {{ 
site.data.ui-text[page.lang].slides | default: "Workshop Slides" }}
 {{ 
site.data.ui-text[page.lang].faq | default: "Frequently Asked Questions" 
}}

[GitHub] imlidian closed pull request #127: update deploy logic and make arc and setup-env docs migration

2018-08-23 Thread GitBox

imlidian closed pull request #127: update deploy logic and make  arc and 
setup-env docs migration
URL: https://github.com/apache/incubator-servicecomb-website/pull/127
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/_docs/servicecomb-arc.md b/_docs/servicecomb-arc.md
new file mode 100644
index ..ae8cf2de
--- /dev/null
+++ b/_docs/servicecomb-arc.md
@@ -0,0 +1,36 @@
+---
+title: "Java Chassis系统架构"
+lang: cn
+ref: servicecomb-introduction
+permalink: /cn/docs/servicecomb-arc/
+excerpt: "Java Chassis系统架构"
+last_modified_at: 2017-06-14T10:01:43-04:00
+---
+
+{% include toc %}
+## 框架概述
+![ServiceComb Model](/assets/images/servicecomb-models.png){: .align-center}
+
+## 主要设计意图
+
+1.编程模型和通信模型分离，不同的编程模型可以灵活组合不同的通信模型。应用开发者在开发阶段只关注接口开发，部署阶段灵活切换通信方式；支持legacy系统的切换，legacy系统只需要修改服务发布的配置文件（或者annotation），而不需要修改代码。
+
+现阶段支持SpringMVC、JAX-RS和透明RPC三种开发方式。
+
+2.内建API-first支持。通过契约规范化微服务开发，实现跨语言的通信，并支持配套的软件工具链（契约生成代码、代码生成契约等）开发，构建完整的开发生态。
+
+3.定义了常用的微服务运行模型，将微服务从发现到交互过程中的各种容错手段都封装起来。该运行模型支持自定义和扩展。
+
+## 模块说明
+
+| 类型 | artifact id | 是否可选 | 功能说明 |
+| :--- | :--- | :--- | :--- |
+| 编程模型 | provider-pojo | 是 | 提供RPC开发模式 |
+| 编程模型 | provider-jaxrs | 是 | 提供JAX RS开发模式 |
+| 编程模型 | provider-springmvc | 是 | 提供Spring MVC开发模式 |
+| 通信模型 | transport-rest-vertx | 是 | 运行于HTTP之上的开发框架，不依赖WEB容器，应用打包为可执行jar |
+| 通信模型 | transport-rest-servlet | 是 | 运行于WEB容器的开发框架，应用打包为war包 |
+| 通信模型 | transport-highway | 是 | 提供高性能的私有通信协议，仅用于java之间互通。 |
+| 运行模型 | handler-loadbalance | 是 | 负载均衡模块。提供各种路由策略和配置方法。一般客户端使用。 |
+| 运行模型 | handler-bizkeeper | 是 | 和服务治理相关的功能，比如隔离、熔断、容错。 |
+| 运行模型 | handler-tracing | 是 | 调用链跟踪模块，对接监控系统，吐出打点数据。 |
diff --git a/_docs/setup-environment.md b/_docs/setup-environment.md
new file mode 100644
index ..72654de2
--- /dev/null
+++ b/_docs/setup-environment.md
@@ -0,0 +1,191 @@
+---
+title: "环境配置"
+lang: cn
+ref: setup-environment
+permalink: /cn/docs/setup-environment/
+excerpt: "环境配置"
+last_modified_at: 2018-04-13T10:01:43-04:00
+---
+
+{% include toc %}
+
+## 安装Java开发环境
+
+* 
安装git，详情可参考[git安装教程](https://git-scm.com/book/zh/v2/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git)
+
+* 安装JDK 
1.8，详情可参考[JDK安装教程](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html){:target="_blank"}。
+
+* 安装Maven 
3.x，详情可参考[Maven安装教程](https://maven.apache.org/install.html){:target="_blank"}。
+
+* 安装IntelliJ Idea 
IDE，详情可参考[IntelliJ安装教程](https://www.jetbrains.com/help/idea/installing-and-launching.html){:target="_blank"}。
+
+## 运行 Service Center
+### 运行 Stand-alone Service Center
+运行Stand-alone Service Center有以下两种方式:
+
+1. 以可执行文件的方式运行
+
+   
+ Windows
+ Linux
+   
+   
+   
+ 
+   1. 
下载[服务注册中心可执行文件压缩包](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-windows-amd64.tar.gz)
+   2. 解压缩到当前文件夹
+   3. 进入解压缩后的目录，然后双击运行**start-service-center.bat**文件
+ 
+ 
+   1. 下载服务注册中心可执行文件压缩包并解压缩
+   ```bash
+   wget 
http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz
+   tar xvf 
apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz
+   ```
+   2. 运行服务注册中心
+   ```bash
+   bash 
apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64/start-service-center.sh
+   ```
+   
+
注意：前端（frontend）在Linux环境下默认会绑定ipv6地址，导致浏览器报错，修复办法为：先修改conf/app.conf中的httpaddr为外部可达网卡ip，之后修改app/appList/apiList.js中`ip
 : 'http://127.0.0.1'`为对应ip，最后重启ServiceCenter即可。
+{: .notice--warning}
+  
+
+   
+
+   注意：Window和Linux版本均只支持64位系统。
+   {: .notice--warning}
+
+2. 以Docker的方式运行
+
+```bash
+docker pull servicecomb/service-center
+docker run -d -p 30100:30100 servicecomb/service-center:latest
+```
+
+**注意事项：** 服务注册中心运行后绑定的IP为：*http://127.0.0.1:30100*。  
+如使用Docker Toolbox，可通过 `docker-machine ip` 获取服务绑定IP地址。
+{: .notice--warning}
+
+### 运行 Service Center 集群
+Service Center是一个无状态的应用因此它很容易以集群的模式部署提供HA。
+
+它依赖[etcd](https://github.com/coreos/etcd)存储微服务的信息，etcd既支持standalone模式运行也支持[集群模式](https://coreos.com/etcd/docs/latest/op-guide/clustering.html)运行。
+
+提示：我们强烈推荐etcd以集群模式运行，这样才能从整体上保证Service 
Center的HA能力；另外在这篇[文档](https://coreos.com/etcd/docs/latest/op-guide/runtime-configuration.html)中我们可以了解到etcd需要部署至少三个节点才能够避免Majority
 Failure。
+
+
+部署了standalone或集群etcd后，你可以按下面的步骤部署Service Center集群，我们以在两台VM上各部署一个Service 
Center实例为例：
+
+| Name| Address |
+| :-: | :-: |
+| VM1 | 10.12.0.1   |
+| VM2 | 10.12.0.2   |
+
+我们假定你的etcd运行在http://10.12.0.4:2379 上：
+
+# 第一步
+在所有的VM上从[ServiceComb官网](https://github.com/apache/incubator-servicecomb-service-center/releases)下载最新版本的Service
 Center并解压：
+
+```bash
+tar -xvf service-center-X.X.X-linux-amd64.tar.gz

[GitHub] imlidian opened a new pull request #133: fix user guide link in footer of website

2018-08-23 Thread GitBox

imlidian opened a new pull request #133: fix user guide link in footer of 
website
URL: https://github.com/apache/incubator-servicecomb-website/pull/133
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

77 matches

Mail list logo