You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/08/21 08:45:56 UTC
[incubator-servicecomb-docs] branch master updated (b64ccd5 ->
a376c20)
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 b64ccd5 delete useless file question-and-answer service-center-error-diagnosis.md
new dc3e6f0 update java-chassis-reference/en_US/packaging/standalone.md
new 750e97b update java-chassis-reference/en_US/packaging/web-container.md
new 3e3e43d correct packaging translation mistakes
new a376c20 correct web-container.md and standalone.md translate issue
The 4 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/packaging/standalone.md | 24 +++++++++++-----------
.../en_US/packaging/web-container.md | 21 ++++++++-----------
.../zh_CN/packaging/standalone.md | 4 ++--
3 files changed, 23 insertions(+), 26 deletions(-)
[incubator-servicecomb-docs] 03/04: correct packaging translation
mistakes
Posted by li...@apache.org.
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 3e3e43d748f778b0cc49ecc1b84f49eb4561fd43
Author: DeanLee <li...@huawei.com>
AuthorDate: Tue Aug 21 14:01:22 2018 +0800
correct packaging translation mistakes
---
java-chassis-reference/en_US/packaging/standalone.md | 5 +++--
java-chassis-reference/en_US/packaging/web-container.md | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java-chassis-reference/en_US/packaging/standalone.md b/java-chassis-reference/en_US/packaging/standalone.md
index 0966089..f9f0534 100644
--- a/java-chassis-reference/en_US/packaging/standalone.md
+++ b/java-chassis-reference/en_US/packaging/standalone.md
@@ -7,8 +7,9 @@ A Standalone container that loads Spring with a simple Main, because the service
* **Step 1** Write the Main function, initialize the log and load the service configuration as follows:
```java
-import com.huawei.paas.foundation.common.utils.BeanUtils;
-import com.huawei.paas.foundation.common.utils.Log4jUtils;
+import org.apache.servicecomb.foundation.common.utils.BeanUtils;
+import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
+
public class MainServer {
public static void main(String[] args) throws Exception {
Log4jUtils.init(); # Log initialization
diff --git a/java-chassis-reference/en_US/packaging/web-container.md b/java-chassis-reference/en_US/packaging/web-container.md
index 63acefa..b435acb 100644
--- a/java-chassis-reference/en_US/packaging/web-container.md
+++ b/java-chassis-reference/en_US/packaging/web-container.md
@@ -1,6 +1,6 @@
## Concept Description
-If you need to load the microservice into the web container to start the runtime, you need to create a new servlet project wrapper, the servlet project, you can not write or write a small amount of boot code as needed.
+If you need to load the microservice into the web container to start the runtime, you need to create a new servlet project wrapper, the servlet project, you just need write few lines of code
## Development example
[incubator-servicecomb-docs] 01/04: update
java-chassis-reference/en_US/packaging/standalone.md
Posted by li...@apache.org.
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 dc3e6f0516faaaf70df98b415779823d55a52346
Author: DeanLee <li...@huawei.com>
AuthorDate: Mon Aug 20 14:50:04 2018 +0800
update java-chassis-reference/en_US/packaging/standalone.md
---
java-chassis-reference/en_US/packaging/standalone.md | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/java-chassis-reference/en_US/packaging/standalone.md b/java-chassis-reference/en_US/packaging/standalone.md
index 9b0dc25..0966089 100644
--- a/java-chassis-reference/en_US/packaging/standalone.md
+++ b/java-chassis-reference/en_US/packaging/standalone.md
@@ -1,25 +1,24 @@
-## 概念阐述
+## Concept Description
-一个Standalone的容器，以简单的Main加载Spring启动，因为服务通常不需要Tomcat/JBoss等Web容器的特性，没必要用Web容器去加载服务。微框架提供了standalone部署运行模式，服务容器只是一个简单的Main方法，并加载一个简单的Spring容器，用于暴露服务。
+A Standalone container that loads Spring with a simple Main, because the service usually does not require the properties of a Web container such as Tomcat/JBoss, and there is no need to use the Web container to load the service. The microframework provides a standalone deployment run mode. The service container is just a simple Main method and loads a simple Spring container to expose the service.
-## 操作步骤
+## Operation steps
-* **步骤1** 编写Main函数，初始化日志和加载服务配置，内容如下：
+* **Step 1** Write the Main function, initialize the log and load the service configuration as follows:
```java
import com.huawei.paas.foundation.common.utils.BeanUtils;
import com.huawei.paas.foundation.common.utils.Log4jUtils;
public class MainServer {
public static void main(String[] args) throws Exception {
- Log4jUtils.init(); # 日志初始化
- BeanUtils.init(); # Spring bean初始化
+ Log4jUtils.init(); # Log initialization
+ BeanUtils.init(); # Spring bean initialization
}
}
```
-* **步骤2** 运行MainServer即可启动该微服务进程，向外暴露服务。
+* **Step 2** Run the MainServer to start the microservice process and expose the service.
-## 注意事项
-
-如果使用的是rest网络通道，需要将pom中的transport改为使用cse-transport-rest-vertx包
+## Notes
+If you are using the rest network channel, you need to change the transport in the pom to use the cse-transport-rest-vertx package.
[incubator-servicecomb-docs] 04/04: correct web-container.md and
standalone.md translate issue
Posted by li...@apache.org.
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 a376c205aeb671c88dc708374398c084b807341f
Author: DeanLee <li...@huawei.com>
AuthorDate: Tue Aug 21 16:34:57 2018 +0800
correct web-container.md and standalone.md translate issue
---
java-chassis-reference/en_US/packaging/web-container.md | 2 +-
java-chassis-reference/zh_CN/packaging/standalone.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java-chassis-reference/en_US/packaging/web-container.md b/java-chassis-reference/en_US/packaging/web-container.md
index b435acb..bd4e39e 100644
--- a/java-chassis-reference/en_US/packaging/web-container.md
+++ b/java-chassis-reference/en_US/packaging/web-container.md
@@ -1,6 +1,6 @@
## Concept Description
-If you need to load the microservice into the web container to start the runtime, you need to create a new servlet project wrapper, the servlet project, you just need write few lines of code
+If you need to load the microservice into the web container to start the runtime, you need to create a new servlet project wrapper, the servlet project, you just need to write few lines of code
## Development example
diff --git a/java-chassis-reference/zh_CN/packaging/standalone.md b/java-chassis-reference/zh_CN/packaging/standalone.md
index 9b0dc25..cff8b42 100644
--- a/java-chassis-reference/zh_CN/packaging/standalone.md
+++ b/java-chassis-reference/zh_CN/packaging/standalone.md
@@ -7,8 +7,8 @@
* **步骤1** 编写Main函数，初始化日志和加载服务配置，内容如下：
```java
-import com.huawei.paas.foundation.common.utils.BeanUtils;
-import com.huawei.paas.foundation.common.utils.Log4jUtils;
+import org.apache.servicecomb.foundation.common.utils.BeanUtils;
+import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
public class MainServer {
public static void main(String[] args) throws Exception {
Log4jUtils.init(); # 日志初始化
[incubator-servicecomb-docs] 02/04: update
java-chassis-reference/en_US/packaging/web-container.md
Posted by li...@apache.org.
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 750e97b06f056d0a20806a00aac9c5f4d89ad6f6
Author: DeanLee <li...@huawei.com>
AuthorDate: Mon Aug 20 14:50:19 2018 +0800
update java-chassis-reference/en_US/packaging/web-container.md
---
.../en_US/packaging/web-container.md | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/java-chassis-reference/en_US/packaging/web-container.md b/java-chassis-reference/en_US/packaging/web-container.md
index 7b11276..63acefa 100644
--- a/java-chassis-reference/en_US/packaging/web-container.md
+++ b/java-chassis-reference/en_US/packaging/web-container.md
@@ -1,20 +1,17 @@
-## 概念阐述
+## Concept Description
-如果需要将该微服务加载到web容器中启动运行时，需要新建一个servlet工程包装一下，该servlet工程，根据需要，可以不写或写少量的引导代码即可。
+If you need to load the microservice into the web container to start the runtime, you need to create a new servlet project wrapper, the servlet project, you can not write or write a small amount of boot code as needed.
-## 开发示例
+## Development example
-参考“开发服务提供者” -> “通信协议" -> "REST over Servlet"章节。
+Refer to the "Development Service Provider" -> "Communication Protocol" -> "REST over Servlet" chapter.
-## 注意事项
+## Notes
-Restful调用应该与web容器中其他静态资源调用（比如html、js等等）隔离开来，所以webroot后一段应该还有一层关键字，比如上面web.xml中举的例子（/test/rest）中的rest。
-
-以tomcat为例，默认每个war包都有不同的webroot，这个webroot需要是basePath的前缀，比如webroot为test，则该微服务所有的契约都必须以/test打头。
-
-当微服务加载在web容器中，并直接使用web容器开的http、https端口时，因为是使用的web容器的通信通道，所以需要满足web容器的规则。
-
-##
+Restful calls should be isolated from other static resource calls (such as html, js, etc.) in the web container, so there should be a layer of keywords in the post after webroot, such as the example in web.xml above (/test/rest) In the rest.
+Take tomcat as an example. By default, each war package has a different webroot. This webroot needs to be a basePath prefix. For example, if webroot is testing, all the contracts of the microservice must start with /test.
+When the microservice is loaded in the web container and directly uses the http and https ports opened by the web container, it is necessary to satisfy the rules of the web container because it is the communication channel of the web container used.
+##