[incubator-dubbo-website] branch asf-site updated: build site
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 3900754 build site
3900754 is described below
commit 3900754eb1046aec6a5edc9d6c8583242c0894d4
Author: 千臂
AuthorDate: Fri Nov 2 09:04:13 2018 +0800
build site
---
en-us/docs/developers/developers_dev.html | 6 +++
en-us/docs/developers/developers_dev.json | 2 +-
en-us/docs/user/demos/group-merger.html | 8 ++--
en-us/docs/user/demos/group-merger.json | 2 +-
zh-cn/docs/developers/developers_dev.html | 6 +++
zh-cn/docs/developers/developers_dev.json | 2 +-
zh-cn/docs/developers/guide_dev.html | 72 +++
zh-cn/docs/developers/guide_dev.json | 2 +-
8 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/en-us/docs/developers/developers_dev.html
b/en-us/docs/developers/developers_dev.html
index 349f01d..3387bf2 100644
--- a/en-us/docs/developers/developers_dev.html
+++ b/en-us/docs/developers/developers_dev.html
@@ -205,6 +205,12 @@
+8
+
+biyuhao
+https://github.com/biyuhao;>https://github.com/biyuhao
+Asiainfo-sec
++8
+
DisclaimerApache
Dubbo is an effort undergoing incubation at The Apache Software Foundation
(ASF), sponsored by the Incubator. Incubation is required of all newly accepted
projects until a further review indicates that the infrastructure,
communications, and decision making [...]
diff --git a/en-us/docs/developers/developers_dev.json
b/en-us/docs/developers/developers_dev.json
index 09e96d6..20f6f6f 100644
--- a/en-us/docs/developers/developers_dev.json
+++ b/en-us/docs/developers/developers_dev.json
@@ -1,4 +1,4 @@
{
"filename": "developers_dev.md",
- "__html": "Developers\nThis page shows Dubbo developers. Please
file PR to add or change
items.\nCommitters\n\n\n\nApache
ID\nName\nOrganization\nRole\nTimeZone\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwav
[...]
+ "__html": "Developers\nThis page shows Dubbo developers. Please
file PR to add or change
items.\nCommitters\n\n\n\nApache
ID\nName\nOrganization\nRole\nTimeZone\n\n\n\n\njmclean\nJustin
Mclean\nApache\nMentor\n+11\n\n\nmarkt\nMark
Thomas\nApache\nMentor\n+0\n\n\nwav
[...]
}
\ No newline at end of file
diff --git a/en-us/docs/user/demos/group-merger.html
b/en-us/docs/user/demos/group-merger.html
index 392773e..b84214a 100644
--- a/en-us/docs/user/demos/group-merger.html
+++ b/en-us/docs/user/demos/group-merger.html
@@ -25,22 +25,22 @@
The specified method to merge the results, other unspecified methods, will
only call one group
dubbo:reference interface="com.xxx.MenuService" group="*"
dubbo:method
name="getMenuItems" merger="true"
/
-/dubbo:service
+/dubbo:reference
The Specified a method does not merge the results, others merge the
results
dubbo:reference interface="com.xxx.MenuService" group="*" merger="true"
dubbo:method
name="getMenuItems" merger="false"
/
-/dubbo:service
+/dubbo:reference
Specify the merge strategy, the default according to the type of return
value automatically match, if the same type has two mergers, you need to
specify the name of the merger[2]
dubbo:reference interface="com.xxx.MenuService" group="*"
dubbo:method
name="getMenuItems" merger="mymerge"
/
-/dubbo:service
+/dubbo:reference
Specify the merge method, it will call the return type's method for
merging, the merging method parameter type must be the return type
dubbo:reference interface="com.xxx.MenuService" group="*"
dubbo:method
name="getMenuItems" merger=".addAll"
/
-/dubbo:service
+/dubbo:reference
diff --git a/en-us/docs/user/demos/group-merger.json
b/en-us/docs/user/demos/group-merger.json
index 2ebc4e7..189100e 100644
--- a/en-us/docs/user/demos/group-merger.json
+++ b/en-us/docs/user/demos/group-merger.json
@@ -1,4 +1,4 @@
{
"filename": "group-merger.md",
- "__html": "Group Merger\nAccording to the group to invoke server
and return the merge result [1], such as the menu service, the same interface, but
there are a variety of implementations, using group distinction, consumers call
each group and get the results, the merger can merge the resules, so that you
can achieve aggregation Menu Item.\nRelated code can refer to https://github.com/apach [...]
+ "__html": "Group Merger\nAccording to the group to invoke server
and return the merge result [1], such as the menu service, the same interface, but
there are a variety of implementations, using group distinction, consumers call
[incubator-dubbo-website] branch asf-site updated: [Dubbo-171] Add chinese version for guide_dev page (#175)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new bc1000d [Dubbo-171] Add chinese version for guide_dev page (#175) bc1000d is described below commit bc1000de8b9bcde903c4f8d8f6a58b622c0177c8 Author: Huang YunKun AuthorDate: Fri Nov 2 09:03:19 2018 +0800 [Dubbo-171] Add chinese version for guide_dev page (#175) * add chinese version for guide_dev * polish --- docs/zh-cn/developers/guide_dev.md | 76 -- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/docs/zh-cn/developers/guide_dev.md b/docs/zh-cn/developers/guide_dev.md index 7063606..b976be4 100644 --- a/docs/zh-cn/developers/guide_dev.md +++ b/docs/zh-cn/developers/guide_dev.md @@ -1,53 +1,55 @@ -## Contributing to Dubbo +## 为Dubbo做贡献 -Dubbo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. +Dubbo是在非限制性的Apache 2.0许可下发布的，遵循标准的Github开发流程，使用Github追踪处理问题，并将pull request合并到master中。如果您想为Dubbo 做贡献（即便是一些微小的），请不要犹豫，遵循下面的指导方针。 -### Sign the Contributor License Agreement -Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests. +### 签署贡献者许可协议 +在我们接受一个补丁或pull request之前，我们需要您签署贡献者许可协议。签署贡献者协议并不授予任何人对代码仓库的提交权限，但是它意味着我们可以接受您的贡献，并且如果我们这样做，您将获得一个作者标注。主动贡献者可能会被邀请加入核心团队，并有权限合并pull request。 -### Contact +### 联系我们 - Mailing list + 邮件列表 -The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [guide](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide) for detailed documentation on how to subscribe. -- [d...@dubbo.incubator.apache.org](mailto:dev-subscr...@dubbo.incubator.apache.org): the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo. -- [comm...@dubbo.incubator.apache.org](mailto:commits-subscr...@dubbo.incubator.apache.org): all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development. -- [notificat...@dubbo.incubator.apache.org](mailto:notification-subscr...@dubbo.incubator.apache.org): all the Github [issue](https://github.com/apache/incubator-dubbo/issues) updates and [pull request](https://github.com/apache/incubator-dubbo/pulls) updates will be sent to this mailing list. +邮件列表是讨论几乎所有与Dubbo有关事情的推荐方式。有关如何订阅的详细文档，请参阅[指南](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide)。 -### Reporting issue +- [d...@dubbo.incubator.apache.org](mailto:dev-subscr...@dubbo.incubator.apache.org): 开发邮件列表，如果您在使用或开发Dubbo时遇到任何问题，您可以在此提出问题。 +- [comm...@dubbo.incubator.apache.org](mailto:commits-subscr...@dubbo.incubator.apache.org): 所有提交将被发送到这个邮件列表。如果您对Dubbo的发展感兴趣，您可以订阅它。 +- [notificat...@dubbo.incubator.apache.org](mailto:notification-subscr...@dubbo.incubator.apache.org): 所有Github [issue](https://github.com/apache/incubator-dubbo/issues)和[pull request](https://github.com/apache/incubator-dubbo/pulls)的更新都会被发送到这个邮件列表。 -Please follow the [template](https://github.com/apache/incubator-dubbo/issues/new?template=dubbo-issue-report-template.md) for reporting any issues. +### 报告问题 -### Code Conventions -Our code style is almost in line with the standard java conventions (Popular IDE's default setting satisfy this), with the following additional restricts: -* If there are more than 120 characters in current line, start a new line. +在报告任何问题时请遵循[模版](https://github.com/apache/incubator-dubbo/issues/new?template=dubbo-issue-report-template.md)。 -* Make sure all new .java files to have a simple Javadoc class comment with at least a @date tag identifying birth, and preferably at least a paragraph on what the class is for. +### 代码约定 +我们的代码风格几乎和标准Java约定一致（流行IDE的默认设置满足这一点），主要有以下附加限制： -* Add the ASF license header comment to all new .java files (copy from existing files in the project) +* 如果当前行中有超过120个字符，则起一个新的行。 -* Make sure no @author tag added to the file you contribute since @author tag is not used at Apache, other ways such as cvs will record all your contributions fairly. +* 确保所有新的.java文件都有一个简单的JavaDoc类注释，其中至少有一个标识创建日期的标签，最好至少有一个关于该类的解释说明。 -* Add some Javadocs and, if you change the namespace, some XSD doc
[incubator-dubbo-website] branch asf-site updated: add information (#169)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new cdf1664 add information (#169) cdf1664 is described below commit cdf1664ca52328b838ae7ebe512b8e6c0ebd38a1 Author: leyou240 AuthorDate: Tue Oct 30 16:59:50 2018 +0800 add information (#169) * Update developers_dev.md add information * Update developers_dev.md add information --- docs/en-us/developers/developers_dev.md | 4 ++-- docs/zh-cn/developers/developers_dev.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en-us/developers/developers_dev.md b/docs/en-us/developers/developers_dev.md index 097665d..907002f 100644 --- a/docs/en-us/developers/developers_dev.md +++ b/docs/en-us/developers/developers_dev.md @@ -31,5 +31,5 @@ This page shows Dubbo developers. Please file PR to add or change items. ### Contributors | Github ID | Github URL | Organization | TimeZone | -| --- | --- | --- | --- | --- | -| | | | | | \ No newline at end of file +| --- | --- | --- | --- | +| leyou240 | <https://github.com/leyou240> | | +8 | diff --git a/docs/zh-cn/developers/developers_dev.md b/docs/zh-cn/developers/developers_dev.md index 1c51e7e..6cb31cc 100644 --- a/docs/zh-cn/developers/developers_dev.md +++ b/docs/zh-cn/developers/developers_dev.md @@ -31,5 +31,5 @@ ### 贡献者 | Github ID | Github URL | Organization | TimeZone | -| --- | --- | --- | --- | --- | -| | | | | | \ No newline at end of file +| --- | --- | --- | --- | +| leyou240 | <https://github.com/leyou240> | | +8 |
[incubator-dubbo-website] branch asf-site updated: correct a spelling mistake in xml.md (#164)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 4058fe9 correct a spelling mistake in xml.md (#164) 4058fe9 is described below commit 4058fe9c44b71bec7aace2f46eefddb84ee9ae32 Author: SuperIllidan AuthorDate: Thu Oct 25 17:10:04 2018 +0800 correct a spelling mistake in xml.md (#164) --- docs/en-us/user/configuration/xml.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en-us/user/configuration/xml.md b/docs/en-us/user/configuration/xml.md index 6789ffc..b6162da 100644 --- a/docs/en-us/user/configuration/xml.md +++ b/docs/en-us/user/configuration/xml.md @@ -45,7 +45,7 @@ Or: tag | purpose | introduction - | - | - -`` | Service Export | Used to export service, define service metadata, export service with mutiple protocols, register service to multiple registries +`` | Service Export | Used to export service, define service metadata, export service with multiple protocols, register service to multiple registries `` | Service Reference | Used to create a remote proxy, subscribe to multiple registries `` | Protocol Config | Configure the protocol for services on provider side, the consumer side follows. `` | Application Config | Applies to both provider and consumer.
[incubator-dubbo-website] branch asf-site updated: fix link
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 8e639ef fix link
8e639ef is described below
commit 8e639efbe2ba607cb058f59a72a6f826346b4e64
Author: zhuyong
AuthorDate: Mon Oct 22 15:54:47 2018 +0800
fix link
---
build/documentation.js | 2 +-
site_config/develop.js | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build/documentation.js b/build/documentation.js
index 8272856..d8353bd 100644
--- a/build/documentation.js
+++ b/build/documentation.js
@@ -3,4 +3,4 @@
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;t
[incubator-dubbo] branch master updated: prototype for issue2570 (#2640)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 393ffce prototype for issue2570 (#2640)
393ffce is described below
commit 393ffce5df5ac94a209914623d9a10bf94ef3b13
Author: Ian Luo
AuthorDate: Tue Oct 16 16:16:54 2018 +0800
prototype for issue2570 (#2640)
* #2570: dubbo all in one fail to start from a tomcat server when spring
framework is absent
* add comments and fix unit test
* add license header
* update comments in unit tests
---
.../spring/initializer/DubboContextListener.java | 72 ++
.../src/main/resources/META-INF/web-fragment.xml | 4 +-
.../DubboApplicationContextInitializerTest.java| 9 +--
.../spring/status/DataSourceStatusCheckerTest.java | 2 +-
4 files changed, 80 insertions(+), 7 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboContextListener.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboContextListener.java
new file mode 100644
index 000..35b2b70
--- /dev/null
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboContextListener.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.config.spring.initializer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * A Dubbo context listener is a delegation to
org.springframework.web.context.ContextLoaderListener. This is necessary,
+ * because Dubbo is packaged into all-in-one jar, therefore it contains a
web-fragment.xml from this sub module which's
+ * used for helping to assemble spring context listener automatically when
it's not configured explicitly by user in
+ * web.xml. It works fine with spring, but it will lead to ClassNotFound
exception and fail tomcat's bootup when user
+ * doesn't depend on spring framework.
+ */
+public class DubboContextListener implements ServletContextListener {
+private static final Log logger =
LogFactory.getLog(DubboContextListener.class);
+
+private static final String SPRING_CONTEXT_LISTENER =
"org.springframework.web.context.ContextLoaderListener";
+private static final String SPRING_CONTEXT_ROOT =
"org.springframework.web.context.WebApplicationContext.ROOT";
+
+private ServletContextListener springContextListener;
+private boolean executed = false;
+
+public DubboContextListener() {
+try {
+Class c = Class.forName(SPRING_CONTEXT_LISTENER);
+springContextListener = (ServletContextListener) c.newInstance();
+} catch (ClassNotFoundException | IllegalAccessException |
InstantiationException e) {
+logger.warn("Servlet container detects dubbo's web fragment
configuration, and tries to load " +
+"org.springframework.web.context.ContextLoaderListener but
fails to find the class. " +
+"If the application don't rely on Spring framework, pls.
simply ignore");
+}
+}
+
+@Override
+public void contextInitialized(ServletContextEvent servletContextEvent) {
+if (springContextListener != null) {
+// if spring context listener has already been registered, then do
nothing
+ServletContext context = servletContextEvent.getServletContext();
+if (context.getAttribute(SPRING_CONTEXT_ROOT) == null) {
+executed = true;
+springContextListener.contextInitialized(servletContextEvent);
+}
+}
+}
+
+@Override
+public void contextDestroyed(ServletContextEvent servletContextEvent) {
+if (springContextListener != null && executed) {
+springContextL
[incubator-dubbo] branch master updated: combine test coverage report (#2643)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 8cafcab combine test coverage report (#2643) 8cafcab is described below commit 8cafcab65dbb86a83e9ae3e09aba601af462c47d Author: Huang YunKun AuthorDate: Mon Oct 15 09:30:01 2018 +0800 combine test coverage report (#2643) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2d81475..5882557 100644 --- a/pom.xml +++ b/pom.xml @@ -474,10 +474,10 @@ -jacoco-site -package +report-aggregate +verify -report +report-aggregate
[incubator-dubbo-website] branch asf-site updated: build site
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 7a6d635 build site 7a6d635 is described below commit 7a6d6351021edd6a35b23c55d88bdde915fbe4d3 Author: zhuyong AuthorDate: Wed Oct 10 12:22:31 2018 +0800 build site --- 404.html | 1 + index.html | 1 + redirect.ejs | 1 + 3 files changed, 3 insertions(+) diff --git a/404.html b/404.html index 978e267..9adb33a 100644 --- a/404.html +++ b/404.html @@ -17,6 +17,7 @@ http://www.apache.org/foundation/thanks.html;>Thanks Copyright © 2018 The Apache Software Foundation. Apache and the Apache feather logo are trademarks of The Apache Software Foundation. + https://www.apache.org/security/;> diff --git a/index.html b/index.html index 978e267..9adb33a 100644 --- a/index.html +++ b/index.html @@ -17,6 +17,7 @@ <li><a href="<a rel="nofollow" href="http://www.apache.org/foundation/thanks.html"">http://www.apache.org/foundation/thanks.html"</a>;>Thanks</a></li> </ul> <p style="display: none">Copyright © 2018 The Apache Software Foundation. Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p> + <a style="display: none" href="<a rel="nofollow" href="https://www.apache.org/security/"">https://www.apache.org/security/"</a>;></a> <!-- 添加Apache校验项结束 --> <script src="//cdn.jsdelivr.net/npm/js-cookie@2/src/js.cookie.min.js"> diff --git a/redirect.ejs b/redirect.ejs index d74f8a4..685f13e 100644 --- a/redirect.ejs +++ b/redirect.ejs @@ -17,6 +17,7 @@ <li><a href="<a rel="nofollow" href="http://www.apache.org/foundation/thanks.html"">http://www.apache.org/foundation/thanks.html"</a>;>Thanks</a></li> </ul> <p style="display: none">Copyright © 2018 The Apache Software Foundation. Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p> + <a style="display: none" href="<a rel="nofollow" href="https://www.apache.org/security/"">https://www.apache.org/security/"</a>;></a> <!-- 添加Apache校验项结束 --> <script src="//cdn.jsdelivr.net/npm/js-cookie@2/src/js.cookie.min.js">
[incubator-dubbo] branch 2.6.x updated: fix #1641, support get system load on windows. (#2621)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 0b94b35 fix #1641, support get system load on windows. (#2621)
0b94b35 is described below
commit 0b94b35992259747611ffae2d807f87b4ed4b705
Author: Jerrick Zhu
AuthorDate: Wed Oct 10 10:59:59 2018 +0800
fix #1641, support get system load on windows. (#2621)
---
.../com/alibaba/dubbo/common/status/support/LoadStatusChecker.java | 5 +
1 file changed, 5 insertions(+)
diff --git
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java
index 20715c5..0ed290f 100644
---
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java
+++
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java
@@ -37,6 +37,11 @@ public class LoadStatusChecker implements StatusChecker {
try {
Method method =
OperatingSystemMXBean.class.getMethod("getSystemLoadAverage", new Class[0]);
load = (Double) method.invoke(operatingSystemMXBean, new
Object[0]);
+if (load == -1) {
+com.sun.management.OperatingSystemMXBean bean =
+(com.sun.management.OperatingSystemMXBean)
operatingSystemMXBean;
+load = bean.getSystemCpuLoad();
+}
} catch (Throwable e) {
load = -1;
}
[incubator-dubbo-website] branch asf-site updated: add check
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 4103820 add check
4103820 is described below
commit 410382074d3e54fee23dfddebaf1b9d05cb3fe0a
Author: zhuyong
AuthorDate: Wed Oct 10 08:58:40 2018 +0800
add check
---
404.html | 28 ++--
build/blog.js | 6 +++---
build/blogDetail.js | 6 +++---
build/community.js| 6 +++---
build/documentation.js| 6 +++---
build/home.js | 6 +++---
en-us/blog/tracing-with-skywalking.html | 10 +-
en-us/blog/tracing-with-skywalking.json | 2 +-
en-us/docs/admin/ops/skywalking.html | 10 +-
en-us/docs/admin/ops/skywalking.json | 2 +-
index.html| 28 ++--
redirect.ejs | 28 ++--
zh-cn/blog/prepare-an-apache-release.html | 4 ++--
zh-cn/blog/prepare-an-apache-release.json | 2 +-
14 files changed, 60 insertions(+), 84 deletions(-)
diff --git a/404.html b/404.html
index a45ce11..978e267 100644
--- a/404.html
+++ b/404.html
@@ -7,6 +7,16 @@
http://www.apache.org/events/current-event;>Apache Dubbo is an effort
undergoing incubation at The Apache Software Foundation (ASF), sponsored by the
Incubator. Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the comp
[...]
+ http://dubbo.apache.org/img/apache_logo.png"/>
+
+ASF
+http://www.apache.org;>Foundation
+http://www.apache.org/licenses/;>License
+http://www.apache.org/events/current-event;>Events
+http://www.apache.org/foundation/sponsorship.html;>Sponsorship
+http://www.apache.org/foundation/thanks.html;>Thanks
+
+ Copyright © 2018 The Apache Software Foundation.
Apache and the Apache feather logo are trademarks of The Apache Software
Foundation.
@@ -18,23 +28,5 @@
}
window.location = window.rootPath + '/' + lang;
-
-
\ No newline at end of file
diff --git a/build/blog.js b/build/blog.js
index 39d166d..dc2eb7b 100644
--- a/build/blog.js
+++ b/build/blog.js
@@ -1,6 +1,6 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=79) [...]
- Copyright (c) 2016 Jed Watson.
+!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=77) [...]
+ Copyright (c) 2017 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;t
- https://github.com/apache/incubator-skywalking;>Apache
Skywalking(Incubator) is the APM system that it designed for
micro-services architectures and cloud native architecture systems and supports
distribute tracking. https://github.com/apache/incubator-skywalking;>Apache skywalking
(incubator) collects and analyzes the trace data and generates the
relationship between the application and the service metric, Apache skywalking
(incubating) supports multiple la [...]
Currently, Skywalking has supported analysis the operation of distributed
systems fro
[incubator-dubbo] branch 2.6.x updated: update release script (#2615)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 5adb9bf update release script (#2615)
5adb9bf is described below
commit 5adb9bfb59acdba3115f2b4cd1d9ec72ecec42cc
Author: Jerrick Zhu
AuthorDate: Tue Oct 9 11:46:53 2018 +0800
update release script (#2615)
---
release.sh | 334 +
1 file changed, 114 insertions(+), 220 deletions(-)
diff --git a/release.sh b/release.sh
index e33940e..d5e9401 100755
--- a/release.sh
+++ b/release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -14,26 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# set -e
-# set -x
-
-function fail {
->&2 echo "\033[31m\033[01m[
-FATAL ERROR:
---
-$1 ]\033[0m"
-
-echo "Clear current work dir"
-git add .
-git commit -m 'Failed preparation for release.'
-exit 1
-}
function fail_noclear {
->&2 echo "\033[31m\033[01m[
-FATAL ERROR:
+>&2 echo "FATAL ERROR:
--
-$1 ]\033[0m"
+$1"
exit 1
}
@@ -44,142 +29,58 @@ xpath /pom:project/pom:version/text()
EOF
}
-function generate_promotion_script {
-echo "Generating release promotion script 'promote-$version.sh'"
-read -d '' script <<- EOF
-#!/bin/bash
-echo "Promoting release $version
-Actions about to be performed:
---
-\$(cat \$0 | tail -n +14)
---"
-read -p "Press enter to continue or CTRL-C to abort"
-# promote the source distribution by moving it from the staging area to the
release area
-# mv https://dist.apache.org/repos/dist/dev/incubator/dubbo/$version
https://dist.apache.org/repos/dist/release/incubator/dubbo/ -m "Upload release
to the mirrors"
-#mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:rc-release
-DstagingRepositoryId=$stagingRepositoryId -DnexusUrl=https://oss.sonatype.org/
-DserverId=sonatype-nexus-staging -Ddescription="Release vote has passed"
-# Renumber the next development iteration $next_version:
-git checkout $branch
-mvn release:update-versions --batch-mode
-mvn versions:set versions:commit -DprocessAllModules=true
-DnewVersion=$next_version
-git add --all
-git commit -m 'Start the next development version'
-echo "
-Please check the new versions and merge $branch to the base branch.
-"
-EOF
-
-echo "$script" > promote-$version.sh
-chmod +x promote-$version.sh
-git add promote-$version.sh
-}
-
-function generate_rollback_script {
- echo "Generating release rollback script 'revert-$version.sh'"
-read -d '' script <<- EOF
-#!/bin/bash
-echo -n "Reverting release $version
-Actions about to be performed:
---
-\$(cat \$0 | tail -n +14)
---
-Press enter to continue or CTRL-C to abort"
-read
-# clean up local repository
-git checkout $GIT_BRANCH
-git branch -D $branch
-git tag -d $tag
-# clean up staging dist area
-#svn rm https://dist.apache.org/repos/dist/dev/incubator/dubbo/$version -m
"Release vote has failed"
-# clean up staging maven repository
-#mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:rc-drop
-DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://oss.sonatype.org/
-DserverId=sonatype-nexus-staging -Ddescription="Release vote has failed"
-# clean up remaining release files
-find . -name "*.releaseBackup" -exec rm {} \\;
-[ -f release.properties ] && rm release.properties
-EOF
-echo "$script" > revert-$version.sh
-
- chmod +x revert-$version.sh
- git add revert-$version.sh
-}
-
-function generate_release_vote_email {
-
-echo "Generating Vote email"
-
-echo "
-Hello Dubbo Community,
-
-This is a call for vote to release Apache Dubbo (Incubating) version
$version.
-
-The release candidates (RC5):
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/$version
+REPO=""
+BRANCH=""
-Git tag for the release (RC5):
-https://github.com/apache/incubator-dubbo/tree/dubbo-$version
-Hash for the release tag:
-3963d8fd93642398375ea92acb7ed4d2bc1b0518
-
-Release Notes:
-https://github.com/apache/incubator-dubbo/blob/dubbo-$version/CHANGES.md
-
-The artifacts have been signed with Key : 28681CB1, which can be found in
the keys file:
[incubator-dubbo] branch 2.6.5-release-staging deleted (was 2c56668)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.5-release-staging in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was 2c56668 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 2c56668 [maven-release-plugin] prepare for next development iteration
[incubator-dubbo] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.5-release-staging in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git commit 2c566681a067a5e7ae831ea768f22ea8eec1f22c Author: zhuyong AuthorDate: Tue Oct 9 10:44:11 2018 +0800 [maven-release-plugin] prepare for next development iteration --- all/pom.xml| 4 ++-- bom/pom.xml| 4 ++-- dependencies-bom/pom.xml | 4 ++-- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-fastjson/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-kryo/pom.xml | 2 +- dubbo-serialization/pom.xml| 2 +- dubbo-test/dubbo-test-benchmark/pom.xml| 2 +- dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml| 2 +- dubbo-test/dubbo-test-examples/pom.xml | 2
[incubator-dubbo] branch 2.6.5-release-staging created (now 2c56668)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.5-release-staging in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at 2c56668 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new dae220a [maven-release-plugin] prepare release dubbo-2.6.5 new 2c56668 [maven-release-plugin] prepare for next development iteration 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.
[incubator-dubbo] 01/02: [maven-release-plugin] prepare release dubbo-2.6.5
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.5-release-staging in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git commit dae220ad98305f77cf68d7e338ba512ec38fd72b Author: zhuyong AuthorDate: Tue Oct 9 10:44:10 2018 +0800 [maven-release-plugin] prepare release dubbo-2.6.5 --- all/pom.xml| 4 ++-- bom/pom.xml| 4 ++-- dependencies-bom/pom.xml | 4 ++-- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-fastjson/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-kryo/pom.xml | 2 +- dubbo-serialization/pom.xml| 2 +- dubbo-test/dubbo-test-benchmark/pom.xml| 2 +- dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml| 2 +- dubbo-test/dubbo-test-examples/pom.xml | 2 +- dubbo-test
[incubator-dubbo] annotated tag dubbo-2.6.5 updated (dae220a -> 02eb06b)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to annotated tag dubbo-2.6.5 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. *** WARNING: tag dubbo-2.6.5 was modified! *** from dae220a (commit) to 02eb06b (tag) tagging dae220ad98305f77cf68d7e338ba512ec38fd72b (commit) replaces dubbo-2.6.4 by zhuyong on Tue Oct 9 10:44:10 2018 +0800 - Log - [maven-release-plugin] copy for tag dubbo-2.6.5 --- No new revisions were added by this update. Summary of changes:
[incubator-dubbo] annotated tag dubbo-2.6.5 deleted (was 3c05793)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to annotated tag dubbo-2.6.5 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. *** WARNING: tag dubbo-2.6.5 was deleted! *** tag was 3c05793 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-dubbo] branch 2.6.5-release-staging deleted (was 0375a61)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.5-release-staging in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was 0375a61 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 0375a61 [maven-release-plugin] prepare for next development iteration discard f99f8f2 [maven-release-plugin] prepare release dubbo-2.6.5
[incubator-dubbo] branch 2.6.5-release-staging created (now 0375a61)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.5-release-staging in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at 0375a61 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new f99f8f2 [maven-release-plugin] prepare release dubbo-2.6.5 new 0375a61 [maven-release-plugin] prepare for next development iteration 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.
[incubator-dubbo] annotated tag dubbo-2.6.5 updated (f99f8f2 -> 3c05793)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to annotated tag dubbo-2.6.5 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. *** WARNING: tag dubbo-2.6.5 was modified! *** from f99f8f2 (commit) to 3c05793 (tag) tagging f99f8f204f38e96bb1cab7f52d5fdf4ccd62d033 (commit) replaces dubbo-2.6.4 by zhuyong on Tue Oct 9 10:30:50 2018 +0800 - Log - [maven-release-plugin] copy for tag dubbo-2.6.5 --- No new revisions were added by this update. Summary of changes:
[incubator-dubbo] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.5-release-staging in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git commit 0375a61ad692d2815b554d28a43194c193d786ab Author: zhuyong AuthorDate: Tue Oct 9 10:30:51 2018 +0800 [maven-release-plugin] prepare for next development iteration --- all/pom.xml| 4 ++-- bom/pom.xml| 4 ++-- dependencies-bom/pom.xml | 4 ++-- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-fastjson/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-kryo/pom.xml | 2 +- dubbo-serialization/pom.xml| 2 +- dubbo-test/dubbo-test-benchmark/pom.xml| 2 +- dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml| 2 +- dubbo-test/dubbo-test-examples/pom.xml | 2
[incubator-dubbo] branch 2.6.5-release created (now c4eb4e8)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.5-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at c4eb4e8 Removed jdk9 from .travis.yml. (#2609) No new revisions were added by this update.
[incubator-dubbo] branch 2.6.x updated: Removed jdk9 from .travis.yml. (#2609)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/2.6.x by this push: new c4eb4e8 Removed jdk9 from .travis.yml. (#2609) c4eb4e8 is described below commit c4eb4e8ceb14965f2abd881b70ba6f1f994d3940 Author: cbolgiano AuthorDate: Mon Oct 8 20:50:29 2018 -0400 Removed jdk9 from .travis.yml. (#2609) --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5aaa1ba..a6c3dcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: java sudo: false # faster builds jdk: -- oraclejdk9 - oraclejdk8 - openjdk7
[incubator-dubbo] branch master updated: fix #2600 add javadoc-plugin to dubbo-all module (#2604)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 046bc30 fix #2600 add javadoc-plugin to dubbo-all module (#2604)
046bc30 is described below
commit 046bc3081f7a98d539f9fb1b9af375ad80868ea8
Author: Jerrick Zhu
AuthorDate: Tue Oct 9 08:49:48 2018 +0800
fix #2600 add javadoc-plugin to dubbo-all module (#2604)
---
dubbo-all/pom.xml | 39 +++
1 file changed, 39 insertions(+)
diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index 7a1cdd3..f26a1e2 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -556,4 +556,43 @@
+
+
+
+release
+
+
+
+maven-javadoc-plugin
+${maven_javadoc_version}
+
+
+attach-javadoc
+
+jar
+
+
+none
+
+
+
+
+
true
+
+
org.apache.dubbo:dubbo-*
+
com.alibaba:hessian-*
+
+public
+UTF-8
+UTF-8
+UTF-8
+
+
http://docs.oracle.com/javase/7/docs/api
+
+
+
+
+
+
+
\ No newline at end of file
[incubator-dubbo] branch master updated: update lastest version to 2.6.4 (#2601)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 3c34ee8 update lastest version to 2.6.4 (#2601) 3c34ee8 is described below commit 3c34ee88fd79b5df0441320e53042b60a00bf76b Author: Jerrick Zhu AuthorDate: Mon Oct 8 16:02:38 2018 +0800 update lastest version to 2.6.4 (#2601) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4161d6b..75ec970 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ There's a [README](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samp com.alibaba dubbo -2.6.3 +2.6.4 ```
[incubator-dubbo] branch 2.6.4-release deleted (was d7af5d9)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was d7af5d9 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-dubbo] branch 2.6.x updated (28e1037 -> f77c9fc)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from 28e1037 Optimize LeastActiveLoadBalance and add weight test case. (#2584) add 39ea8a8 add change log for 2.6.4 add 3750059 change port for unit test add 57399a2 Enhance NOTICE file. add f7baac7 Merge branch '2.6.4-release' of github.com:apache/incubator-dubbo into 2.6.4-release add 8803774 [maven-release-plugin] prepare release dubbo-2.6.4 add d7af5d9 [maven-release-plugin] prepare for next development iteration new f77c9fc Merge branch '2.6.4-release' into 2.6.x 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. Summary of changes: CHANGES.md | 27 +- NOTICE | 11 - all/pom.xml| 4 ++-- bom/pom.xml| 2 +- dependencies-bom/pom.xml | 2 +- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../alibaba/dubbo/config/spring/ConfigTest.java| 4 ++-- .../dubbo/config/spring/delay-fixed-time.xml | 2 +- .../dubbo/config/spring/delay-on-initialized.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- .../dubbo/telnet/ChangeTelnetHandlerTest.java | 2 +- .../dubbo/telnet/InvokerTelnetHandlerTest.java | 12 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- .../dubbo-serialization-api/pom.xml| 2 +- .../dubbo-serialization-fastjson/pom.xml | 2 +- .../dubbo-serialization-fst/pom.xml| 2 +- .../dubbo-serialization-hessian2/pom.xml | 2 +- .../dubbo-serialization-jdk/pom.xml| 2 +- .../dubbo-serial
[incubator-dubbo] 01/01: Merge branch '2.6.4-release' into 2.6.x
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git commit f77c9fcc5ecfa10ce535a75b877bbce9ba078c70 Merge: 28e1037 d7af5d9 Author: zhuyong AuthorDate: Mon Oct 8 15:15:15 2018 +0800 Merge branch '2.6.4-release' into 2.6.x CHANGES.md | 27 +- NOTICE | 11 - all/pom.xml| 4 ++-- bom/pom.xml| 2 +- dependencies-bom/pom.xml | 2 +- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../alibaba/dubbo/config/spring/ConfigTest.java| 4 ++-- .../dubbo/config/spring/delay-fixed-time.xml | 2 +- .../dubbo/config/spring/delay-on-initialized.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- .../dubbo/telnet/ChangeTelnetHandlerTest.java | 2 +- .../dubbo/telnet/InvokerTelnetHandlerTest.java | 12 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- .../dubbo-serialization-api/pom.xml| 2 +- .../dubbo-serialization-fastjson/pom.xml | 2 +- .../dubbo-serialization-fst/pom.xml| 2 +- .../dubbo-serialization-hessian2/pom.xml | 2 +- .../dubbo-serialization-jdk/pom.xml| 2 +- .../dubbo-serialization-kryo/pom.xml | 2 +- dubbo-serialization/pom.xml| 2 +- dubbo-test/dubbo-test-benchmark/pom.xml| 2 +- .../dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml| 2 +- dubbo-test/dubbo-test-examples/pom.xml | 2 +- dubbo-test/dubbo-test-integration/pom.xml | 2 +- dubbo-test/pom.xml | 4 ++-- pom.xml| 4 ++-- 75 files changed, 118 insertions(+), 84 deletions(-)
svn commit: r29932 - in /release/incubator/dubbo: ./ 2.6.4/
Author: jerrick Date: Mon Oct 8 02:22:24 2018 New Revision: 29932 Log: release Apache Dubbo(incubating) 2.6.4 Added: release/incubator/dubbo/2.6.4/ release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip (with props) release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip (with props) release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.sha512 Modified: release/incubator/dubbo/KEYS Added: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip == Binary file - no diff available. Propchange: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip -- svn:mime-type = application/octet-stream Added: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc == --- release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc (added) +++ release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc Mon Oct 8 02:22:24 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEER7bUsvMa9+xqqNFOeVX7bR3SHPcFAlufePAACgkQeVX7bR3S +HPfb6w//exjvxVF/Al4uAhuIdQX9Q6UPRoT1+DHsdy5i6f938OCG98sfIn8Bt1o+ +U7Ztl8hupRBBwnp3ihJBFbY5t4Ua9a3IMRaplZhOTHFzGmSI1XVTdkQfuDCVFsVL +/5P6IYPhrvz2pfLE/tDZ+WGfPotI3dTiMdbpy07U2YUPVFy9uajQJXGhL4nBYRzq +W0EFTzJwZ0EKgf2GmW65mGadB68cF+XTduZ4FKLdgUNvguuJkXWXaDmCAqA/aok2 +/smYGgrTw48QyMrpI4ZrsM27odijmSqXhRBiR3WLb+EfcUgHHwuj3n+AtSrEDKvK +x80ZnDDqwIacnKlS5/BVWTmCBoR3163EiVQbdZEjkEyUIfuLxCjdFM+HSd220g1v +lwptWU1iMkZ12RjpnCs4lxQb+1L3VLwCaZld3Of7t+jd30d79G/svnKmAl6Z6Eyz +QLpBeNkZj0xeCr2huDMcqWzoKQKoHuWjPU95KgrV50FdIHQn9Z3P+k+j+JynBhck +HWgq5/ctOZKnEZnJxp1NJx8JpP+B940Cz4ls3bgujvC4D9jDm0KLgywNQd09pweW +DkhuZF/TnmVO0Q/a9pgTCDEd0Q1JPJZk8kXjy3BxpffD2IiJIf+7MKZoryG8SchE +OXeN6BLv7w4hLNAzLB7rSOPGD9gX6dzq+n3tvWje8gLGEfwFmDQ= +=xHuH +-END PGP SIGNATURE- Added: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 == --- release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 (added) +++ release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 Mon Oct 8 02:22:24 2018 @@ -0,0 +1 @@ +23311aa4264ce5ad2af55851688167e61b5ab7635f8f9b7f669ef2d5aa15492a8361c257951256a2354b3c93aeb09f7a9d1703f186a7be5418ed5d5c904ed752 apache-dubbo-incubating-2.6.4-bin-release.zip Added: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip == Binary file - no diff available. Propchange: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip -- svn:mime-type = application/octet-stream Added: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc == --- release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc (added) +++ release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc Mon Oct 8 02:22:24 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEER7bUsvMa9+xqqNFOeVX7bR3SHPcFAlufePEACgkQeVX7bR3S +HPcWYA/+P+ksT/THkcrFdPjlwn3V8ysMpK3tFMJErqnj8bKqpNIDniG3cp3jpt8g +DjPzQoMdr1JOPrnCRckqngv1BQ6a7cTIkYxb09BFj1IRiRlXM2hfOwMesBE6QJQ4 +PU771vpIF1xGHr4upxoGpVR++dRSOW4YH7UouZFuGQY8usobMtKG0HUihDjrAz3d +qChG3A7pvnCXoVgqefmjxSNteO96fQELNtIRFt+sJXOeyTs7dJmXG1wSwOxmcjem +c1TE+1l+rnOnvIGrWcyBiKuhRo1VgPZbW3SuP7KUgQNyf257gpS1YK4qKhJMZ2k1 +BFR47wtnrL1+OXg/YzokK/fVXfIliqsWWK2D5DNMWJa6uXtJGkNMmLg41bohjrLL +XD60EXeOxSZagIkWwvEL5PTdbo7yi3eihkPggO65cfmN3xlK+N4j+Wb2pMRmvlX1 +KTtY4CEe8T+tZqnKnryPUdo8zUHXBgwkRwGWgGYZwi8nrz0L9JdAl6BfZHKc67RA +4Vu07KN4/si0undAc1dqfk6sR8n3iW5mFCPdBIUkJLLYZQc10Ol5pbVi5P+zpBeu +MFAiu7CmUotMkczeMXEQaJOhem1i96RIKEEZmW5dcXtEO/KCsXEXjk8cKY3pK93h +iWmvsW930GngezdWNv/aIq5ikCwhUMUnuxi579izJFMOJwPBJQQ= +=zsMu +-END PGP SIGNATURE- Added: release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.sha512 == --- release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.sha512 (added) +++ release/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source
[incubator-dubbo] branch master updated: fix #2560, use target/test-classes as the basedir (#2563)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 733a376 fix #2560, use target/test-classes as the basedir (#2563)
733a376 is described below
commit 733a376396386f6cfab3f8ac8e30af2dfe7b2519
Author: Jerrick Zhu
AuthorDate: Thu Sep 27 10:43:29 2018 +0800
fix #2560, use target/test-classes as the basedir (#2563)
---
.../spring/initializer/DubboApplicationContextInitializerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
index 2c84095..b5b8f8c 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
@@ -29,7 +29,7 @@ public class DubboApplicationContextInitializerTest {
@Test
public void testSpringContextLoaderListenerInWebXml() throws Exception {
Tomcat tomcat = new Tomcat();
-tomcat.setBaseDir("src/test/resources");
+tomcat.setBaseDir("target/test-classes");
tomcat.setPort(12345);
StandardContext context = new StandardContext();
context.setName("test");
@@ -49,7 +49,7 @@ public class DubboApplicationContextInitializerTest {
@Test
public void testNoListenerInWebXml() throws Exception {
Tomcat tomcat = new Tomcat();
-tomcat.setBaseDir("src/test/resources");
+tomcat.setBaseDir("target/test-classes");
tomcat.setPort(12345);
StandardContext context = new StandardContext();
context.setName("test2");
@@ -69,7 +69,7 @@ public class DubboApplicationContextInitializerTest {
@Test
public void testMetadataComplete() throws Exception {
Tomcat tomcat = new Tomcat();
-tomcat.setBaseDir("src/test/resources");
+tomcat.setBaseDir("target/test-classes");
tomcat.setPort(12345);
StandardContext context = new StandardContext();
context.setName("test3");
[incubator-dubbo] branch 2.6.x updated: fix #2560, use target/test-classes as the basedir (#2564)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 0ac21f0 fix #2560, use target/test-classes as the basedir (#2564)
0ac21f0 is described below
commit 0ac21f06974b2d8bc80ef777a31ca320ec05f81b
Author: Jerrick Zhu
AuthorDate: Thu Sep 27 10:43:40 2018 +0800
fix #2560, use target/test-classes as the basedir (#2564)
---
.../spring/initializer/DubboApplicationContextInitializerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
index 2c84095..b5b8f8c 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
@@ -29,7 +29,7 @@ public class DubboApplicationContextInitializerTest {
@Test
public void testSpringContextLoaderListenerInWebXml() throws Exception {
Tomcat tomcat = new Tomcat();
-tomcat.setBaseDir("src/test/resources");
+tomcat.setBaseDir("target/test-classes");
tomcat.setPort(12345);
StandardContext context = new StandardContext();
context.setName("test");
@@ -49,7 +49,7 @@ public class DubboApplicationContextInitializerTest {
@Test
public void testNoListenerInWebXml() throws Exception {
Tomcat tomcat = new Tomcat();
-tomcat.setBaseDir("src/test/resources");
+tomcat.setBaseDir("target/test-classes");
tomcat.setPort(12345);
StandardContext context = new StandardContext();
context.setName("test2");
@@ -69,7 +69,7 @@ public class DubboApplicationContextInitializerTest {
@Test
public void testMetadataComplete() throws Exception {
Tomcat tomcat = new Tomcat();
-tomcat.setBaseDir("src/test/resources");
+tomcat.setBaseDir("target/test-classes");
tomcat.setPort(12345);
StandardContext context = new StandardContext();
context.setName("test3");
[incubator-dubbo] branch master updated (755bbf9 -> 00b718c)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from 755bbf9 rm java 9 and 10 on travis (#2559) add 00b718c code format (#2554) No new revisions were added by this update. Summary of changes: .../dubbo/common/bytecode/ClassGenerator.java | 144 +++-- 1 file changed, 101 insertions(+), 43 deletions(-)
[incubator-dubbo] branch master updated: rm java 9 and 10 on travis (#2559)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 755bbf9 rm java 9 and 10 on travis (#2559) 755bbf9 is described below commit 755bbf92741d4fcfed52bf314a5971a53c46b00c Author: Jerrick Zhu AuthorDate: Wed Sep 26 11:40:00 2018 +0800 rm java 9 and 10 on travis (#2559) --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1a1bf5..3230677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ sudo: false # faster builds jdk: - oraclejdk11 - - oraclejdk10 - - oraclejdk9 - oraclejdk8 cache:
[incubator-dubbo] branch master updated: fix #2533, set timeout to 3000 (#2552)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 4fd352b fix #2533, set timeout to 3000 (#2552)
4fd352b is described below
commit 4fd352b6c3c4027c312b35b7b49ac82bf320f0ad
Author: Jerrick Zhu
AuthorDate: Tue Sep 25 17:46:30 2018 +0800
fix #2533, set timeout to 3000 (#2552)
* fix #2533, set timeout to 3000
* change timeout
---
.../apache/dubbo/generic/GenericServiceTest.java | 2 +-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 24 +++---
.../rpc/protocol/dubbo/ExplicitCallbackTest.java | 5 ++---
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/generic/GenericServiceTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/generic/GenericServiceTest.java
index f31234b..9bc4cdc 100644
---
a/dubbo-compatible/src/test/java/org/apache/dubbo/generic/GenericServiceTest.java
+++
b/dubbo-compatible/src/test/java/org/apache/dubbo/generic/GenericServiceTest.java
@@ -58,7 +58,7 @@ public class GenericServiceTest {
DemoService server = new DemoServiceImpl();
ProxyFactory proxyFactory =
ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
Protocol protocol =
ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
-URL url = URL.valueOf("dubbo://127.0.0.1:5342/" +
DemoService.class.getName() + "?version=1.0.0=true");
+URL url = URL.valueOf("dubbo://127.0.0.1:5342/" +
DemoService.class.getName() + "?version=1.0.0=true$timeout=3000");
Exporter exporter =
protocol.export(proxyFactory.getInvoker(server, DemoService.class, url));
Invoker invoker = protocol.refer(GenericService.class,
url);
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java
index 32dd1f4..7366ed1 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java
@@ -52,7 +52,7 @@ public class DubboProtocolTest {
public void testDemoProtocol() throws Exception {
DemoService service = new DemoServiceImpl();
protocol.export(proxy.getInvoker(service, DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9020/" + DemoService.class.getName() +
"?codec=exchange")));
-service = proxy.getProxy(protocol.refer(DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9020/" + DemoService.class.getName() +
"?codec=exchange")));
+service = proxy.getProxy(protocol.refer(DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9020/" + DemoService.class.getName() +
"?codec=exchange").addParameter("timeout", 3000l)));
assertEquals(service.getSize(new String[]{"", "", ""}), 3);
}
@@ -60,7 +60,7 @@ public class DubboProtocolTest {
public void testDubboProtocol() throws Exception {
DemoService service = new DemoServiceImpl();
protocol.export(proxy.getInvoker(service, DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9010/" + DemoService.class.getName(;
-service = proxy.getProxy(protocol.refer(DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9010/" + DemoService.class.getName(;
+service = proxy.getProxy(protocol.refer(DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9010/" +
DemoService.class.getName()).addParameter("timeout", 3000l)));
assertEquals(service.enumlength(new Type[]{}), Type.Lower);
assertEquals(service.getSize(null), -1);
assertEquals(service.getSize(new String[]{"", "", ""}), 3);
@@ -71,7 +71,7 @@ public class DubboProtocolTest {
assertEquals(set.iterator().next(), "aa");
service.invoke("dubbo://127.0.0.1:9010/" + DemoService.class.getName()
+ "", "invoke");
-service = proxy.getProxy(protocol.refer(DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9010/" + DemoService.class.getName() +
"?client=netty")));
+service = proxy.getProxy(protocol.refer(DemoService.class,
URL.valueOf("dubbo://127.0.0.1:9010/" + DemoService.class.getName() +
"?client=netty").addParameter("timeout", 3000l)));
// test netty client
StringBuffer buf = new StringBuffer();
for (int i = 0; i < 1024 * 32 + 32; i++)
@@ -79,7 +79,7 @@ public class DubboProtoco
[incubator-dubbo-website] branch asf-site updated: build website
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 61d31e2 build website
61d31e2 is described below
commit 61d31e278d42db1c18acb897748d23952bab3094
Author: zhuyong
AuthorDate: Tue Sep 25 17:31:24 2018 +0800
build website
---
build/blog.js | 6 +-
build/blogDetail.js | 6 +-
build/community.js| 6 +-
build/documentation.js| 6 +-
build/home.js | 6 +-
en-us/blog/tracing-with-skywalking.html | 10 +--
en-us/blog/tracing-with-skywalking.json | 2 +-
en-us/docs/admin/ops/skywalking.html | 10 +--
en-us/docs/admin/ops/skywalking.json | 2 +-
zh-cn/blog/dubbo-mesh-in-thinking.html| 115 ++
zh-cn/blog/dubbo-mesh-in-thinking.json| 7 ++
zh-cn/blog/index.html | 2 +-
zh-cn/blog/prepare-an-apache-release.html | 4 +-
zh-cn/blog/prepare-an-apache-release.json | 2 +-
zh-cn/docs/user/best-practice.html| 20 +++---
zh-cn/docs/user/best-practice.json| 5 +-
zh-cn/docs/user/capacity-plan.html| 20 +++---
zh-cn/docs/user/capacity-plan.json| 5 +-
zh-cn/docs/user/dependencies.html | 6 +-
zh-cn/docs/user/dependencies.json | 5 +-
zh-cn/docs/user/maturity.html | 6 +-
zh-cn/docs/user/maturity.json | 5 +-
zh-cn/docs/user/perf-test.html| 10 +--
zh-cn/docs/user/perf-test.json| 5 +-
zh-cn/docs/user/quick-start.html | 6 +-
zh-cn/docs/user/quick-start.json | 5 +-
zh-cn/docs/user/recommend.html| 52 +++---
zh-cn/docs/user/recommend.json| 5 +-
zh-cn/docs/user/rest.html | 8 +--
zh-cn/docs/user/rest.json | 5 +-
30 files changed, 248 insertions(+), 104 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index ed254ae..8e3ac02 100644
--- a/build/blog.js
+++ b/build/blog.js
@@ -1,6 +1,6 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=79) [...]
- Copyright (c) 2016 Jed Watson.
+!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=77) [...]
+ Copyright (c) 2017 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;t
- https://github.com/apache/incubator-skywalking;>Apache
Skywalking(Incubator) is the APM system that it designed for
micro-services architectures and cloud native architecture systems and supports
distribute tracking. https://github.com/apache/incubator-skywalking;>Apache skywalking
(incubator) collects and analyzes the trace data and generates the
relationship between the application and the service metric, Apache skywalking
(incubating) supports multiple la [...]
Currently, Skywalking has supported analysis the operation of distributed
systems from 6 visual dimensions. The overview view is a global view of your
applications and components, including the number of components and
applications, application alarm fluctuations, slow service lists, and
application throughput; The topology shows the topological relationship of the
whole application; The application view represents the upstream and downstream
relationship of the application from singl [...]
@@ -27,10 +27,10 @@
[incubator-dubbo-website] branch asf-site updated: add a new blog about Dubbo Mesh (#156)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new ef35515 add a new blog about Dubbo Mesh (#156) ef35515 is described below commit ef35515e68c2c94b186b39377dcbdfefd3b1c409 Author: Jeff-Lv AuthorDate: Tue Sep 25 17:28:01 2018 +0800 add a new blog about Dubbo Mesh (#156) * add a blog about dubbo service mesh * add the title and rename the dubbo mesh name * improve the format of dubbo mesh blog * change format --- blog/zh-cn/dubbo-mesh-in-thinking.md | 135 +++ img/blog/dubbomesh/1.png | Bin 0 -> 83915 bytes img/blog/dubbomesh/10.png| Bin 0 -> 3913297 bytes img/blog/dubbomesh/2.png | Bin 0 -> 166343 bytes img/blog/dubbomesh/3.png | Bin 0 -> 186170 bytes img/blog/dubbomesh/4.png | Bin 0 -> 110794 bytes img/blog/dubbomesh/5.png | Bin 0 -> 137633 bytes img/blog/dubbomesh/6.png | Bin 0 -> 416234 bytes img/blog/dubbomesh/7.png | Bin 0 -> 193122 bytes img/blog/dubbomesh/8.png | Bin 0 -> 167321 bytes img/blog/dubbomesh/9.png | Bin 0 -> 305526 bytes site_config/blog.js | 7 ++ 12 files changed, 142 insertions(+) diff --git a/blog/zh-cn/dubbo-mesh-in-thinking.md b/blog/zh-cn/dubbo-mesh-in-thinking.md new file mode 100644 index 000..c9d8d16 --- /dev/null +++ b/blog/zh-cn/dubbo-mesh-in-thinking.md @@ -0,0 +1,135 @@ +--- +title: Dubbo在Service Mesh下的思考和方案 +keywords: Dubbo, Service Mesh, Cloud Native +description: Dubbo是实现框架，融入servcemesh理念就是我们今天分享的。 +--- + +# Dubbo在Service Mesh下的思考和方案 + + +## 开头 +Service Mesh这个“热”词是2016年9月被“造”出来，而今年2018年更是被称为service Mesh的关键之年，各家大公司都希望能在这个思潮下领先一步。今天我也分享阿里中间件在这方面的观点，思考和实践。考虑到有些人没了解过Dubbo(集团内以HSF为主)和Servicemesh，先简单介绍下这两个词。Dubbo应该是国内最受欢迎的远程服务框架，在Github上有超过2w的star数，也是阿里分布式架构互联互通的核心所在。跟Dubbo一样，servicemesh也是面向服务互联互通这一问题域，是云原生技术栈的核心之一；大家可以简单理解service mesh就是云原生组织定义的微服务架构解决理念。Dubbo是实现框架，融入servcemesh理念就是我们今天分享的。 + +## 现状和挑战 + + + + +当前Dubbo支撑的阿里分布式应用内支撑万级别的应用数，运行在20多万的服务器实例上，每天调用量是万亿级别，这应该是国内最大的分布式应用集群。 + +挑战主要来自三方面 + +* 首先， 数以万计的应用意味着有以十万级的服务，理顺错综复杂的服务拓扑关系，甚至及时诊断某个异常调用链路，需要考虑海量数据的拉取分析，是非常有挑战的，阿里通过EagleEye鹰眼链路系统提供可观察性和治理能力来解决； +* 第二个挑战是机房级别容灾，阿里的机房是分布在天南海北，大家可以想象横跨数千公里的网络延迟会造成服务互通很大的影响，所以在保证一定恢复时间和一定数据容错的情况下做异地多活是有巨大挑战，阿里通过支持异地多活的单元化架构解决。 +* 第三个挑战是阿里业务众多，尤其像阿里生态中的高德，UC，优酷等所使用的开发语言跟淘系Java是不一样的，比如PHP，C，Nodejs，Dart等，要维护多个版本并保证各版本具有同样的功能是成本比较高的；这个挑战在云原生的新一代理念下更具挑战，毕竟。今天主题跟第三个挑战是息息相关，能解决一定的问题。 + +这里讲个大鱼吃小鱼的故事来简单理解下云原生：软件会吃掉这个世界，也就是信息化不可避免，而开源会吃掉软件，最终云原生会吃掉开源。这正代表了云原生理念的颠覆性，从商业软件到开源到云原生，环环相套，以体系化和层次化的方式推荐各个方面的开源方案和标准，这会极大降低企业级架构服务的技术门槛，是企业信息化之路的一大利好，当然也是进化方向。这个故事跟今天的主题--开发者定义软件未来，是非常契合，也就是说这个趋势至少在企业级软件服务领域正在发生。云原生：Cloud Native is Patterns with A complete and trusted tool kit for modern architectures。 + +Service Mesh的典型方案 +## Service Mesh的典型方案 + + + + +讲完故事，回到servicemesh。 + +传统形态下SDK代表着一个特定语言的库，由应用和微服务框架共处一进程内，在发布升级中共享生命周期。比较典型的代表是Twitter的finagle，Google的stubby/grpc，阿里巴巴的HSF/Dubbo. + +Serviemesh下推荐是右边Sidecar方案，Sidecar方案没有引入新的功能，只是改变了原有功能的位置，以独立的应用来存在，大家可以暂时以nginx来理解其网络代理能力也可以。 + +在这张图中希望大家关注两个信息， 1）所有的sidecar形成逻辑网络被称为数据面，是业务服务的链路中是强依赖节点，承载了业务数据互联互通的基础；传统的ops管控服务被称为控制面，这部分跟传统是大同小异。 2）在sidecar形态下，网络会增加两跳，即应用与sidecar之间，他们之间的数据互通也是基于协议规范。后面会详细讲。 + +## Sidecar模式的优劣 + + + + +接下来从开发和运维两个阶段来分开比较。 + +* 多语言支持方面，既然sidecar是独立应用，用最合适的一种语言开发完成即可，就避免了需要针对不同语言的应用场景做不同的版本开发。当前阿里选择基于C语言的Envoy做二次开发来追求最小的footprint和性能，当然也曾经历一些弯路，比如曾经用Java开发过一个sidecar，但最终由于引入JRE体量大和GC带来的抖动等问题证明不可行。有必要强调的是：这里说的是sidecar自身开发现在避免了多语言多版本的问题，而真要支持任意服务自由采用任意语言实现这一理想，是需要站在从业务到数据面再到业务的整个链路上的数据交互做思考。 +* 性能方面，sidecar情形下由于会增加两跳，这两跳是业务应用与sidecar的两个进程之间的调用，这是本机，即便是经过优化，也是会增加进程切换以及数据转换的开销。经过我们的优化测试，在正常的业务访问下，相比SDK形态下最多增加1毫秒的开销，这在大多数业务情形下是基本无感知无影响。 +* 再看运维阶段的比较，一般SDK形态的服务框架都是只关心开发的诉求，对于如何运维都是不关心，而软件生命周期中运维是最长的，如何从中间件角度解决更多的运维问题是非常有意义的。阿里的中间件经常需要升级，以库的形式升级时就需要业务方应用重新打包，这个推动业务方变更的方式是比较被动，而且周期很长。 +* 当以镜像为基本原子单位进行发布部署时，阿里的中间件SDK体量大概是200兆，需要与业务一起打包，这样在业务应用升级时让分发的包就显得笨重，时效性相比sidecar形态就差一截。 + +稍微总结下，sidecar具有两个明显优势，一个是多语言开发维护成本低 ，另一个是独立升级，当然代价是需要增加一点点的网络延迟。至此大家是不是觉得Sidecar基本完美？ 别着急，需要大家再思考一个问题：SDK模式下中间件组件会随应用一起发布，拥有完全一致的生命周期；而在sidecar模式下，如何管理sidecar的生命周期？这里可以拿无线耳机来举个例子，无线耳机是独立了，但必须独立电源的驱动，所以充电是要的。是的，在大规模的集群中这个点会带来不小的复杂性。 + +## 关键点 + + + + +下面跟大家分享下我们对servicemesh理解的三个关键技术点。分别是sidecar运维，数据面与控制面的集成，协议。 + +* 先说sidecar的运维，这是个难点，也是为什么sidecar方案以前没有被广泛应用的重要原因。前面说sidecar与应用现在成为两个不同的进程，要考虑多个事宜，一是要考虑如何把sidecar与应用部署在一起，二是考虑业务进程或sidecar进程一方需要升级重启时如何协同来保证请求的正常处理或转发，即优雅上下线的问题。这些事宜考虑清楚并解决后，算是具备servicemesh的前提条件
[incubator-dubbo-website] branch asf-site updated: add titles to some docs (#154)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 3da2333 add titles to some docs (#154) 3da2333 is described below commit 3da23334afb334b0ac5fd7d0ebed93cf5734f95b Author: Song Kun AuthorDate: Tue Sep 25 17:25:58 2018 +0800 add titles to some docs (#154) --- docs/zh-cn/user/best-practice.md | 18 - docs/zh-cn/user/capacity-plan.md | 18 - docs/zh-cn/user/dependencies.md | 6 + docs/zh-cn/user/maturity.md | 6 + docs/zh-cn/user/perf-test.md | 14 +++--- docs/zh-cn/user/quick-start.md | 5 docs/zh-cn/user/recommend.md | 56 +--- docs/zh-cn/user/rest.md | 8 +- 8 files changed, 88 insertions(+), 43 deletions(-) diff --git a/docs/zh-cn/user/best-practice.md b/docs/zh-cn/user/best-practice.md index 2d5d5e4..8586b30 100644 --- a/docs/zh-cn/user/best-practice.md +++ b/docs/zh-cn/user/best-practice.md @@ -1,10 +1,16 @@ +--- +title: 服务化最佳实践 +keywords: 分包, 粒度, 版本, 兼容性, 枚举, 序列化，异常 +description: Dubbo 最佳实践 +--- + # 服务化最佳实践 ## 分包 -建议将服务接口，服务模型，服务异常等均放在 API 包中，因为服务模型及异常也是 API 的一部分，同时，这样做也符合分包原则：重用发布等价原则(REP)，共同重用原则(CRP)。 +建议将服务接口、服务模型、服务异常等均放在 API 包中，因为服务模型和异常也是 API 的一部分，这样做也符合分包原则：重用发布等价原则(REP)，共同重用原则(CRP)。 -如果需要，也可以考虑在 API 包中放置一份 spring 的引用配置，这样使用方，只需在 spring 加载过程中引用此配置即可，配置建议放在模块的包目录下，以免冲突，如：`com/alibaba/china/xxx/dubbo-reference.xml`。 +如果需要，也可以考虑在 API 包中放置一份 Spring 的引用配置，这样使用方只需在 Spring 加载过程中引用此配置即可。配置建议放在模块的包目录下，以免冲突，如：`com/alibaba/china/xxx/dubbo-reference.xml`。 ## 粒度 @@ -26,7 +32,7 @@ 服务接口增加方法，或服务模型增加字段，可向后兼容，删除方法或删除字段，将不兼容，枚举类型新增字段也不兼容，需通过变更版本号升级。 -各协议的兼容性不同，参见： [服务协议](./references/protocol/introduction.md) +各协议的兼容性不同，参见：[服务协议](./references/protocol/introduction.md) ## 枚举值 @@ -44,11 +50,11 @@ 服务参数及返回值不建议使用接口，因为数据模型抽象的意义不大，并且序列化需要接口实现类的元信息，并不能起到隐藏实现的意图。 -服务参数及返回值都必需是 byValue 的，而不能是 byReference 的，消费方和提供方的参数或返回值引用并不是同一个，只是值相同，Dubbo 不支持引用远程对象。 +服务参数及返回值都必需是[传值调用](https://en.wikipedia.org/wiki/Evaluation_strategy#Call_by_value)，而不能是[传引用调用](https://en.wikipedia.org/wiki/Evaluation_strategy#Call_by_reference)，消费方和提供方的参数或返回值引用并不是同一个，只是值相同，Dubbo 不支持引用远程对象。 ## 异常 -建议使用异常汇报错误，而不是返回错误码，异常信息能携带更多信息，以及语义更友好。 +建议使用异常汇报错误，而不是返回错误码，异常信息能携带更多信息，并且语义更友好。 如果担心性能问题，在必要时，可以通过 override 掉异常类的 `fillInStackTrace()` 方法为空方法，使其不拷贝栈信息。 @@ -60,4 +66,4 @@ 不要只是因为是 Dubbo 调用，而把调用 `try...catch` 起来。`try...catch` 应该加上合适的回滚边界上。 -对于输入参数的校验逻辑在 Provider 端要有。如有性能上的考虑，服务实现者可以考虑在 API 包上加上服务 Stub 类来完成检验。 \ No newline at end of file +Provider 端需要对输入参数进行校验。如有性能上的考虑，服务实现者可以考虑在 API 包上加上服务 Stub 类来完成检验。 \ No newline at end of file diff --git a/docs/zh-cn/user/capacity-plan.md b/docs/zh-cn/user/capacity-plan.md index 8dd47cc..6ea6bf3 100644 --- a/docs/zh-cn/user/capacity-plan.md +++ b/docs/zh-cn/user/capacity-plan.md @@ -1,3 +1,9 @@ +--- +title: 容量规划 +keywords: 容量规划 +description: Dubbo 应用容量规划参考 +--- + # 容量规划 以下数据供参考： @@ -5,13 +11,13 @@ ## 使用 Dubbo 的会员服务项目 * 每天接收 4 亿次远程调用 -* 使用 12 台网站标配机器提供服务(8 核 CPU, 8G 内存) -* 平均负载在 1 以下(对于 8 核 CPU 负载很低) -* 平均响应时间 2.3 到 2.5 毫秒，网络开销约占 1.5 到 1.6 毫秒(和数据包大小有关) +* 使用 12 台网站标配机器提供服务（8 核 CPU，8G 内存） +* 平均负载在 1 以下（对于 8 核 CPU 负载很低） +* 平均响应时间 2.3 到 2.5 毫秒，网络开销约占 1.5 到 1.6 毫秒（和数据包大小有关） ## 使用 Dubbo 的产品授权服务项目 * 每天接收 3 亿次远程调用 -* 使用 8 台网站标配机器提供服务(8 核CPU,8G 内存) -* 平均负载在 1 以下(对于 8 核 CPU 负载很低) -* 平均响应时间 1.4 到 2.8 毫秒，网络开销约占 1.0 到 1.1 毫秒(和数据包大小有关) \ No newline at end of file +* 使用 8 台网站标配机器提供服务（8 核CPU，8G 内存） +* 平均负载在 1 以下（对于 8 核 CPU 负载很低） +* 平均响应时间 1.4 到 2.8 毫秒，网络开销约占 1.0 到 1.1 毫秒（和数据包大小有关） \ No newline at end of file diff --git a/docs/zh-cn/user/dependencies.md b/docs/zh-cn/user/dependencies.md index 684ae49..a579e6e 100644 --- a/docs/zh-cn/user/dependencies.md +++ b/docs/zh-cn/user/dependencies.md @@ -1,3 +1,9 @@ +--- +title: 依赖 +keywords: 必须依赖, 缺省依赖, 可选依赖 +description: Dubbo 依赖基本介绍 +--- + # 依赖 ## 必须依赖 diff --git a/docs/zh-cn/user/maturity.md b/docs/zh-cn/user/maturity.md index 9d093dd..0e1c45a 100644 --- a/docs/zh-cn/user/maturity.md +++ b/docs/zh-cn/user/maturity.md @@ -1,3 +1,9 @@ +--- +title: 成熟度 +keywords: 功能成熟度, 策略成熟度 +description: 介绍 Dubbo 各个功能、策略的成熟度 +--- + # 成熟度 ## 功能成熟度 diff --git a/docs/zh-cn/user/perf-test.md b/docs/zh-cn/user/perf-test.md index 3a50758..c9908de 100644 --- a/docs/zh-cn/user/perf-test.md +++ b/docs/zh-cn/user/perf-test.md @@ -1,11 +1,17 @@ +--- +title: 性能测试报告 +keywords: 性能测试 +description: Dubbo 2.0 性能测试报告 +--- + # 性能测试报告 ## 测试说明 -0. 本次性能测试，测试了 dubbo 2.0 所有支持的协议在不同大小和数据类型下的表现，并与 dubbo 1.0 进行了对比。 -1. 整体性能相比 1.0 有了提升，平均提升 10%，使用 dubbo 2.0 新增的 dubbo 序列化还能获得 10%~50% 的性能提升，详见下面的性能数据。 -2. 稳定性测试中由于将底层通信框架从 mina 换成 netty，old 区对象的增长大大减少，50 小时运行，增长不到 200m，无 fullgc。 -3. 存在的问题：在 50k 数据的时候 2.0 性能不如 1.0，怀疑可能是缓冲区设置的问题，下版本会进一步确认。 +1. 本次性能测试，测试了 dubbo 2.0 所有支持的协议在不同大小和数据类型下的表现，并与 dubbo 1.0 进行了对比。 +2. 整体性能相比 1.0 有了提升，平均提升 10
[incubator-dubbo] branch master updated: fix #2532, change different port (#2551)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 0d20194 fix #2532, change different port (#2551)
0d20194 is described below
commit 0d20194cadada4f131395e9d0fff0a89ca2fe3bc
Author: Jerrick Zhu
AuthorDate: Tue Sep 25 15:08:09 2018 +0800
fix #2532, change different port (#2551)
---
.../dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
index 1de..a247170 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
@@ -82,7 +82,7 @@ public class ListTelnetHandlerTest {
public void testListDetailService() throws RemotingException {
mockInvoker = mock(Invoker.class);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20885/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:30005/demo"));
given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"));
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService");
@@ -97,7 +97,7 @@ public class ListTelnetHandlerTest {
public void testListService() throws RemotingException {
mockInvoker = mock(Invoker.class);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20885/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:30006/demo"));
given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"));
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService");
@@ -112,7 +112,7 @@ public class ListTelnetHandlerTest {
public void testList() throws RemotingException {
mockInvoker = mock(Invoker.class);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20885/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:30007/demo"));
given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"));
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn(null);
@@ -143,7 +143,7 @@ public class ListTelnetHandlerTest {
public void testListDefault() throws RemotingException {
mockInvoker = mock(Invoker.class);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20885/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:30008/demo"));
given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"));
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService");
[incubator-dubbo] branch master updated: issue#2516: Remove getSpringContext() from org.apache.dubbo.config.spring.ServiceBean (#2517)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 84410f7 issue#2516: Remove getSpringContext() from
org.apache.dubbo.config.spring.ServiceBean (#2517)
84410f7 is described below
commit 84410f79602a561b26957dc5149f599efd44aa2b
Author: Ian Luo
AuthorDate: Fri Sep 21 17:59:18 2018 +0800
issue#2516: Remove getSpringContext() from
org.apache.dubbo.config.spring.ServiceBean (#2517)
---
.../java/org/apache/dubbo/config/spring/ServiceBean.java| 7 ---
.../config/spring/extension/SpringExtensionFactory.java | 4
.../dubbo/config/spring/status/DataSourceStatusChecker.java | 12 ++--
.../dubbo/config/spring/status/SpringStatusChecker.java | 12 ++--
.../config/spring/status/DataSourceStatusCheckerTest.java | 11 ++-
.../dubbo/config/spring/status/SpringStatusCheckerTest.java | 13 -
6 files changed, 46 insertions(+), 13 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
index acdb9cd..1d5ff8e 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
@@ -50,8 +50,6 @@ public class ServiceBean extends ServiceConfig
implements InitializingBean
private static final long serialVersionUID = 213195494150089726L;
-private static transient ApplicationContext SPRING_CONTEXT;
-
private final transient Service service;
private transient ApplicationContext applicationContext;
@@ -70,15 +68,10 @@ public class ServiceBean extends ServiceConfig
implements InitializingBean
this.service = service;
}
-public static ApplicationContext getSpringContext() {
-return SPRING_CONTEXT;
-}
-
@Override
public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
SpringExtensionFactory.addApplicationContext(applicationContext);
-SPRING_CONTEXT = applicationContext;
try {
Method method =
applicationContext.getClass().getMethod("addApplicationListener",
ApplicationListener.class); // backward compatibility to spring 2.0.1
method.invoke(applicationContext, this);
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactory.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactory.java
index 11dd6a6..56862f3 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactory.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactory.java
@@ -42,6 +42,10 @@ public class SpringExtensionFactory implements
ExtensionFactory {
contexts.remove(context);
}
+public static Set getContexts() {
+return contexts;
+}
+
// currently for test purpose
public static void clearContexts() {
contexts.clear();
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/DataSourceStatusChecker.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/DataSourceStatusChecker.java
index 4766b6b..5a934be 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/DataSourceStatusChecker.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/DataSourceStatusChecker.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.status.Status;
import org.apache.dubbo.common.status.StatusChecker;
-import org.apache.dubbo.config.spring.ServiceBean;
+import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
import org.springframework.context.ApplicationContext;
import javax.sql.DataSource;
@@ -41,10 +41,18 @@ public class DataSourceStatusChecker implements
StatusChecker {
@Override
@SuppressWarnings("unchecked")
public Status check() {
-ApplicationContext context = ServiceBean.getSpringContext();
+ApplicationContext context = null;
+for (ApplicationContext c : SpringExtensionFactory.getContexts()) {
+if (c != null) {
+context = c;
+break;
+}
+}
+
if (context == null) {
return new Status(
[incubator-dubbo] branch master updated: Support for caching null values (#2480)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new e6b0bc8 Support for caching null values (#2480)
e6b0bc8 is described below
commit e6b0bc8a856abd7f2d7a2e0f06ccc78dc90e2e0a
Author: 54hechuan <43158596+54hech...@users.noreply.github.com>
AuthorDate: Fri Sep 21 10:35:53 2018 +0800
Support for caching null values (#2480)
---
.../org/apache/dubbo/cache/filter/CacheFilter.java | 26 +++---
.../apache/dubbo/cache/filter/CacheFilterTest.java | 4 ++--
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git
a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
index f7e362b..62a739d 100644
---
a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
+++
b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
@@ -16,6 +16,8 @@
*/
package org.apache.dubbo.cache.filter;
+import java.io.Serializable;
+
import org.apache.dubbo.cache.Cache;
import org.apache.dubbo.cache.CacheFactory;
import org.apache.dubbo.common.Constants;
@@ -49,16 +51,34 @@ public class CacheFilter implements Filter {
String key =
StringUtils.toArgumentString(invocation.getArguments());
Object value = cache.get(key);
if (value != null) {
-return new RpcResult(value);
+if (value instanceof ValueWrapper) {
+return new RpcResult(((ValueWrapper)value).get());
+} else {
+return new RpcResult(value);
+}
}
Result result = invoker.invoke(invocation);
-if (!result.hasException() && result.getValue() != null) {
-cache.put(key, result.getValue());
+if (!result.hasException()) {
+cache.put(key, new ValueWrapper(result.getValue()));
}
return result;
}
}
return invoker.invoke(invocation);
}
+
+static class ValueWrapper implements Serializable{
+
+private static final long serialVersionUID = -1777337318019193256L;
+private final Object value;
+
+public ValueWrapper(Object value){
+this.value = value;
+}
+
+public Object get() {
+return this.value;
+}
+}
}
diff --git
a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java
b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java
index c51bce7..7d571dd 100644
---
a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java
+++
b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java
@@ -134,7 +134,7 @@ public class CacheFilterTest {
cacheFilter.invoke(invoker4, invocation);
RpcResult rpcResult1 = (RpcResult) cacheFilter.invoke(invoker1,
invocation);
RpcResult rpcResult2 = (RpcResult) cacheFilter.invoke(invoker2,
invocation);
-Assert.assertEquals(rpcResult1.getValue(), "value1");
-Assert.assertEquals(rpcResult2.getValue(), "value1");
+Assert.assertEquals(rpcResult1.getValue(), null);
+Assert.assertEquals(rpcResult2.getValue(), null);
}
}
[incubator-dubbo] branch master updated: Optimization unnecessary unboxing 'b.booleanValue()' and Remove invalid throws java.lang.Exception (#2529)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 4776efb Optimization unnecessary unboxing 'b.booleanValue()' and
Remove invalid throws java.lang.Exception (#2529)
4776efb is described below
commit 4776efba344514111a763ea871cd8149ca51a9ae
Author: Alex
AuthorDate: Fri Sep 21 10:13:36 2018 +0800
Optimization unnecessary unboxing 'b.booleanValue()' and Remove invalid
throws java.lang.Exception (#2529)
* Condition applicationContext != null is always true
* optimization of code
---
.../apache/dubbo/config/spring/ReferenceBean.java| 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
index e6a2a1f..bd6195c 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
@@ -38,8 +38,6 @@ import java.util.Map;
/**
* ReferenceFactoryBean
- *
- * @export
*/
public class ReferenceBean extends ReferenceConfig implements
FactoryBean, ApplicationContextAware, InitializingBean, DisposableBean {
@@ -62,7 +60,7 @@ public class ReferenceBean extends ReferenceConfig
implements FactoryBean,
}
@Override
-public Object getObject() throws Exception {
+public Object getObject() {
return get();
}
@@ -85,7 +83,7 @@ public class ReferenceBean extends ReferenceConfig
implements FactoryBean,
if (consumerConfigMap != null && consumerConfigMap.size() > 0) {
ConsumerConfig consumerConfig = null;
for (ConsumerConfig config : consumerConfigMap.values()) {
-if (config.isDefault() == null ||
config.isDefault().booleanValue()) {
+if (config.isDefault() == null || config.isDefault()) {
if (consumerConfig != null) {
throw new IllegalStateException("Duplicate
consumer configs: " + consumerConfig + " and " + config);
}
@@ -103,7 +101,7 @@ public class ReferenceBean extends ReferenceConfig
implements FactoryBean,
if (applicationConfigMap != null && applicationConfigMap.size() >
0) {
ApplicationConfig applicationConfig = null;
for (ApplicationConfig config : applicationConfigMap.values())
{
-if (config.isDefault() == null ||
config.isDefault().booleanValue()) {
+if (config.isDefault() == null || config.isDefault()) {
if (applicationConfig != null) {
throw new IllegalStateException("Duplicate
application configs: " + applicationConfig + " and " + config);
}
@@ -121,7 +119,7 @@ public class ReferenceBean extends ReferenceConfig
implements FactoryBean,
if (moduleConfigMap != null && moduleConfigMap.size() > 0) {
ModuleConfig moduleConfig = null;
for (ModuleConfig config : moduleConfigMap.values()) {
-if (config.isDefault() == null ||
config.isDefault().booleanValue()) {
+if (config.isDefault() == null || config.isDefault()) {
if (moduleConfig != null) {
throw new IllegalStateException("Duplicate module
configs: " + moduleConfig + " and " + config);
}
@@ -138,13 +136,13 @@ public class ReferenceBean extends ReferenceConfig
implements FactoryBean,
&& (getApplication() == null ||
getApplication().getRegistries() == null ||
getApplication().getRegistries().isEmpty())) {
Map registryConfigMap = applicationContext
== null ? null :
BeanFactoryUtils.beansOfTypeIncludingAncestors(applicationContext,
RegistryConfig.class, false, false);
if (registryConfigMap != null && registryConfigMap.size() > 0) {
-List registryConfigs = new
ArrayList();
+List registryConfigs = new ArrayList<>();
for (RegistryConfig config : registryConfigMap.values()) {
-if (config.isDefault() == null ||
config.isDefault().booleanValue()) {
+if (config.isDefault() == null || config.isDefault()) {
registryConfigs.add(config);
}
}
-if (registryConfigs != null && !registryCo
[incubator-dubbo] branch master updated: code format (#2528)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 18dee4e code format (#2528)
18dee4e is described below
commit 18dee4e44df7a02cacb3070fda72e22d7078f910
Author: Lei Jiang
AuthorDate: Fri Sep 21 08:57:27 2018 +0800
code format (#2528)
---
.../rpc/cluster/directory/AbstractDirectory.java | 3 +-
.../rpc/cluster/directory/StaticDirectory.java | 3 +-
.../cluster/loadbalance/AbstractLoadBalance.java | 6 +-
.../loadbalance/LeastActiveLoadBalance.java| 3 +-
.../rpc/cluster/router/MockInvokersSelector.java | 4 +-
.../cluster/router/condition/ConditionRouter.java | 9 ++-
.../cluster/support/AbstractClusterInvoker.java| 6 +-
.../validation/support/jvalidation/JValidator.java | 23
.../java/org/apache/dubbo/metrics/MetricName.java | 66 ++
.../org/apache/dubbo/monitor/dubbo/Statistics.java | 51 +++--
.../registry/integration/RegistryDirectory.java| 9 ++-
.../dubbo/registry/support/AbstractRegistry.java | 4 +-
.../apache/dubbo/registry/dubbo/DubboRegistry.java | 3 +-
.../apache/dubbo/registry/redis/RedisRegistry.java | 24 +---
.../apache/dubbo/remoting/exchange/Request.java| 4 +-
.../support/header/HeaderExchangeChannel.java | 20 +--
.../support/header/HeaderExchangeServer.java | 3 +-
.../remoting/transport/grizzly/GrizzlyClient.java | 3 +-
.../dubbo/remoting/transport/mina/MinaClient.java | 3 +-
.../remoting/transport/netty4/NettyChannel.java| 20 +--
.../serialize/java/CompactedObjectInputStream.java | 3 +-
21 files changed, 180 insertions(+), 90 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
index 52f5811..0cea0b8 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
@@ -59,8 +59,9 @@ public abstract class AbstractDirectory implements
Directory {
}
public AbstractDirectory(URL url, URL consumerUrl, List routers) {
-if (url == null)
+if (url == null) {
throw new IllegalArgumentException("url == null");
+}
this.url = url;
this.consumerUrl = consumerUrl;
setRouters(routers);
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
index 47a0d12..cc6bab3 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
@@ -46,8 +46,9 @@ public class StaticDirectory extends AbstractDirectory {
public StaticDirectory(URL url, List> invokers, List
routers) {
super(url == null && invokers != null && !invokers.isEmpty() ?
invokers.get(0).getUrl() : url, routers);
-if (invokers == null || invokers.isEmpty())
+if (invokers == null || invokers.isEmpty()) {
throw new IllegalArgumentException("invokers == null");
+}
this.invokers = invokers;
}
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
index ff94b3c..7a8d0aa 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
@@ -37,10 +37,12 @@ public abstract class AbstractLoadBalance implements
LoadBalance {
@Override
public Invoker select(List> invokers, URL url,
Invocation invocation) {
-if (invokers == null || invokers.isEmpty())
+if (invokers == null || invokers.isEmpty()) {
return null;
-if (invokers.size() == 1)
+}
+if (invokers.size() == 1) {
return invokers.get(0);
+}
return doSelect(invokers, url, invocation);
}
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
index 956ff77..d0ea49c 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadB
[incubator-dubbo] branch master updated: set timeout to 3000 (#2536)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new b411a77 set timeout to 3000 (#2536)
b411a77 is described below
commit b411a777b3d3111dcdea0cd6d88151b3358665b8
Author: Jerrick Zhu
AuthorDate: Thu Sep 20 11:32:08 2018 +0800
set timeout to 3000 (#2536)
---
.../java/org/apache/remoting/transport/mina/MinaClientToServerTest.java | 2 +-
.../apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/MinaClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/MinaClientToServerTest.java
index d832367..433a4a8 100644
---
a/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/MinaClientToServerTest.java
+++
b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/MinaClientToServerTest.java
@@ -35,7 +35,7 @@ public class MinaClientToServerTest extends
ClientToServerTest {
@Override
protected ExchangeChannel newClient(int port) throws RemotingException {
-return Exchangers.connect(URL.valueOf("exchange://localhost:" + port +
"?client=mina"));
+return Exchangers.connect(URL.valueOf("exchange://localhost:" + port +
"?client=mina=3000"));
}
}
\ No newline at end of file
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
index 2d1065d..af20985 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
@@ -33,7 +33,7 @@ public class NettyClientToServerTest extends
ClientToServerTest {
}
protected ExchangeChannel newClient(int port) throws RemotingException {
-return Exchangers.connect(URL.valueOf("exchange://localhost:" + port +
"?client=netty4"));
+return Exchangers.connect(URL.valueOf("exchange://localhost:" + port +
"?client=netty4=3000"));
}
}
\ No newline at end of file
[incubator-dubbo-website] branch asf-site updated: optimize apache release flow
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 3a6bf3a optimize apache release flow
3a6bf3a is described below
commit 3a6bf3a9ca9f4865a6f432e5fb2d767787bc822e
Author: zhuyong
AuthorDate: Thu Sep 20 09:46:04 2018 +0800
optimize apache release flow
---
blog/zh-cn/prepare-an-apache-release.md | 24 +---
zh-cn/blog/dubbo-meetup-chengdu.html | 4 ++--
zh-cn/blog/dubbo-meetup-chengdu.json | 2 +-
zh-cn/blog/prepare-an-apache-release.html | 24
zh-cn/blog/prepare-an-apache-release.json | 2 +-
5 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/blog/zh-cn/prepare-an-apache-release.md
b/blog/zh-cn/prepare-an-apache-release.md
index 0faaf03..4458eaa 100644
--- a/blog/zh-cn/prepare-an-apache-release.md
+++ b/blog/zh-cn/prepare-an-apache-release.md
@@ -33,7 +33,7 @@ keywords: Dubbo, Apache, Release
- 根据提示，生成key
```shell
-$ gpg2 --full-gen-key
+$ gpg --full-gen-key
gpg (GnuPG) 2.0.12; Copyright (C) 2009 Free Software Foundation, Inc.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
@@ -93,9 +93,11 @@ keywords: Dubbo, Apache, Release
default-key 28681CB1
```
+PS:
最新版本经过实测，本地没有gpg.conf这个文件，因此如果在执行过程中遇到签名失败，可以参考这个文章：https://blog.csdn.net/wenbo20182/article/details/72850810
或 https://d.sb/2016/11/gpg-inappropriate-ioctl-for-device-errors
+
3. 设置Apache中央仓库
- - Dubbo项目的父pom为apache pom
+ - Dubbo项目的父pom为apache pom(2.6.x发布版本不需要此操作)
```xml
@@ -141,7 +143,7 @@ keywords: Dubbo, Apache, Release
1.
从主干分支拉取新分支作为发布分支，如现在要发布${release_version}版本，则从2.6.x拉出新分支${release_version}-release，此后${release_version}
Release Candidates涉及的修改及打标签等都在${release_version}-release分支进行，最终发布完成后合入主干分支。
-2. 首先，在${release_version}-release分支验证maven组件打包、source源码打包、签名等是否都正常工作
+2.
首先，在${release_version}-release分支验证maven组件打包、source源码打包、签名等是否都正常工作(2.6.x记得要使用1.7或以下版本JDK进行编译打包)
```shell
$ mvn clean install -Papache-release
@@ -154,14 +156,14 @@ keywords: Dubbo, Apache, Release
- 先用dryRun验证是否ok
```shell
-$ mvn release:prepare -Papache-release -Darguments="-DskipTests"
-DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID -DdryRun=true
+$ mvn release:prepare -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID -DdryRun=true
```
- 验证通过后，执行release:prepare
```shell
$ mvn release:clean
-$ mvn release:prepare -Papache-release -Darguments="-DskipTests"
-DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
+$ mvn release:prepare -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
# 执行完成后：1.生成source.zip包； 2.打出tag，并推送到github仓库；
3.分支版本自动升级为${release_version}-SNAPSHOT，并将修改推送到github仓库
```
@@ -169,9 +171,11 @@ keywords: Dubbo, Apache, Release
```shell
$ mvn -Prelease release:perform -Darguments="-DskipTests"
-DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
-# 所有artifacts发布到配置的远程maven中央仓库，处于staging状态
+#
所有artifacts发布到配置的远程maven中央仓库，处于staging状态，这里一定要去仓库检查一下是否完整发布上去，尤其是dubbo-parent模块
```
+PS:
执行release插件时，需要输入github的密码，这里不是输入web页面的登录密码，而是一个token，详见这里：https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/
+
## 准备Apache发布
1. 准备svn本机环境（Apache使用svn托管项目的发布内容）
@@ -190,9 +194,9 @@ keywords: Dubbo, Apache, Release
$ mkdir ${release_version}
```
-4. 添加public
key到[KEYS](https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS)文件。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性
+4. 添加public
key到[KEYS](https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS)文件并提交到SVN仓库（第一次做发布的人需要做这个操作，具体操作参考KEYS文件里的说明）。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性
-5. 拷贝Dubbo根目录下的source.zip包到svn本地仓库dubbo/${release_version}
+5. 拷贝distribution/target下的source相关的包到svn本地仓库dubbo/${release_version}
6. 生成sha512签名
@@ -203,9 +207,7 @@ keywords: Dubbo, Apache, Release
7. 如果有binary release要同时发布
```shell
- # 到dubbo项目distribution的module下，执行：
- $ mvn install
- #
target目录下，拷贝bin-release.zip以及bin-release.zip.asc到svn本地仓库dubbo/${release_version}
+ #
distribution/target目录下，拷贝bin-release.zip以及bin-release.zip.asc到svn本地仓库dubbo/${release_version}
# 参考第6步，生成sha512签名
```
diff --git a/zh-cn/blog/dubbo-meetup-chengdu.html
b/zh-cn/blog/dubbo-meetup-chengdu.html
index 732bacb..9e8d4fb 100644
--- a/zh-cn/blog/dubbo-meetup-chengdu.html
+++ b/zh-cn/blog/dubbo-meetup-chengdu.html
@@ -12,12 +12,12 @@
-
用户深度沟通交流
8.26上午10:00-12:00，邀请到货车帮，云图金控，前BBD，飞鱼星四家公司开源爱好者及重度用户参与面对面交流；据参与者反馈，解答了对Dubbo的诸多疑惑，特别是如何参与贡献社区，以及捐献代码所带来的价值点。希望后面可以更加深入参与Dubbo社区及活动中。
meetup活动信息
-现场依旧爆满，总报名人数976，现
[incubator-dubbo] branch master updated: #2507: Dubbo 's ExtensionLoader may be can't find custom Extension (#2518)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 7d3a6ab #2507: Dubbo 's ExtensionLoader may be can't find custom
Extension (#2518)
7d3a6ab is described below
commit 7d3a6ab0c19b8182d8a8b0d907d0ed758e65c2a7
Author: Ian Luo
AuthorDate: Wed Sep 19 09:04:00 2018 +0800
#2507: Dubbo 's ExtensionLoader may be can't find custom Extension (#2518)
* update README
* #2507: Dubbo 's ExtensionLoader may be can't find custom Extension
---
.../apache/dubbo/common/extension/ExtensionLoader.java | 5 +++--
.../java/org/apache/dubbo/common/utils/ClassHelper.java | 16 +---
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
index 666abfb..fcbb292 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.support.ActivateComparator;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.ClassHelper;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.common.utils.ConfigUtils;
import org.apache.dubbo.common.utils.Holder;
@@ -123,7 +124,7 @@ public class ExtensionLoader {
}
private static ClassLoader findClassLoader() {
-return ExtensionLoader.class.getClassLoader();
+return ClassHelper.getClassLoader(ExtensionLoader.class);
}
public String getExtensionName(T extensionInstance) {
@@ -970,4 +971,4 @@ public class ExtensionLoader {
return this.getClass().getName() + "[" + type.getName() + "]";
}
-}
\ No newline at end of file
+}
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java
index e38752f..d2b3434 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java
@@ -85,10 +85,10 @@ public class ClassHelper {
/**
* get class loader
*
- * @param cls
+ * @param clazz
* @return class loader
*/
-public static ClassLoader getClassLoader(Class cls) {
+public static ClassLoader getClassLoader(Class clazz) {
ClassLoader cl = null;
try {
cl = Thread.currentThread().getContextClassLoader();
@@ -97,8 +97,18 @@ public class ClassHelper {
}
if (cl == null) {
// No thread context class loader -> use class loader of this
class.
-cl = cls.getClassLoader();
+cl = clazz.getClassLoader();
+if (cl == null) {
+// getClassLoader() returning null indicates the bootstrap
ClassLoader
+try {
+cl = ClassLoader.getSystemClassLoader();
+}
+catch (Throwable ex) {
+// Cannot access system ClassLoader - oh well, maybe the
caller can live with null...
+}
+}
}
+
return cl;
}
[incubator-dubbo] branch 2.6.4-release deleted (was d7af5d9)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was d7af5d9 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard d7af5d9 [maven-release-plugin] prepare for next development iteration
svn commit: r29461 - /dev/incubator/dubbo/2.6.4/
Author: jerrick Date: Tue Sep 18 01:34:55 2018 New Revision: 29461 Log: prepare for 2.6.4 RC1 Added: dev/incubator/dubbo/2.6.4/ dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip (with props) dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip (with props) dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.sha512 Added: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip == Binary file - no diff available. Propchange: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc == --- dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc (added) +++ dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.asc Tue Sep 18 01:34:55 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEER7bUsvMa9+xqqNFOeVX7bR3SHPcFAlufePAACgkQeVX7bR3S +HPfb6w//exjvxVF/Al4uAhuIdQX9Q6UPRoT1+DHsdy5i6f938OCG98sfIn8Bt1o+ +U7Ztl8hupRBBwnp3ihJBFbY5t4Ua9a3IMRaplZhOTHFzGmSI1XVTdkQfuDCVFsVL +/5P6IYPhrvz2pfLE/tDZ+WGfPotI3dTiMdbpy07U2YUPVFy9uajQJXGhL4nBYRzq +W0EFTzJwZ0EKgf2GmW65mGadB68cF+XTduZ4FKLdgUNvguuJkXWXaDmCAqA/aok2 +/smYGgrTw48QyMrpI4ZrsM27odijmSqXhRBiR3WLb+EfcUgHHwuj3n+AtSrEDKvK +x80ZnDDqwIacnKlS5/BVWTmCBoR3163EiVQbdZEjkEyUIfuLxCjdFM+HSd220g1v +lwptWU1iMkZ12RjpnCs4lxQb+1L3VLwCaZld3Of7t+jd30d79G/svnKmAl6Z6Eyz +QLpBeNkZj0xeCr2huDMcqWzoKQKoHuWjPU95KgrV50FdIHQn9Z3P+k+j+JynBhck +HWgq5/ctOZKnEZnJxp1NJx8JpP+B940Cz4ls3bgujvC4D9jDm0KLgywNQd09pweW +DkhuZF/TnmVO0Q/a9pgTCDEd0Q1JPJZk8kXjy3BxpffD2IiJIf+7MKZoryG8SchE +OXeN6BLv7w4hLNAzLB7rSOPGD9gX6dzq+n3tvWje8gLGEfwFmDQ= +=xHuH +-END PGP SIGNATURE- Added: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 == --- dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 (added) +++ dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-bin-release.zip.sha512 Tue Sep 18 01:34:55 2018 @@ -0,0 +1 @@ +23311aa4264ce5ad2af55851688167e61b5ab7635f8f9b7f669ef2d5aa15492a8361c257951256a2354b3c93aeb09f7a9d1703f186a7be5418ed5d5c904ed752 apache-dubbo-incubating-2.6.4-bin-release.zip Added: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc == --- dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc (added) +++ dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.asc Tue Sep 18 01:34:55 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEER7bUsvMa9+xqqNFOeVX7bR3SHPcFAlufePEACgkQeVX7bR3S +HPcWYA/+P+ksT/THkcrFdPjlwn3V8ysMpK3tFMJErqnj8bKqpNIDniG3cp3jpt8g +DjPzQoMdr1JOPrnCRckqngv1BQ6a7cTIkYxb09BFj1IRiRlXM2hfOwMesBE6QJQ4 +PU771vpIF1xGHr4upxoGpVR++dRSOW4YH7UouZFuGQY8usobMtKG0HUihDjrAz3d +qChG3A7pvnCXoVgqefmjxSNteO96fQELNtIRFt+sJXOeyTs7dJmXG1wSwOxmcjem +c1TE+1l+rnOnvIGrWcyBiKuhRo1VgPZbW3SuP7KUgQNyf257gpS1YK4qKhJMZ2k1 +BFR47wtnrL1+OXg/YzokK/fVXfIliqsWWK2D5DNMWJa6uXtJGkNMmLg41bohjrLL +XD60EXeOxSZagIkWwvEL5PTdbo7yi3eihkPggO65cfmN3xlK+N4j+Wb2pMRmvlX1 +KTtY4CEe8T+tZqnKnryPUdo8zUHXBgwkRwGWgGYZwi8nrz0L9JdAl6BfZHKc67RA +4Vu07KN4/si0undAc1dqfk6sR8n3iW5mFCPdBIUkJLLYZQc10Ol5pbVi5P+zpBeu +MFAiu7CmUotMkczeMXEQaJOhem1i96RIKEEZmW5dcXtEO/KCsXEXjk8cKY3pK93h +iWmvsW930GngezdWNv/aIq5ikCwhUMUnuxi579izJFMOJwPBJQQ= +=zsMu +-END PGP SIGNATURE- Added: dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.sha512 == --- dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.sha512 (added) +++ dev/incubator/dubbo/2.6.4/apache-dubbo-incubating-2.6.4-source-release.zip.sha512 Tue Sep 18 01:34:55 2018 @@ -0,0 +1
svn commit: r29460 - /dev/incubator/dubbo/KEYS
Author: jerrick Date: Tue Sep 18 01:28:26 2018 New Revision: 29460 Log: prepare for 2.6.4 RC1 Modified: dev/incubator/dubbo/KEYS Modified: dev/incubator/dubbo/KEYS == --- dev/incubator/dubbo/KEYS (original) +++ dev/incubator/dubbo/KEYS Tue Sep 18 01:28:26 2018 @@ -65,4 +65,62 @@ yqqO3+xqS5kYRTcqsrNxFZvwodSaxBuT5Ab2DMqq 4OkDjNcu+yzG4b3QchABQyIVXMPoyXtURd5LWv62d4ZkPNwc8vhQPOEkK+5UwBSGDtWwlrii cilA/EthmgnB5gV1vAQgpx5vNpCQuKpdMlLsrk7EV1ysNubPUoo7cEeSyZzcPKA= =azvM --END PGP PUBLIC KEY BLOCK- \ No newline at end of file +-END PGP PUBLIC KEY BLOCK-pub rsa4096 2018-09-13 [SC] + 47B6D4B2F31AF7EC6AA8D14E7955FB6D1DD21CF7 +uid [ ç»å¯¹ ] jerrick (CODE SIGNING KEY) +sig 37955FB6D1DD21CF7 2018-09-13 jerrick (CODE SIGNING KEY) +sub rsa4096 2018-09-13 [E] +sig 7955FB6D1DD21CF7 2018-09-13 jerrick (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFuaBxsBEADDbjm/queXcN5mkFgJdye2zA4H8tM8GXSiEHgY1c+ldOauUIeO +uLTBa0P9eX6j6Hp6EoAZxIHQ1pZJqc3C53+yD8v55q1gkDhs9gUAVXez4ZokxNo0 +ryfLeC2hUvypvP8As5jgPWWoX+NCoQSAz3OkQSIlYHyrtZw9+8t7jcndCTIXx9yy +riOz8NJ1220nw+oBC7UBqhtFEGPquJvrDz6tI88yFMRoQSZaA7KbNlhuTc6SDFeI +AR6MNRaQFgMz5m2RTIdU9ts5wdfcTa1ur6VtD9ww4BEqhUjtJESaKDXq915UR0nn +gE8TSJqiCezCvqqqAi+6YmrnfyTI7ZKLjw5Mefi8IEMuilbd+mRlKT1Nzt9PiOM3 +d1igb4xsD3U4iPKH25i2Jk4ssKxoIFdqcotkGUI+DhIqpN+CtArDZ19oIuyXev1U +mGsle0aU/PIbCYI6J73PJLFz8oEhqHTsczeOMznagLjLjcNHiCF+3zRzG2fA6/tA +let/WRGfWW9GWmgac7YC9BAJRJ9RUA4taYP03irqDAYsLgAiGYLKUabENmVxNBL3 +ncauY/AMkBt28p2oUID8enCiP+uf/aEOoiWpmi9tu2c9A31e0pO/tb00h5h3Djvw +kLh1JbfDCVZ/V4R274fuvtecSe5b3S7wgx4UKDSIXRptdbdqYhFN7ruU9QARAQAB +tC9qZXJyaWNrIChDT0RFIFNJR05JTkcgS0VZKSA8amVycmlja0BhcGFjaGUub3Jn +PokCTgQTAQgAOBYhBEe21LLzGvfsaqjRTnlV+20d0hz3BQJbmgcbAhsDBQsJCAcC +BhUKCQgLAgQWAgMBAh4BAheAAAoJEHlV+20d0hz3uNsQALtqj92lp5LOe0DaujIt +o4X16vNmjIt8VNFfObi5hiwIfFQUTzbDsC+ZwVcgn8OXuXtvIGE+c9sG9jt6oVTB +nfXMGWgzsmA5Fr5LJhaQw95kxEMxUvAhLjphlYdULJUJ/IK16iIiJVQEBN5a9Fzg +wIv3Shk7/So7CXCm1gIOFs/QYU564sC1efPIegWKRLgUqC5NseZpYMfskYwW2iM/ +wRBwrXbB9PT5PAkU7db+xb9MhDCa2M56aiFGwypkveoty482DSeQBQAW+7DCTTVS +hxJWbDK9lqheF+7iJw64elgGb1kU5jvgBMiXK6P8d/soKW5QHrZ4lp7DmKiLF1df +Hj/J/LCXvptuXNlkskKvBbLjQZvomebetiSKYx/EYhvAs2ZQGBEl2lcMoJGQTkHD +f6Y+/IlsNJHA4wKFp1eTHgVHMrub7dhPWenPLHf20faE4JuYzBc2J1BcVXrUpheX +7oNN/g+6HHW6YJgFZulQ5kGWGha8kpM0g1jlSRirJ2gJxjMtVuaKFMBL0CMINkxY +8ddlj8yAd1Zm9QtQ+NsvEvaXTAvV0jzv1wuKwhHiacG+pqTHocCEgX3G9M544bEA +5ouafJ6UdCuxfmVZDd6n+DMjoETdCzulebWDm3fhf4A0pXPXVrBaPX7eZCTe2ssT +L8H4QOHcv10OpyiM5s6VLXwmuQINBFuaBxsBEACotaXXAdxCr1xoJZyi9tViEEDl +JTQxedgpDjvwFDLS6NQqrr+Ivz754mnTE5DxfFwBKR8DqSUzHbDW9k6Rd+6MYMQD +ibpZhGQtHbDaXuPimC79Q2fINPg5nhOyLIcsPVfAyN1F6NlGIydk9PdcGLsgj74J +CmzIgXOHs7h7ka4/jPbY6QyOnCm942TTB/IikplA3QnSo7uV0kjQIMj02mJn/tlw +sOD0NQ8OmyqdL0RdM4OCrEd3eCLwAxla53HXjiGg+6AojZqlNd/OlaLfPW7fQLiG +WOHJZYomJi7UBHo+eRVEYRJ1mbhjd8RxukCOUD32U/s3iMMC6LXdi9Bg6u+bwZig +9XgTG0EQNn1bve6XV/HHbvKqPdFuk0LqlE7eRRZDMRV1Q0imscsWZoU3IpG29ClV +rIM1zHIzBPp/wLDUFXNerC2nZxzLWW3HbzYRrWsGpml+hTYddDVnwLilH8c/FRNL +VRtoBRxAwQ2Hi+bbCWAiQlnWr9sKO5W2o1tyT2b693tcsgCCwlPnYoUiyOuqu1mx +qAhDr7dJa7vTe0QEDDGSLOUFslh+eVG7fy54hPUzcEKChsh1T6SgOx87S2D1Y4oJ +HDZHCvoMZZ0IPHhNTiS/4HtPfLPylnBzEjEXDRGQDKO3WxJqO+kfRwgfeBBRpSxS +0nc4wCp+zIU9LVfI8QARAQABiQI2BBgBCAAgFiEER7bUsvMa9+xqqNFOeVX7bR3S +HPcFAluaBxsCGwwACgkQeVX7bR3SHPdR1g//cKqrDnFHP1JXG6XeNs7YkB+I9vTd +mzjLRxyiREMdJ71qEChSW6wOF+UzYypy0OXn6lW9o2S2QjyeDf13i+8ynXuS3U9Q +n/E+FGZ9xWhFCSoPXpaLLWKcfRVloWgVSXUX3rnMsbX8TNg451anfHgvWS5WDSrk +oBf+mUbrx6bWdj0U7HivWABnisORMZIJmcSF4rtnrPytF7WUKh4pHrHE6tVfY+0O +W/uDoafta6ptSTv35AmISloTFo9SJhfiyFbtGhzkSWyIYcdscrsNC2SCjmNWTSEL +UolretfGF1oAXZyXcSuYAdmdYGZhr+uWgIS4DFkt2rXjJX9xbQQhjBMvtTkHSHNu +I7RLg/ZJtvNibzjr/LU9WTBtwd2CVkPO+0SXfM+Im2deIy49G7hLk3LPtktsTXyM +YQbatXXbreetbTuyKjBcU4xp3u4cNdH4bIuWtvJurU2WNpMZ2uJFUDfInqUvVuy2 +sq9ez618ngbKC7G0/k3AUVLHRgeGIIvnBp4yw3a8S61ZKpk4zmD8EZkEHqSmyjHx +mw72UTIEcrlB1TMnj6LWgGD6qVMmOfuOriFqWsIDG4baPIDnPwTvKPWyftdwNib0 +eS/2y+G5MwMJUeM2bJcj5FLFVlVa5Q/gVjs2+Cu0VAHMNSyBBCOHy4mEubHlgHR4 +498Rsfu8rkl6jT8= +=xtkW +-END PGP PUBLIC KEY BLOCK-
[incubator-dubbo] annotated tag dubbo-2.6.4 updated (8803774 -> da4d766)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to annotated tag dubbo-2.6.4 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. *** WARNING: tag dubbo-2.6.4 was modified! *** from 8803774 (commit) to da4d766 (tag) tagging 88037747a3b69d3225c73f6fbcda36ebd8435887 (commit) replaces dubbo-2.6.3 by zhuyong on Mon Sep 17 17:51:13 2018 +0800 - Log - [maven-release-plugin] copy for tag dubbo-2.6.4 --- No new revisions were added by this update. Summary of changes:
[incubator-dubbo] branch 2.6.4-release updated (f7baac7 -> 8803774)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from f7baac7 Merge branch '2.6.4-release' of github.com:apache/incubator-dubbo into 2.6.4-release add 8803774 [maven-release-plugin] prepare release dubbo-2.6.4 No new revisions were added by this update. Summary of changes: all/pom.xml| 4 ++-- bom/pom.xml| 4 ++-- dependencies-bom/pom.xml | 4 ++-- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-fastjson/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-kryo/pom.xml | 2 +- dubbo-serialization/pom.xml| 2 +- dubbo-test/dubbo-test-benchmark/pom.xml| 2 +- dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml| 2 +- dubbo-test/dubbo
[incubator-dubbo] annotated tag dubbo-2.6.4 deleted (was 2270da2)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to annotated tag dubbo-2.6.4 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. *** WARNING: tag dubbo-2.6.4 was deleted! *** tag was 2270da2 This change permanently discards the following revisions: discard c80bf76 [maven-release-plugin] prepare release dubbo-2.6.4
[incubator-dubbo] branch 2.6.4-release updated (03ec513 -> f7baac7)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. discard 03ec513 [maven-release-plugin] prepare for next development iteration omit c80bf76 [maven-release-plugin] prepare release dubbo-2.6.4 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/2.6.4-release (f7baac7) \ O -- O -- O (03ec513) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: all/pom.xml| 4 ++-- bom/pom.xml| 2 +- dependencies-bom/pom.xml | 2 +- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-fastjson/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +- dubbo
[incubator-dubbo] branch 2.6.4-release updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/2.6.4-release by this push: new 03ec513 [maven-release-plugin] prepare for next development iteration 03ec513 is described below commit 03ec513529ab4259e75310eba035e24a053f84bc Author: zhuyong AuthorDate: Mon Sep 17 16:50:48 2018 +0800 [maven-release-plugin] prepare for next development iteration --- all/pom.xml| 4 ++-- bom/pom.xml| 4 ++-- dependencies-bom/pom.xml | 4 ++-- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-fastjson/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-kryo/pom.xml | 2 +- dubbo-serialization/pom.xml| 2 +- dubbo-test/dubbo-test-benchmark/pom.xml| 2 +- dubbo-test/dubbo-test-compatibility
[incubator-dubbo] annotated tag dubbo-2.6.4 updated (c80bf76 -> 2270da2)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to annotated tag dubbo-2.6.4 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. *** WARNING: tag dubbo-2.6.4 was modified! *** from c80bf76 (commit) to 2270da2 (tag) tagging c80bf76ed1a45dbcaf8f9146eb9e7e9b6e284525 (commit) replaces dubbo-2.6.3 by zhuyong on Mon Sep 17 16:50:43 2018 +0800 - Log - [maven-release-plugin] copy for tag dubbo-2.6.4 --- No new revisions were added by this update. Summary of changes:
[incubator-dubbo] branch 2.6.4-release updated (f7baac7 -> c80bf76)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from f7baac7 Merge branch '2.6.4-release' of github.com:apache/incubator-dubbo into 2.6.4-release add c80bf76 [maven-release-plugin] prepare release dubbo-2.6.4 No new revisions were added by this update. Summary of changes: all/pom.xml| 4 ++-- bom/pom.xml| 4 ++-- dependencies-bom/pom.xml | 4 ++-- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml| 2 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-fastjson/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +- dubbo-serialization/dubbo-serialization-kryo/pom.xml | 2 +- dubbo-serialization/pom.xml| 2 +- dubbo-test/dubbo-test-benchmark/pom.xml| 2 +- dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml| 2 +- dubbo-test/dubbo
[incubator-dubbo] branch master updated: change unit port (#2513)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new fbf4be9 change unit port (#2513)
fbf4be9 is described below
commit fbf4be9d9a17240dd126ad8124c17cc30a97374e
Author: Jerrick Zhu
AuthorDate: Mon Sep 17 16:36:21 2018 +0800
change unit port (#2513)
---
.../test/java/org/apache/dubbo/config/spring/ConfigTest.java | 4 ++--
.../org/apache/dubbo/config/spring/delay-fixed-time.xml | 2 +-
.../org/apache/dubbo/config/spring/delay-on-initialized.xml | 2 +-
.../rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java | 2 +-
.../rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java | 12 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
index d9ac2f2..ca9cc94 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
@@ -244,7 +244,7 @@ public class ConfigTest {
}
assertNotNull(urls);
assertEquals(1, urls.size());
-assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20883/org.apache.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
+assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20888/org.apache.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
} finally {
ctx.stop();
ctx.close();
@@ -262,7 +262,7 @@ public class ConfigTest {
List urls =
registryService.getRegistered().get("org.apache.dubbo.config.spring.api.DemoService");
assertNotNull(urls);
assertEquals(1, urls.size());
-assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20883/org.apache.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
+assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20888/org.apache.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
} finally {
ctx.stop();
ctx.close();
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-fixed-time.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-fixed-time.xml
index 1137f8c..9c87a46 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-fixed-time.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-fixed-time.xml
@@ -25,7 +25,7 @@
-
+
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-on-initialized.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-on-initialized.xml
index a83d89a..bf3da7f 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-on-initialized.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-on-initialized.xml
@@ -28,7 +28,7 @@
-
+
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
index 77a0832..428ff18 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
@@ -64,7 +64,7 @@ public class ChangeTelnetHandlerTest {
mockChannel.removeAttribute("telnet.service");
givenLastCall();
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20884/demo"));
}
private void givenLastCall() {
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
index 6b1ffe2..a785330 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet
[incubator-dubbo] branch 2.6.4-release updated: change port for unit test
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.4-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.4-release by this push:
new 3750059 change port for unit test
new f7baac7 Merge branch '2.6.4-release' of
github.com:apache/incubator-dubbo into 2.6.4-release
3750059 is described below
commit 37500590723f88f7729d58ebc6d03ec2b1b90a3e
Author: zhuyong
AuthorDate: Mon Sep 17 14:59:15 2018 +0800
change port for unit test
---
.../java/com/alibaba/dubbo/config/spring/ConfigTest.java | 4 ++--
.../com/alibaba/dubbo/config/spring/delay-fixed-time.xml | 2 +-
.../com/alibaba/dubbo/config/spring/delay-on-initialized.xml | 2 +-
.../rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java | 2 +-
.../rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java | 12 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
index eb36627..c8eaee2 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
@@ -244,7 +244,7 @@ public class ConfigTest {
}
assertNotNull(urls);
assertEquals(1, urls.size());
-assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20883/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
+assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20888/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
} finally {
ctx.stop();
ctx.close();
@@ -262,7 +262,7 @@ public class ConfigTest {
List urls =
registryService.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService");
assertNotNull(urls);
assertEquals(1, urls.size());
-assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20883/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
+assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20888/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
} finally {
ctx.stop();
ctx.close();
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
index 0fc5cb2..ad5ecf8 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
@@ -25,7 +25,7 @@
-
+
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
index 2efac44..dcbcdf0 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
@@ -28,7 +28,7 @@
-
+
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
index dfe7b69..d4dd4c9 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
@@ -64,7 +64,7 @@ public class ChangeTelnetHandlerTest {
mockChannel.removeAttribute("telnet.service");
givenLastCall();
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20884/demo"));
}
private void givenLastCall() {
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHand
[incubator-dubbo-website] branch asf-site updated: update meetup at chengdu
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 508a21e update meetup at chengdu 508a21e is described below commit 508a21ec1b36dfa568349ec87df0853a677b20e7 Author: zhuyong AuthorDate: Mon Sep 17 10:14:18 2018 +0800 update meetup at chengdu --- blog/zh-cn/dubbo-meetup-chengdu.md | 22 +- zh-cn/blog/dubbo-meetup-chengdu.html | 17 +++-- zh-cn/blog/dubbo-meetup-chengdu.json | 6 +++--- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/blog/zh-cn/dubbo-meetup-chengdu.md b/blog/zh-cn/dubbo-meetup-chengdu.md index 15d3aa6..99fd4f0 100644 --- a/blog/zh-cn/dubbo-meetup-chengdu.md +++ b/blog/zh-cn/dubbo-meetup-chengdu.md @@ -1,14 +1,26 @@ --- -title: 第四届Dubbo开发者沙龙将于8月26日在成都举行 +title: 第四届Dubbo开发者沙龙于8月26日在成都举行 keywords: Dubbo, 成都, meetup -description: 第四届Dubbo开发者沙龙将于8月26日在成都举行。 +description: 第四届Dubbo开发者沙龙于8月26日在成都举行。 --- -# 第四届Dubbo开发者沙龙将于8月26日在成都举行 +# 第四届Dubbo开发者沙龙于8月26日在成都举行 + -Aliware Open Source•成都站-Apache Dubbo开发者沙龙将于8月26日(周日)在成都高新区天府五街200号菁蓉国际广场8号楼2楼会议厅举办，技术GG们的思想盛宴，干货与福利一个都不会少。 +## 用户深度沟通交流 + +8.26上午10:00-12:00，邀请到货车帮，云图金控，前BBD，飞鱼星四家公司开源爱好者及重度用户参与面对面交流；据参与者反馈，解答了对Dubbo的诸多疑惑，特别是如何参与贡献社区，以及捐献代码所带来的价值点。希望后面可以更加深入参与Dubbo社区及活动中。 + +## meetup活动信息 + +本次活动依旧爆满，总报名人数976，现场用户350+，直播PV 13207。 + + +## 报名信息 + +Aliware Open Source•成都站-Apache Dubbo开发者沙龙于8月26日(周日)在成都高新区天府五街200号菁蓉国际广场8号楼2楼会议厅举办，技术GG们的思想盛宴，干货与福利一个都不会少。 报名链接：http://www.huodongxing.com/event/7453091088400 - + \ No newline at end of file diff --git a/zh-cn/blog/dubbo-meetup-chengdu.html b/zh-cn/blog/dubbo-meetup-chengdu.html index d9adadf..732bacb 100644 --- a/zh-cn/blog/dubbo-meetup-chengdu.html +++ b/zh-cn/blog/dubbo-meetup-chengdu.html @@ -5,18 +5,23 @@ - + - 第四届Dubbo开发者沙龙将于8月26日在成都举行 + 第四届Dubbo开发者沙龙于8月26日在成都举行 - +用户深度沟通交流 +8.26上午10:00-12:00，邀请到货车帮，云图金控，前BBD，飞鱼星四家公司开源爱好者及重度用户参与面对面交流；据参与者反馈，解答了对Dubbo的诸多疑惑，特别是如何参与贡献社区，以及捐献代码所带来的价值点。希望后面可以更加深入参与Dubbo社区及活动中。 +meetup活动信息 +现场依旧爆满，总报名人数976，现场用户350+，直播PV 13207。 +报名信息 +Aliware Open Source•成都站-Apache Dubbo开发者沙龙于8月26日(周日)在成都高新区天府五街200号菁蓉国际广场8号楼2楼会议厅举办，技术GG们的思想盛宴，干货与福利一个都不会少。 报名链接：http://www.huodongxing.com/event/7453091088400;>http://www.huodongxing.com/event/7453091088400 - -DisclaimerApache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubatio [...] +DisclaimerApache Dubbo is an effort undergoing incubation at The Apache Software [...] https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"</a>;> https://f.alicdn.com/react/15.4.1/react-dom.min.js"</a>;>
[incubator-dubbo-website] branch asf-site updated: fix #123
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d1df99e fix #123
d1df99e is described below
commit d1df99ec8338f93d3c0b5d661cec07ef4c7159b5
Author: zhuyong
AuthorDate: Mon Sep 17 09:56:07 2018 +0800
fix #123
---
docs/zh-cn/user/demos/fault-tolerent-strategy.md | 2 +-
docs/zh-cn/user/references/telnet.md | 4 ++--
zh-cn/docs/user/demos/fault-tolerent-strategy.html | 4 ++--
zh-cn/docs/user/demos/fault-tolerent-strategy.json | 2 +-
zh-cn/docs/user/references/telnet.html | 6 +++---
zh-cn/docs/user/references/telnet.json | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/zh-cn/user/demos/fault-tolerent-strategy.md
b/docs/zh-cn/user/demos/fault-tolerent-strategy.md
index 4cd5054..fc74d17 100644
--- a/docs/zh-cn/user/demos/fault-tolerent-strategy.md
+++ b/docs/zh-cn/user/demos/fault-tolerent-strategy.md
@@ -14,7 +14,7 @@
## 集群容错模式
-可以自行扩展集群容错策略，参见：[集群扩展](../../dev/impls/load-balance.md)
+可以自行扩展集群容错策略，参见：[集群扩展](../../dev/impls/cluster.md)
### Failover Cluster
diff --git a/docs/zh-cn/user/references/telnet.md
b/docs/zh-cn/user/references/telnet.md
index d9de717..eacfbbf 100644
--- a/docs/zh-cn/user/references/telnet.md
+++ b/docs/zh-cn/user/references/telnet.md
@@ -15,11 +15,11 @@ echo status | nc -i 1 localhost 20880
```
-status命令所检查的资源也可以扩展，参见：[扩展参考手册](/zh-cn/docs/dev/impls/status-checker.html)。
+status命令所检查的资源也可以扩展，参见：[扩展参考手册](../../dev/impls/status-checker.md)。
## 命令
-以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：[Telnet
命令扩展](/zh-cn/docs/dev/impls/telnet-handler.html)。
+以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：[Telnet
命令扩展](../../dev/impls/telnet-handler.md)。
### `ls`
diff --git a/zh-cn/docs/user/demos/fault-tolerent-strategy.html
b/zh-cn/docs/user/demos/fault-tolerent-strategy.html
index 6bd704e..cb26602 100644
--- a/zh-cn/docs/user/demos/fault-tolerent-strategy.html
+++ b/zh-cn/docs/user/demos/fault-tolerent-strategy.html
@@ -12,7 +12,7 @@
-
各节点关系：
@@ -24,7 +24,7 @@
LoadBalance 负责从多个 Invoker
中选出具体的一个用于本次调用，选的过程包含了负载均衡算法，调用失败后，需要重选
集群容错模式
-可以自行扩展集群容错策略，参见：集群扩展
+可以自行扩展集群容错策略，参见：集群扩展
Failover Cluster
失败自动切换，当出现失败，重试其它服务器 [1]。通常用于读操作，但重试会带来更长延迟。可通过
retries=2 来设置重试次数(不含第一次)。
重试次数配置如下：
diff --git a/zh-cn/docs/user/demos/fault-tolerent-strategy.json
b/zh-cn/docs/user/demos/fault-tolerent-strategy.json
index 6e13be4..312faaf 100644
--- a/zh-cn/docs/user/demos/fault-tolerent-strategy.json
+++ b/zh-cn/docs/user/demos/fault-tolerent-strategy.json
@@ -1,4 +1,4 @@
{
"filename": "fault-tolerent-strategy.md",
- "__html": "集群容错\n在集群调用失败时，Dubbo 提供了多种容错方案，缺省为 failover
重试。\n\n各节点关系：\n\n这里的 Invoker 是
Provider 的一个可调用 Service 的抽象，Invoker 封装了
Provider 地址及 Service
接口信息\nDirectory 代表多个 Invoker，可以把它看成
ListInvoker ，但与 List
不同的是，它的值可能是动态变化的，比如注册中心推送变更\n集群容错\n在集群调用失败时，Dubbo 提供了多种容错方案，缺省为 failover
重试。\n\n各节点关系：\n\n这里的 Invoker 是
Provider 的一个可调用 Service 的抽象，Invoker 封装了
Provider 地址及 Service
接口信息\nDirectory 代表多个 Invoker，可以把它看成
ListInvoker ，但与 List
不同的是，它的值可能是动态变化的，比如注册中心推送变更\n
- telnet localhost 20880
@@ -20,9 +20,9 @@
或者：
echo status
| nc -i 1 localhost 20880
-status命令所检查的资源也可以扩展，参见：扩展参考手册。
+status命令所检查的资源也可以扩展，参见：扩展参考手册。
命令
-以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：Telnet 命令扩展。
+以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：Telnet 命令扩展。
ls
ls: 显示服务列表
diff --git a/zh-cn/docs/user/references/telnet.json
b/zh-cn/docs/user/references/telnet.json
index 48e976f..f9f6713 100644
--- a/zh-cn/docs/user/references/telnet.json
+++ b/zh-cn/docs/user/references/telnet.json
@@ -1,4 +1,4 @@
{
"filename": "telnet.md",
- "__html": "Telnet 命令参考手册\n从 2.0.5 版本开始，dubbo 开始支持通过
telnet 命令来进行服务治理。\n使用\ntelnet
localhost 20880\n\n或者：\necho status | nc -i
1 localhost 20880\n\nstatus命令所检查的资源也可以扩展，参见：扩展参考手册。\n命令\n以下展示了
dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见 [...]
+ "__html": "Telnet 命令参考手册\n从 2.0.5 版本开始，dubbo 开始支持通过
telnet 命令来进行服务治理。\n使用\ntelnet
localhost 20880\n\n或者：\necho status | nc -i
1 localhost 20880\n\nstatus命令所检查的资源也可以扩展，参见：扩展参考手册。\n命令\n以下展示了
dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：
[incubator-dubbo-website] branch asf-site updated: fix #134
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 99ed551 fix #134
99ed551 is described below
commit 99ed5510c617892a94568cc998fc55bdc2faeb6e
Author: zhuyong
AuthorDate: Mon Sep 17 09:43:37 2018 +0800
fix #134
---
build/blog.js | 6 +++---
build/blogDetail.js | 6 +++---
build/community.js| 6 +++---
build/documentation.js| 6 +++---
build/home.js | 6 +++---
docs/zh-cn/user/references/telnet.md | 4 ++--
en-us/blog/tracing-with-skywalking.html | 10 +-
en-us/blog/tracing-with-skywalking.json | 2 +-
en-us/docs/admin/ops/skywalking.html | 10 +-
en-us/docs/admin/ops/skywalking.json | 2 +-
zh-cn/blog/prepare-an-apache-release.html | 4 ++--
zh-cn/blog/prepare-an-apache-release.json | 2 +-
zh-cn/docs/user/references/telnet.html| 6 +++---
zh-cn/docs/user/references/telnet.json| 2 +-
14 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 2b1634e..5fdf26c 100644
--- a/build/blog.js
+++ b/build/blog.js
@@ -1,6 +1,6 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=79) [...]
- Copyright (c) 2016 Jed Watson.
+!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=77) [...]
+ Copyright (c) 2017 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://dubbo.apache.org/books/dubbo-dev-book/impls/status-checker.html)。
+status命令所检查的资源也可以扩展，参见：[扩展参考手册](/zh-cn/docs/dev/impls/status-checker.html)。
## 命令
-以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：[Telnet
命令扩展](http://dubbo.apache.org/books/dubbo-dev-book/impls/telnet-handler.html)。
+以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：[Telnet
命令扩展](/zh-cn/docs/dev/impls/telnet-handler.html)。
### `ls`
diff --git a/en-us/blog/tracing-with-skywalking.html
b/en-us/blog/tracing-with-skywalking.html
index c665c5e..531fcdd 100644
--- a/en-us/blog/tracing-with-skywalking.html
+++ b/en-us/blog/tracing-with-skywalking.html
@@ -12,7 +12,7 @@
- https://github.com/apache/incubator-skywalking;>Apache
Skywalking(Incubator) is the APM system that it designed for
micro-services architectures and cloud native architecture systems and supports
distribute tracking. https://github.com/apache/incubator-skywalking;>Apache skywalking
(incubator) collects and analyzes the trace data and generates the
relationship between the application and the service metric, Apache skywalking
(incubating) supports multiple la [...]
Currently, Skywalking has supported analysis the operation of distributed
systems from 6 visual dimensions. The overview view is a global view of your
applications and components, including the number of components and
applications, application alarm fluctuations, slow service lists, and
application throughput; The topology shows the topological relationship of the
whole application; The application view represents the upstream and downstream
relationship of the application from singl [...]
@@ -27,10 +27,10 @@ String sayHello(String name);
}
Service provider project
package org.apache.skywalking.demo.provider;
-@Service(version = demo.service.version,applicat<
[...]
-
[incubator-dubbo-website] branch asf-site updated: build site
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 810b792 build site
810b792 is described below
commit 810b792e39ab35b89467c720e0f6dd5ab63e58bf
Author: zhuyong
AuthorDate: Fri Sep 14 18:20:44 2018 +0800
build site
---
build/blog.js | 2 +-
en-us/docs/dev/SPI.html| 12 +-
en-us/docs/dev/SPI.json| 2 +-
en-us/docs/dev/impls/logger-adapter.html | 3 +-
en-us/docs/dev/impls/logger-adapter.json | 2 +-
en-us/docs/user/demos/routing-rule.html| 49 ++-
en-us/docs/user/demos/routing-rule.json| 2 +-
.../user/references/xml/dubbo-application.html | 4 +-
.../user/references/xml/dubbo-application.json | 2 +-
site_config/blog.js| 7 +
zh-cn/blog/dubbo-mesh-service-mesh-exploring.html | 147 +
zh-cn/blog/dubbo-mesh-service-mesh-exploring.json | 7 +
zh-cn/blog/index.html | 2 +-
zh-cn/docs/dev/SPI.html| 12 +-
zh-cn/docs/dev/SPI.json| 2 +-
zh-cn/docs/dev/impls/logger-adapter.html | 3 +-
zh-cn/docs/dev/impls/logger-adapter.json | 2 +-
zh-cn/docs/user/demos/routing-rule.html| 49 ++-
zh-cn/docs/user/demos/routing-rule.json| 2 +-
.../user/references/xml/dubbo-application.html | 4 +-
.../user/references/xml/dubbo-application.json | 2 +-
21 files changed, 287 insertions(+), 30 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 5f7b342..a6cdab8 100644
--- a/build/blog.js
+++ b/build/blog.js
@@ -3,4 +3,4 @@
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;t
- 中中import com.alibaba.dubbo.rpc.Protocol;
-public class XxxProtocol
implemenets Protocol {
+public class XxxProtocol
implements Protocol {
// ...
}
@@ -49,10 +49,10 @@
import com.alibaba.dubbo.rpc.Protocol;
-public class XxxProtocolWrapper implemenets Protocol
{
+public class XxxProtocolWrapper implements Protocol
{
Protocol impl;
-public XxxProtocol(Protocol
protocol) { impl = protocol; }
+public XxxProtocolWrapper(Protocol
protocol) { impl = protocol; }
//after interface method is executed，the method
in extension will be executed
public void refer() {
@@ -80,7 +80,7 @@
}
CarMaker implementation：
-public
class RaceCarMaker implemenets CarMaker
{
+public
class RaceCarMaker implements CarMaker
{
WheelMaker wheelMaker;
public setWheelMaker(WheelMaker
wheelMaker) {
@@ -114,7 +114,7 @@
}
CarMaker implementation：
-public
class RaceCarMaker implemenets CarMaker
{
+public
class RaceCarMaker implements CarMaker
{
WheelMaker wheelMaker;
public setWheelMaker(WheelMaker
wheelMaker) {
diff --git a/en-us/docs/dev/SPI.json b/en-us/docs/dev/SPI.json
index f302d48..da97a66 100644
--- a/en-us/docs/dev/SPI.json
+++ b/en-us/docs/dev/SPI.json
@@ -1,4 +1,4 @@
{
"filename": "SPI.md",
- "__html": "SPI Loading\nSPI
Config\nSource：\nDubbo SPI is inherited from standard JDK
SPI(Service Provider Interface) and makes it more powerful.\nDubbo fixed
below issues of the standard JDK SPI：\n\nthe standard JDK SPI will
load and instantize all implementation at once. It will be a waste of
resources if the implementation is timecosted ,but never be used.\nWe
cann't accquire the SPI name,if loading the SPI implementation i [...]
+ "__html": "SPI Loading\nSPI
Config\nSource：\nDubbo SPI is inherited from standard JDK
SPI(Service Provider Interface) and makes it more powerful.\nDubbo fixed
below issues of the standard JDK SPI：\n\nthe standard JDK SPI will
load and instantize all implementation at once. It will be a waste of
resources if the implementation is timecosted ,but never be used.\nWe
cann't accquire the SPI name,if loading the SPI implementation i [...]
}
\ No newline at end of file
diff --git a/en-us/docs/dev/impls/logger-adapter.html
b/en-us/docs/dev/impls/logger-adapter.html
index 0c34963..dae0c10 100644
--- a/en-us/docs/dev/impls/logger-adapter.html
+++ b/en-us/docs/dev/impls/logger-adapter.html
@@ -12,7 +12,7 @@
- 中中LoggerAdapter Extension\nSummary\nExtension
for adapting logger output\nExtension
Interface\ncom.alibaba.dubbo.common.logger.LoggerAdapter\nExtension
Configuration\ndubbo:application logger=\"xxx\"
/\n\nOr:\nLoggerAdapter Extension\nSummary\nExtension
for adapting logger output\nExtension
Interface\ncom.alibaba.dubbo.common.logger.LoggerAd
[incubator-dubbo-website] branch asf-site updated: Add dubbo-mesh-service-mesh-exploring.md (#152)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 8183c8d Add dubbo-mesh-service-mesh-exploring.md (#152) 8183c8d is described below commit 8183c8d43946f2e2762fa10d43188faf63486f5b Author: yun1129 AuthorDate: Fri Sep 14 18:17:37 2018 +0800 Add dubbo-mesh-service-mesh-exploring.md (#152) --- blog/zh-cn/dubbo-mesh-service-mesh-exploring.md | 157 +++ img/blog/meetup-chengdu/all-hands.webp | Bin 0 -> 90746 bytes img/blog/meetup-chengdu/audience-shapshot.webp | Bin 0 -> 58320 bytes img/blog/meetup-chengdu/challenges-continued.jpg | Bin 0 -> 36616 bytes img/blog/meetup-chengdu/challenges.jpg | Bin 0 -> 69680 bytes img/blog/meetup-chengdu/forms.jpg| Bin 0 -> 61143 bytes img/blog/meetup-chengdu/speaker.webp | Bin 0 -> 15194 bytes img/blog/meetup-chengdu/trends.jpg | Bin 0 -> 60540 bytes img/blog/meetup-chengdu/what.jpg | Bin 0 -> 71448 bytes 9 files changed, 157 insertions(+) diff --git a/blog/zh-cn/dubbo-mesh-service-mesh-exploring.md b/blog/zh-cn/dubbo-mesh-service-mesh-exploring.md new file mode 100644 index 000..47a71df --- /dev/null +++ b/blog/zh-cn/dubbo-mesh-service-mesh-exploring.md @@ -0,0 +1,157 @@ +--- +title: Dubbo Mesh ｜ Service Mesh的实践与探索 +keywords: Dubbo, Service Mesh +description: 本文介绍了Dubbo在Service Mesh方向的实践与探索 +--- + +# Dubbo Mesh ｜ Service Mesh的实践与探索 + + + +近日，在Aliware Open Source•成都站-Apache Dubbo 开发者沙龙上，阿里巴巴中间件高级技术专家李云（至简）向开发者们分享了阿里巴巴中间件团队在Service Mmesh领域的探索和最新实践。本文是根据至简的现场分享所整理，为大家回顾分享中的精彩内容。 + +## 精彩观点导读 + +* 我们去探索一项技术，并不会仅仅因为其先进性，而是因为我们目前遇到了一些无法解决的问题，而这项技术正好能解决这个问题。 + +* 所有软件最重要的使命不是满足功能要求，而是演进，从而持续成长。 + +* 微服务本质是对服务的拆分，微服务架构符合工程领域常用的“分而治之”范式。 + +## 前言 + +我们去探索一项技术，并不会仅仅因为其先进性，而是因为我们目前遇到了一些无法解决的问题，而这项技术正好能解决这个问题。现在，阿里巴巴整个集团业务的体量很大，在技术上会遇到很多的挑战。而正是因为这些挑战，让我们思考通过哪些新技术可以去解决这些痛点，这也是我们在Service Mesh领域进行探索和实践的出发点。首先，我们先来看看自己遇到了哪些挑战。 + +## 微服务的5大挑战 + + 挑战一：微服务框架自身演进困难。 + +任何软件都会有他的生命进化曲线，从最初的萌芽，进入形成期，往上发展，再进入平台期，最后进入衰亡期。当然我们希望我们的软件可以在进入平台期后，能借助某次演进进入新的发展期。从这个维度看，所有软件最重要的使命不是满足功能要求，而是演进，从而持续成长。相反，当某个软件无法演进的时候，就会意味着死亡。但软件的演进并不是一个简单的事情，以微服务框架为例，为了进一步提升双11期间整个中间件平台的稳定性，我们会修改若干个功能，并以SDK的方式去提供给业务方，但业务代码和微服务框架SDK是强耦合的，这时候需要我们推动各个业务方和我们一同去做升级。虽然我们的初衷是实现平台稳定性的提升，帮助业务更好的发展，但这时由于大家的出发点和诉求有所不同，业务方和我们一起去做升级是比较困难的。所以� �发展微服务框架，首先遇到的挑战就是演进困难。 + + + 挑战二：微服务框架SDK多语言并行开发与维护成本高。 + +以前我们都是通过对技术栈的统一来提升成本优势和团队效率，大家可以用一种语言去开发和维护，避免多语言时团队的不聚焦。但在软件和开源生态演进的过程中，多语言已经成为一种流行，因为不同语言都有其自身的优势，今天大家能看到的一个现象是云原生的生态中有多种开发语言，使用频率最高的语言已经不是Java了，而是Go，是因为Go的footprint很小。再以 Dubbo为例，除了Java，我们还提供C++，Node.js的SDK，以便让更多的开发者可以加入Dubbo生态，但所有的这些，如果没有社区力量的参与，是很难维持的。 + + + 挑战三：异构服务框架难以共存完成渐进式演进。 + +我们结合场景来看看这个挑战。阿里巴巴收购了一些企业，被收购企业的技术栈可能和阿里巴巴不同，比如有些用的是Go语言，有些用的是PHP，这时候为了统一技术栈，我们需要对这类技术平台推倒重来，但这个过程中，我们会面临一系列问题，首当其冲的就是推倒重来会带来巨大的技术风险，其次是可能会面临技术人员大批量流失的风险，这在社会责任的层面也是很难接受。所以我们在寻求一种可能的方案，去解决这类问题。 + + 挑战四：是单一的语言限制了人才的多样性。 + +这里，我们不去争论某个编程语言的好与坏，每个语言都有其适用场景，你不能说我手里有个榔头，你面对的都是钉子。以前我们觉得统一技术栈可以集中开发力量，并且带来较高的运维便利性。但伴随着互联网带来的快节奏，以往的团队能力设置已经很难满足这类变化，对工程师个体提出了更高的要求，我们不仅仅需要是某一方面的专家，而且还需要具备多域的工作技能，DevOps和全栈工程师就是这类快节奏变化下最好的注脚。 + + + 挑战五：是点状的服务治理难以做到及时、有效和经济。 + +微服务和架构的核心是拆分，通过拆分，让每个模块可以独立运行，跟上业务的发展速度，持续推动业务的创新。但拆完后新的问题出来了，缺少横向的内容拉通所有独立的烟囱，从而在服务治理上带来极大的挑战。 + +## 分布式应用的发展趋势 + +微服务会成为大规模分布式应用的主流架构。任何复杂的工程问题都会归结为devide and conquer（分而治之），意思就是就是把一个复杂的问题分成两个或更多的相同或相似的子问题，再把子问题分成更小的子问题……直到最后子问题可以简单的直接求解，原问题的解即子问题的解的合并。微服务本质是对服务的拆分，与工程领域惯用的“分而治之”的思路是一致的。 + +微服务架构下应用的开发是多语言的。没有一个语言是一家独大的，每种语言在特定场景下都有其自身的优势，我们希望这种优势能够将技术到产品的周期（time to market）缩短。技术的核心在于创造价值，无论是交付给客户，还是服务于整个社会。因此，微服务是需要不同语言的开发者发挥自身的优势，去进一步完善我们的微服务架构，释放技术价值。 + + +数据安全将成为公有云分布式应用的生命线。云原生时代，业务即便没上云，企业对自身数据的安全都是有诉求的，尤其是在金融行业，如果通过抓包就能获取一些敏感信息，这将会给企业带来巨大的风险。 + +Cloud native成为distributionless（无分布式）的主要探索路径。分布式发展的终极形式是无分布式，在未来我们做开发，所有的代码在web上写好后，通过点击一个按钮，所有部署都会自动实现，所有的code review的工作可以在一个统一的工作台上全部实现。 + + +以更快的速度，通过构建软件去探索新业务。工程师服务的是客户，通过技术输出来实现技术价值，以互联网的架构帮助赋能传统企业，帮助企业获得差异化竞争力。 + +## 什么是Service Mesh + +Service Mesh是层次化、规范化、体系化、无侵入的分布式服务治理技术平台。 + + 层次化 + +分为数据面和控制面两个概念，数据面是指所有数据流动的那个层面，控制面是用来控制这个数据面的，对服务去做处理。对数据面和控制面进行分层，带来的好处是，针对一个复杂的系统进行切分，可以获得更清晰的认识，这和devide and conque是同一个理念。 + + 规范化 + +是指通过标准协议完成数据平面和控制平面的连接，同时，sidecar成为所有traffic互联、互通的约束标准。 + + + + 体系化 + +包含两个维度，一是指observability全局考虑。目前在整个分布式治理过程中的最大挑战是：logging、metrics、tracing这三个observability领域的核心内容缺少体系性的关注。另一个是集中管理的维度，包括服务管理、限流、熔断、安全、灰度在内的服务模块都可以在获得体系化的呈现，每个服务都可以被看到，而非团队a只看限流，团队b只看logging，需要一种技术能力拉通所有的服务模块，这
[incubator-dubbo] branch 2.6.4-release created (now 39ea8a8)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at 39ea8a8 add change log for 2.6.4 This branch includes the following new commits: new 39ea8a8 add change log for 2.6.4 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-dubbo] 01/01: add change log for 2.6.4
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git commit 39ea8a8aa86329f846ae7f0f47572859e019f2c1 Author: zhuyong AuthorDate: Fri Sep 14 17:37:44 2018 +0800 add change log for 2.6.4 --- CHANGES.md | 27 ++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 78b92f7..23d4aba 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,31 @@ # Release Notes +## 2.6.4 + +Enhancements / Features + +- Support access Redis with password, [#2146](https://github.com/apache/incubator-dubbo/pull/2146) +- Support char array for GenericService, [#2137](https://github.com/apache/incubator-dubbo/pull/2137) +- Direct return when the server goes down abnormally, [#2451](https://github.com/apache/incubator-dubbo/pull/2451) +- Add log for trouble-shooting when qos start failed, [#2455](https://github.com/apache/incubator-dubbo/pull/2455) +- PojoUtil support subclasses of java.util.Date, [#2502](https://github.com/apache/incubator-dubbo/pull/2502) +- Add ip and application name for MonitorService, [#2166](https://github.com/apache/incubator-dubbo/pull/2166) +- New ASCII logo, [#2402](https://github.com/apache/incubator-dubbo/pull/2402) + +Bugfixes + +- Change consumer retries default value from 0 to 2, [#2303](https://github.com/apache/incubator-dubbo/pull/2303) +- Fix the problem that attachment is lost when retry, [#2024](https://github.com/apache/incubator-dubbo/pull/2024) +- Fix NPE when telnet get a null parameter, [#2453](https://github.com/apache/incubator-dubbo/pull/2453) + +UT stability + +- Improve the stability by changing different port, setting timeout to 3000ms, [#2501](https://github.com/apache/incubator-dubbo/pull/2501) + +Issues and Pull Requests, check [milestone-2.6.4](https://github.com/apache/incubator-dubbo/milestone/19). + ## 2.6.3 + Enhancements / Features - Support implicit delivery of attachments from provider to consumer, #889 @@ -58,4 +83,4 @@ Issues and Pull Requests, check [milestone-2.6.3](https://github.com/apache/incu - Waiting for registry notification on consumer side by checking channel state. 7. Simplify consumer/provider side check in RpcContext, #1444. -Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15). +Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15). \ No newline at end of file
[incubator-dubbo] branch 2.6.4-release deleted (was fa22813)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was fa22813 add changelog for 2.6.4 This change permanently discards the following revisions: discard fa22813 add changelog for 2.6.4
[incubator-dubbo] branch 2.6.4-release created (now 2881738)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at 2881738 add cache for travis, fix ut for stable (#2501) No new revisions were added by this update.
[incubator-dubbo] branch 2.6.4-release updated: add changelog for 2.6.4
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.4-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/2.6.4-release by this push: new fa22813 add changelog for 2.6.4 fa22813 is described below commit fa228136567516bb0864f8b006f6c13f90c19553 Author: zhuyong AuthorDate: Fri Sep 14 13:09:51 2018 +0800 add changelog for 2.6.4 --- CHANGES.md | 25 + 1 file changed, 25 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 78b92f7..214cb25 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,31 @@ # Release Notes +## 2.6.4 + +Enhancements / Features + +- Support access Redis with password, #2146 +- Support char array for GenericService, #2137 +- Direct return when the server goes down abnormally, #2451 +- Add log for trouble-shooting when qos start failed, #2455 +- PojoUtil support subclasses of java.util.Date, #2499 +- Add ip and application name for MonitorService, #2166 +- New ASCII logo, #2402 + +Bugfixes + +- Change consumer retries default value from 0 to 2, #2303 +- Fix the problem that attachment is lost when retry, #2024 +- Fix NPE when telnet get a null parameter, #2453 + +UT stability + +- Improve the stability by changing different port, setting timeout to 3000ms, #2492 #2490 #2484 #2482 #2462 #2460 + +Issues and Pull Requests, check [milestone-2.6.4](https://github.com/apache/incubator-dubbo/milestone/19). + ## 2.6.3 + Enhancements / Features - Support implicit delivery of attachments from provider to consumer, #889
[incubator-dubbo] branch master updated: [Dubbo-2499]fix PojoUtil realize type convert not support subclasses of 'java.util.date' #2499 (#2500)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 8254e3d [Dubbo-2499]fix PojoUtil realize type convert not support
subclasses of 'java.util.date' #2499 (#2500)
8254e3d is described below
commit 8254e3da52f2b08c37a9e0fcf399142bf8b5fe38
Author: 凝雨
AuthorDate: Fri Sep 14 09:03:41 2018 +0800
[Dubbo-2499]fix PojoUtil realize type convert not support subclasses of
'java.util.date' #2499 (#2500)
* Solve time, timestamp, SQL. Date type conversion problems
* add ut
---
.../dubbo/common/utils/CompatibleTypeUtils.java| 13 --
.../common/utils/CompatibleTypeUtilsTest.java | 9 +++
.../apache/dubbo/common/utils/PojoUtilsTest.java | 30 ++
3 files changed, 50 insertions(+), 2 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java
index 14a0a79..de96eeb 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java
@@ -79,9 +79,18 @@ public class CompatibleTypeUtils {
return new Byte(string);
} else if (type == Boolean.class || type == boolean.class) {
return new Boolean(string);
-} else if (type == Date.class) {
+} else if (type == Date.class || type == java.sql.Date.class ||
type == java.sql.Timestamp.class || type == java.sql.Time.class) {
try {
-return new SimpleDateFormat(DATE_FORMAT).parse((String)
value);
+Date date = new
SimpleDateFormat(DATE_FORMAT).parse((String) value);
+if (type == java.sql.Date.class) {
+return new java.sql.Date(date.getTime());
+} else if (type == java.sql.Timestamp.class) {
+return new java.sql.Timestamp(date.getTime());
+} else if (type == java.sql.Time.class) {
+return new java.sql.Time(date.getTime());
+} else {
+return date;
+}
} catch (ParseException e) {
throw new IllegalStateException("Failed to parse date " +
value + " by format " + DATE_FORMAT + ", cause: " + e.getMessage(), e);
}
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java
index fc18ac7..ff9a144 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java
@@ -68,6 +68,15 @@ public class CompatibleTypeUtilsTest {
result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", Date.class);
assertEquals(new SimpleDateFormat("-MM-dd
HH:mm:ss").parse("2011-12-11 12:24:12"), (Date) result);
+result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", java.sql.Date.class);
+assertEquals(new
SimpleDateFormat("-MM-dd").format((java.sql.Date) result), "2011-12-11");
+
+result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", java.sql.Time.class);
+assertEquals(new
SimpleDateFormat("HH:mm:ss").format((java.sql.Time) result), "12:24:12");
+
+result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", java.sql.Timestamp.class);
+assertEquals(new SimpleDateFormat("-MM-dd
HH:mm:ss").format((java.sql.Timestamp) result), "2011-12-11 12:24:12");
+
result = CompatibleTypeUtils.compatibleTypeConvert("ab",
char[].class);
assertEquals(2, ((char[]) result).length);
assertEquals('a', ((char[]) result)[0]);
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
index 2feda7e..fa93d7b 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
@@ -28,8 +28,10 @@ import org.junit.Test;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import
[incubator-dubbo] branch 2.6.x updated: fix time, timestamp, SQL. Date type conversion problems (#2502)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 5968f1a fix time, timestamp, SQL. Date type conversion problems
(#2502)
5968f1a is described below
commit 5968f1a3f825ea0c8f8a231870c74d0f1c7b9ac9
Author: 凝雨
AuthorDate: Fri Sep 14 08:58:40 2018 +0800
fix time, timestamp, SQL. Date type conversion problems (#2502)
---
.../dubbo/common/utils/CompatibleTypeUtils.java| 13 --
.../common/utils/CompatibleTypeUtilsTest.java | 9 +++
.../alibaba/dubbo/common/utils/PojoUtilsTest.java | 30 ++
3 files changed, 50 insertions(+), 2 deletions(-)
diff --git
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtils.java
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtils.java
index 3f9356f..637e11f 100644
---
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtils.java
+++
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtils.java
@@ -79,9 +79,18 @@ public class CompatibleTypeUtils {
return new Byte(string);
} else if (type == Boolean.class || type == boolean.class) {
return new Boolean(string);
-} else if (type == Date.class) {
+} else if (type == Date.class || type == java.sql.Date.class ||
type == java.sql.Timestamp.class || type == java.sql.Time.class) {
try {
-return new SimpleDateFormat(DATE_FORMAT).parse((String)
value);
+Date date = new
SimpleDateFormat(DATE_FORMAT).parse((String) value);
+if (type == java.sql.Date.class) {
+return new java.sql.Date(date.getTime());
+} else if (type == java.sql.Timestamp.class) {
+return new java.sql.Timestamp(date.getTime());
+} else if (type == java.sql.Time.class) {
+return new java.sql.Time(date.getTime());
+} else {
+return date;
+}
} catch (ParseException e) {
throw new IllegalStateException("Failed to parse date " +
value + " by format " + DATE_FORMAT + ", cause: " + e.getMessage(), e);
}
diff --git
a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtilsTest.java
b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtilsTest.java
index 63efc5b..db0db8a 100644
---
a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtilsTest.java
+++
b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtilsTest.java
@@ -68,6 +68,15 @@ public class CompatibleTypeUtilsTest {
result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", Date.class);
assertEquals(new SimpleDateFormat("-MM-dd
HH:mm:ss").parse("2011-12-11 12:24:12"), (Date) result);
+result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", java.sql.Date.class);
+assertEquals(new
SimpleDateFormat("-MM-dd").format((java.sql.Date) result), "2011-12-11");
+
+result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", java.sql.Time.class);
+assertEquals(new
SimpleDateFormat("HH:mm:ss").format((java.sql.Time) result), "12:24:12");
+
+result = CompatibleTypeUtils.compatibleTypeConvert("2011-12-11
12:24:12", java.sql.Timestamp.class);
+assertEquals(new SimpleDateFormat("-MM-dd
HH:mm:ss").format((java.sql.Timestamp) result), "2011-12-11 12:24:12");
+
result = CompatibleTypeUtils.compatibleTypeConvert("ab",
char[].class);
assertEquals(2, ((char[]) result).length);
assertEquals('a', ((char[]) result)[0]);
diff --git
a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/PojoUtilsTest.java
b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/PojoUtilsTest.java
index d8b458e..54e223a 100644
---
a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/PojoUtilsTest.java
+++
b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/PojoUtilsTest.java
@@ -29,8 +29,10 @@ import org.junit.Test;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -559,6 +561,34 @@ public class PojoUtilsTest {
Assert.assertEquals
[incubator-dubbo] branch master updated: fix stable problem for unit cases (#2497)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 96eec3d fix stable problem for unit cases (#2497)
96eec3d is described below
commit 96eec3ddc42feacb9f749b75d6df97ba77c2b51b
Author: Jerrick Zhu
AuthorDate: Thu Sep 13 14:46:24 2018 +0800
fix stable problem for unit cases (#2497)
* fix stable problem for unit cases
* add cache
---
.travis.yml| 4 ++
.../apache/dubbo/common/utils/UrlUtilsTest.java| 18 -
.../apache/dubbo/config/GenericServiceTest.java| 10 ++---
.../org/apache/dubbo/config/cache/CacheTest.java | 4 +-
.../org/apache/dubbo/config/spring/ConfigTest.java | 2 +-
.../registry/support/AbstractRegistryTest.java | 46 +++---
.../transport/netty/ClientReconnectTest.java | 2 +-
.../transport/netty/NettyClientToServerTest.java | 2 +-
.../dubbo/telnet/PortTelnetHandlerTest.java| 12 +++---
.../webservice/WebserviceProtocolTest.java | 4 +-
10 files changed, 55 insertions(+), 49 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index acf5d48..2b617a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,10 @@ jdk:
- oraclejdk9
- oraclejdk8
+cache:
+ directories:
+- $HOME/.m2
+
install: true
script:
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java
index 7141c96..3fc14c3 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java
@@ -98,9 +98,9 @@ public class UrlUtilsTest {
@Test
public void testParseUrl2() {
-String address = "127.0.0.1";
-String backupAddress1 = "127.0.0.2";
-String backupAddress2 = "127.0.0.3";
+String address = "192.168.0.1";
+String backupAddress1 = "192.168.0.2";
+String backupAddress2 = "192.168.0.3";
Map parameters = new HashMap();
parameters.put("username", "root");
@@ -108,25 +108,25 @@ public class UrlUtilsTest {
parameters.put("port", "1");
parameters.put("protocol", "dubbo");
URL url = UrlUtils.parseURL(address + "," + backupAddress1 + "," +
backupAddress2, parameters);
-assertEquals(localAddress + ":1", url.getAddress());
+assertEquals("192.168.0.1:1", url.getAddress());
assertEquals("root", url.getUsername());
assertEquals("alibaba", url.getPassword());
assertEquals(1, url.getPort());
assertEquals("dubbo", url.getProtocol());
-assertEquals("127.0.0.2" + "," + "127.0.0.3",
url.getParameter("backup"));
+assertEquals("192.168.0.2" + "," + "192.168.0.3",
url.getParameter("backup"));
}
@Test
public void testParseUrls() {
-String addresses = "127.0.0.1|127.0.0.2|127.0.0.3";
+String addresses = "192.168.0.1|192.168.0.2|192.168.0.3";
Map parameters = new HashMap();
parameters.put("username", "root");
parameters.put("password", "alibaba");
parameters.put("port", "1");
parameters.put("protocol", "dubbo");
List urls = UrlUtils.parseURLs(addresses, parameters);
-assertEquals(localAddress + ":1", urls.get(0).getAddress());
-assertEquals("127.0.0.2" + ":1", urls.get(1).getAddress());
+assertEquals("192.168.0.1" + ":1", urls.get(0).getAddress());
+assertEquals("192.168.0.2" + ":1", urls.get(1).getAddress());
}
@Test
@@ -330,7 +330,7 @@ public class UrlUtilsTest {
@Test
public void testIsServiceKeyMatch() throws Exception {
-URL url = URL.valueOf("test://127.0.0.0");
+URL url = URL.valueOf("test://127.0.0.1");
URL pattern = url.addParameter(Constants.GROUP_KEY, "test")
.addParameter(Constants.INTERFACE_KEY, "test")
.addParameter(Constants.VERSION_KEY, "test");
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/GenericServiceTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/GenericServiceTest.java
index 6e746db..f996f41 100644
---
a/dubbo-config/dubbo-
[incubator-dubbo] branch master updated: Update readme (#2488)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new e1e6978 Update readme (#2488) e1e6978 is described below commit e1e6978bec999562cff96fd8fbc9506b1047a7f5 Author: Song Kun AuthorDate: Wed Sep 12 09:35:19 2018 +0800 Update readme (#2488) * update readme * remove uncessary space --- README.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7fb8cde..c707927 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@  [](https://twitter.com/intent/tweet?text=Apache%20Dubbo%20(incubating)%20is%20a%20high-performance%2C%20java%20based%2C%20open%20source%20RPC%20framework.=http://dubbo.incubator.apache.org/=ApacheDubbo=rpc,java,dubbo,micro-service) -Apache Dubbo (incubating) is a high-performance, java based open source RPC framework. Please visit [official site ](http://dubbo.incubator.apache.org) for quick start and documentations, as well as [Wiki](https://github.com/apache/incubator-dubbo/wiki) for news, FAQ, and release notes. +Apache Dubbo (incubating) is a high-performance, Java based open source RPC framework. Please visit [official site](http://dubbo.incubator.apache.org) for quick start and documentations, as well as [Wiki](https://github.com/apache/incubator-dubbo/wiki) for news, FAQ, and release notes. -We are now collecting dubbo user info in order to help us to improve dubbo better, pls. kindly help us by providing yours on [issue#1012: Wanted: who's using dubbo](https://github.com/apache/incubator-dubbo/issues/1012), thanks :) +We are now collecting dubbo user info in order to help us to improve Dubbo better, pls. kindly help us by providing yours on [issue#1012: Wanted: who's using dubbo](https://github.com/apache/incubator-dubbo/issues/1012), thanks :) ## Architecture @@ -33,7 +33,7 @@ The following code snippet comes from [Dubbo Samples](https://github.com/dubbo/d # cd dubbo-samples/dubbo-samples-api ``` -There's one [README](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/README.md) file under `dubbo-samples-api` directory. Read it and try this sample out by following the instructions. +There's a [README](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/README.md) file under `dubbo-samples-api` directory. Read it and try this sample out by following the instructions. ### Maven dependency @@ -151,7 +151,7 @@ The consumer will print out `Hello world` on the screen. ## Contact * Mailing list: - * dev list: for dev/user discussion. [subscribe](mailto:[dev-subscr...@dubbo.incubator.apache.org]), [unsubscribe](mailto:[dev-unsubscr...@dubbo.incubator.apache.org]), [archive](https://lists.apache.org/list.html?d...@dubbo.apache.org), [guide](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide) + * dev list: for dev/user discussion. [subscribe](mailto:dev-subscr...@dubbo.incubator.apache.org), [unsubscribe](mailto:dev-unsubscr...@dubbo.incubator.apache.org), [archive](https://lists.apache.org/list.html?d...@dubbo.apache.org), [guide](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide) * Bugs: [Issues](https://github.com/apache/incubator-dubbo/issues/new?template=dubbo-issue-report-template.md) * Gitter: [Gitter channel](https://gitter.im/alibaba/dubbo) @@ -183,7 +183,7 @@ Please follow the [template](https://github.com/apache/incubator-dubbo/issues/ne ## Reporting a security vulnerability -Please report security vulnerability to secur...@dubbo.incubator.apache.org (private mailing list). +Please report security vulnerability to [us](secur...@dubbo.incubator.apache.org) privately. ## Dubbo eco system
[incubator-dubbo] branch master updated: Update dubbo-issue-report-template.md (#2483)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new c9eb57f Update dubbo-issue-report-template.md (#2483) c9eb57f is described below commit c9eb57fde2f3c06c6043bdd5eaf7051048001174 Author: elmar.chen AuthorDate: Tue Sep 11 16:03:08 2018 +0800 Update dubbo-issue-report-template.md (#2483) fix some wording issue. --- .github/ISSUE_TEMPLATE/dubbo-issue-report-template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md b/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md index c2ff96a..13587d0 100644 --- a/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md +++ b/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md @@ -13,7 +13,7 @@ about: If you would like to report a issue to Dubbo, please use this template. * Operating System version: xxx * Java version: xxx -### Step to reproduce this issue +### Steps to reproduce this issue 1. xxx 2. xxx @@ -27,7 +27,7 @@ What do you expected from the above steps？ ### Actual Result -What is actually happen? +What actually happens? If there is an exception, please attach the exception trace:
[incubator-dubbo] branch master updated: [Dubbo-2446]Fix ClassNotFoundException when load Service Interface by parent ClassLoader (#2447)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new e18810b [Dubbo-2446]Fix ClassNotFoundException when load Service
Interface by parent ClassLoader (#2447)
e18810b is described below
commit e18810baba0e2314f11a2c8c080cd58d9af446bf
Author: 邓志
AuthorDate: Tue Sep 11 15:32:25 2018 +0800
[Dubbo-2446]Fix ClassNotFoundException when load Service Interface by
parent ClassLoader (#2447)
*
用jarslink做的module隔离,dubbo调用时会抛ClassNotFoundException.经查是ClassLoader不一致。为了严谨，做此修改，以确保Service
Interface和Invocation Interface的ClassLoader是同一个。
* invokerInterface非空判断
---
.../src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java | 8
.../src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java | 8 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java
index ea499a3..78f7b92 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java
@@ -591,6 +591,14 @@ public final class ReflectUtils {
}
}
+public static Class forName(ClassLoader cl, String name) {
+try {
+return name2class(cl, name);
+} catch (ClassNotFoundException e) {
+throw new IllegalStateException("Not found class " + name + ",
cause: " + e.getMessage(), e);
+}
+}
+
/**
* name to class.
* "boolean" => boolean.class
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
index 077970a..e2b0a66 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
@@ -49,7 +49,9 @@ public class RpcUtils {
&& !invocation.getMethodName().startsWith("$")) {
String service =
invocation.getInvoker().getUrl().getServiceInterface();
if (service != null && service.length() > 0) {
-Class cls = ReflectUtils.forName(service);
+Class invokerInterface =
invocation.getInvoker().getInterface();
+Class cls = invokerInterface != null ?
ReflectUtils.forName(invokerInterface.getClassLoader(), service)
+: ReflectUtils.forName(service);
Method method = cls.getMethod(invocation.getMethodName(),
invocation.getParameterTypes());
if (method.getReturnType() == void.class) {
return null;
@@ -71,7 +73,9 @@ public class RpcUtils {
&& !invocation.getMethodName().startsWith("$")) {
String service =
invocation.getInvoker().getUrl().getServiceInterface();
if (service != null && service.length() > 0) {
-Class cls = ReflectUtils.forName(service);
+Class invokerInterface =
invocation.getInvoker().getInterface();
+Class cls = invokerInterface != null ?
ReflectUtils.forName(invokerInterface.getClassLoader(), service)
+: ReflectUtils.forName(service);
Method method = cls.getMethod(invocation.getMethodName(),
invocation.getParameterTypes());
if (method.getReturnType() == void.class) {
return null;
[incubator-dubbo] branch master updated: [Dubbo-2424] Fix switch-case fall through in ChannelEventRunnable (#2426)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 51f0677 [Dubbo-2424] Fix switch-case fall through in
ChannelEventRunnable (#2426)
51f0677 is described below
commit 51f0677c8eaca9a7d8a37e663a344e8b02543350
Author: Yuhao Bi
AuthorDate: Tue Sep 11 12:55:51 2018 +0800
[Dubbo-2424] Fix switch-case fall through in ChannelEventRunnable (#2426)
---
.../apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java
index 59622a6..3151704 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java
@@ -82,6 +82,7 @@ public class ChannelEventRunnable implements Runnable {
logger.warn("ChannelEventRunnable handle " + state + "
operation error, channel is " + channel
+ ", message is " + message, e);
}
+break;
case CAUGHT:
try {
handler.caught(channel, exception);
[incubator-dubbo] branch master updated: format code style (#2475)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 038e87e format code style (#2475)
038e87e is described below
commit 038e87e69196613409722fc03e2f9737ea7b190c
Author: Jexy <839447...@qq.com>
AuthorDate: Tue Sep 11 12:54:46 2018 +0800
format code style (#2475)
---
.../src/main/java/org/apache/dubbo/qos/command/CommandContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java
index 744a8c6..0dae562 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.qos.command;
import io.netty.channel.Channel;
public class CommandContext {
+
private String commandName;
private String[] args;
private Channel remote;
@@ -29,7 +30,7 @@ public class CommandContext {
this.commandName = commandName;
}
-public CommandContext(String commandName, String[] args,boolean isHttp) {
+public CommandContext(String commandName, String[] args, boolean isHttp) {
this.commandName = commandName;
this.args = args;
this.isHttp = isHttp;
[incubator-dubbo] branch master updated: remove travis cache (#2481)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 7e5f080 remove travis cache (#2481) 7e5f080 is described below commit 7e5f080a6aac65d5f80f8f651884652ad314234e Author: Jerrick Zhu AuthorDate: Tue Sep 11 12:21:09 2018 +0800 remove travis cache (#2481) --- .travis.yml | 4 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26e0783..acf5d48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,6 @@ jdk: - oraclejdk9 - oraclejdk8 -cache: - directories: -- '$HOME/.m2/repository' - install: true script:
[incubator-dubbo-website] branch asf-site updated: fix typo (#147)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 0fd63b0 fix typo (#147)
0fd63b0 is described below
commit 0fd63b083caed42fe96beb2d20d448448722a2b6
Author: Song Kun
AuthorDate: Mon Sep 10 09:00:08 2018 +0800
fix typo (#147)
---
site_config/community.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/site_config/community.jsx b/site_config/community.jsx
index 3b2b4ad..d39dfcc 100644
--- a/site_config/community.jsx
+++ b/site_config/community.jsx
@@ -611,7 +611,7 @@ export default {
},
{
title: 'Cluster',
- content: Dubbo支持一下容错机制:,
+ content: Dubbo支持以下容错机制:,
tags: [
{
text: 'Fail over',
[incubator-dubbo] branch master updated: fix typo (#2458)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new ec66820 fix typo (#2458) ec66820 is described below commit ec668207f36f522dbd2d9ad5d05930b516245d98 Author: Song Kun AuthorDate: Fri Sep 7 08:46:04 2018 +0800 fix typo (#2458) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 463a111..4700ea5 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,7 @@ Please report security vulnerability to secur...@dubbo.incubator.apache.org (pri * [Node.js](https://github.com/dubbo/dubbo2.js) * [Python](https://github.com/dubbo/dubbo-client-py) -* [Php](https://github.com/dubbo/dubbo-php-framework) +* [PHP](https://github.com/dubbo/dubbo-php-framework) ## License
[incubator-dubbo-website] branch asf-site updated: Dubbo blog: Meet Dubbo (#141)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 9c9c016 Dubbo blog: Meet Dubbo (#141) 9c9c016 is described below commit 9c9c01697136a7476f6893308980a2c840075f5d Author: 时无两丶 <442367...@qq.com> AuthorDate: Thu Sep 6 20:47:37 2018 +0800 Dubbo blog: Meet Dubbo (#141) --- blog/zh-cn/meet-dubbo.md | 64 1 file changed, 64 insertions(+) diff --git a/blog/zh-cn/meet-dubbo.md b/blog/zh-cn/meet-dubbo.md new file mode 100644 index 000..1cb6d87 --- /dev/null +++ b/blog/zh-cn/meet-dubbo.md @@ -0,0 +1,64 @@ +--- +title: 遇见Dubbo +keywords: Dubbo, Committer +description: 本文记录了一个小白成长为Dubbo committer的过程。 +--- + +# 遇见Dubbo + +我是一个有Dubbo情节的程序员。 + +Dubbo以不同方式，陪伴了我时间不长的整个代码生涯。不久前，通过社区投票，我被选举为`Committer`。当时我在朋友圈发了一句话，也是贯穿我从开始使用Dubbo、研究Dubbo、贡献Dubbo到最后成为`Committer`的全过程，一直为我提供内心无与伦比愉悦的源泉：成长这种事，能看见脚印特别幸福。 + +今天来个回忆杀，把我和Dubbo的那些事拿出来说说。 + +## 小白 + +我知道Dubbo，是在我大三翘课出去实习的时候，那个时候是无知的，我眼里最牛的人就是能熟练使用各种配置，精通SSH框架的人。就是在那种情况下，我外出实习，遇到了一群影响我至今的人。当时也是机缘巧合，我们进行了两个非常小的模块的服务化改造。那时的团队除了我们老大，全是一群新兵蛋子，老大指哪我们打哪。老大说，就用Dubbo吧，从那时候开始，我才知道，哦！原来还有一种东西叫做RPC，还有个阿里巴巴的RPC框架叫Dubbo。 + +苦于当时非常有限的水平和高强度的工作，我和Dubbo的缘分也就停留在一面之缘的程度——要说认识谈不上，说不认识也牵强。 + +## Contributor + +我在二维火任职的一年算是我Dubbo生涯里承上启下的一年。二维火当时自己维护了一个Dubbo的分支，有一群对Dubbo非常了解的人。那时候，工作结束搞Dubbo，周六加班研究Dubbo。看源码，看不懂就debug一下，debug也不明白就问，问人，问google，里外折腾了个遍。 + +后来毕业加入网易云音乐。大概是今年五月份的时候，我发现了一个Dubbo的小bug，并且给Dubbo提交了pull request。在第一次被merge之后，非常受鼓舞，这才有了后续的故事。后来，回看这第一次提交，真的算是我和Dubbo的一个拐点，拐弯之后，我才逐渐走上一条成为`Committer`的路。 + +可能很多人看到这里要望而却步了，这也是做开源给很多人留下的固有的印象——是不是没发现BUG就不能提交pull request，不能做贡献？其实完全不是的，这里给大家敲黑板划重点：其实很多贡献者的第一次贡献，贡献的并非代码，而是文档修改或者单元测试。相比于BUG或者新的Feature，单测和文档上的修复门槛就比较低了。 + +我自己的方法论就是：**先尝试增加单元测试，写单测的时候顺手debug+看代码。或者多看文档，了解框架的同时，发现错别字、语意不明或者文档上的链接干脆点不开的情况，直接提交PR到对应的仓库**。 + +万事开头难。第一次被merge代码，你就可以成为一个`Contributor`了。`Contributor`很多，但是`Committer`很少，下面继续说怎么从一个`Contributor`成长为独当一面的`Committer`。 + +## Committer + +做开源和写代码一样，都不是一朝一夕的事情，而是量变促成质变的过程。这是一个没捷径可走的过程，欲带皇冠必承其重。身后的Dubbo功底自不必多说，这个部分主要是想跟大家说一下除了钻研和热爱之外，其他需要注意的地方。 + +首先是多提交高质量PR。任何一个PR都会被review，代码中的问题，思路上的偏差，都会被指正。提交PR是一个反复琢磨的过程。PR的质量不能简单的归结于新增了多少行代码，高质量的PR一定是经过缜密思考的，为什么删除代码，新增的代码有什么意义，修改之后有什么效果等等。希望大家更加重视质量而非数量，眼光放长远，相信你的收获一定会非常大！ + +第二个就是，我们需要培养一种思维方式——Apache Way。一句话概括就是**社区重于代码**。Apache是一个注重社区的的开源组织，其行为方式相比于目前我们的开发方式，还是有所不同，这里我举一个Apache Way的例子，用以说明传统方式相较于Apache Way的区别在哪里，这里假设我想为Dubbo开发一个功能A。 + +**Old Way**： + +1. 功能设计：做一个设计文档（根据功能大小而定），大概划定需要修改或新增的类，大体设计接口等。 +2. 开发代码。 +3. 提交PR。 +4. Review & Merge + +可以看到，我们整个过程中，真正与社区交互的只有最后一步。 + +**Apache Way**： + +1. 功能设计：发送邮件至mailing list并且提交ISSUE，与社区成员共同探讨，产出一个设计文档（根据功能大小而定），大概划定需要修改或新增的类，大体设计接口等。然后再次发送邮件并且回复ISSUE，通知社区设计文档定稿或者方案确定。 +2. 开发代码：发送邮件至社区，通知社区成员我即将投入开发功能A，如需帮助，可以同时说明需要协助。 +3. 提交PR：发送邮件并且回复ISSUE，提醒社区开发结束，贴上PR地址以通知社区review代码。 +4. Review + Merge后，发送邮件并且关闭ISSUE，通知社区功能A的开发功能告一段落。 + +可以看到，Apache Way就是在整个开发过程中，不断地与社区交互，最大发挥社区的功能，汲取众人之力，这才是所谓**社区**以及所谓**开源**的含义。 + +## 结尾 + +Dubbo目前还在孵化阶段，整个Dubbo社区还不完善，我们也在跟着Dubbo一起成长，我们非常希望更多的Dubbo爱好者深度参与到Dubbo中，为你的代码生涯树一个里程碑。 + +相信过程，收获结果；天道酬勤，功不唐捐！ +
[incubator-dubbo] branch master updated: [Dubbo-2413] Fix StreamUtils resource leak (#2414)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new d173e84 [Dubbo-2413] Fix StreamUtils resource leak (#2414)
d173e84 is described below
commit d173e841c41704d13e7357eb5704764353384963
Author: Yuhao Bi
AuthorDate: Thu Sep 6 19:22:51 2018 +0800
[Dubbo-2413] Fix StreamUtils resource leak (#2414)
---
.../org/apache/dubbo/common/io/StreamUtils.java| 6 +++
.../apache/dubbo/common/io/StreamUtilsTest.java| 47 --
2 files changed, 40 insertions(+), 13 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
index 9b52286..5798f02 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
@@ -98,6 +98,7 @@ public class StreamUtils {
@Override
public void close() throws IOException {
+is.close();
}
};
}
@@ -199,6 +200,11 @@ public class StreamUtils {
return available;
}
+
+@Override
+public void close() throws IOException {
+is.close();
+}
};
}
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/io/StreamUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/io/StreamUtilsTest.java
index b4dc1b6..2f8595f 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/io/StreamUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/io/StreamUtilsTest.java
@@ -79,6 +79,8 @@ public class StreamUtilsTest {
is.reset();
assertEquals(-1, is.read());
assertEquals(-1, is.read());
+
+is.close();
}
@Test
@@ -118,35 +120,54 @@ public class StreamUtilsTest {
@Test(expected = IOException.class)
public void testMarkInputSupport() throws IOException {
InputStream is =
StreamUtilsTest.class.getResourceAsStream("/StreamUtilsTest.txt");
-is = StreamUtils.markSupportedInputStream(new PushbackInputStream(is),
1);
-
-is.mark(1);
-int read = is.read();
-assertThat(read, is((int) '0'));
-
-is.skip(1);
-is.read();
+try {
+is = StreamUtils.markSupportedInputStream(new
PushbackInputStream(is), 1);
+
+is.mark(1);
+int read = is.read();
+assertThat(read, is((int) '0'));
+
+is.skip(1);
+is.read();
+} finally {
+if (is != null) {
+is.close();
+}
+}
}
@Test
-public void testSkipForOriginMarkSupportInput() {
+public void testSkipForOriginMarkSupportInput() throws IOException {
InputStream is =
StreamUtilsTest.class.getResourceAsStream("/StreamUtilsTest.txt");
InputStream newIs = StreamUtils.markSupportedInputStream(is, 1);
assertThat(newIs, is(is));
+is.close();
}
@Test(expected = NullPointerException.class)
public void testReadEmptyByteArray() throws IOException {
InputStream is =
StreamUtilsTest.class.getResourceAsStream("/StreamUtilsTest.txt");
-is = StreamUtils.limitedInputStream(is, 2);
-is.read(null, 0, 1);
+try {
+is = StreamUtils.limitedInputStream(is, 2);
+is.read(null, 0, 1);
+} finally {
+if (is != null) {
+is.close();
+}
+}
}
@Test(expected = IndexOutOfBoundsException.class)
public void testReadWithWrongOffset() throws IOException {
InputStream is =
StreamUtilsTest.class.getResourceAsStream("/StreamUtilsTest.txt");
-is = StreamUtils.limitedInputStream(is, 2);
-is.read(new byte[1], -1, 1);
+try {
+is = StreamUtils.limitedInputStream(is, 2);
+is.read(new byte[1], -1, 1);
+} finally {
+if (is != null) {
+is.close();
+}
+}
}
}
\ No newline at end of file
[incubator-dubbo-website] branch asf-site updated: build site
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ce4a2dd build site
ce4a2dd is described below
commit ce4a2dd1fa40a545f03044ff12f13198652bc9fc
Author: zhuyong
AuthorDate: Thu Sep 6 17:38:57 2018 +0800
build site
---
build/blog.js| 6 +--
build/blogDetail.js | 6 +--
build/community.js | 6 +--
build/documentation.js | 6 +--
build/home.js| 6 +--
en-us/docs/user/demos/service-container.html | 55 +-
en-us/docs/user/demos/service-container.json | 2 +-
zh-cn/docs/user/demos/service-container.html | 55 +-
zh-cn/docs/user/demos/service-container.json | 2 +-
zh-cn/docs/user/recommend.html | 58 +++-
zh-cn/docs/user/recommend.json | 2 +-
11 files changed, 106 insertions(+), 98 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 9fa054f..bd221da 100644
--- a/build/blog.js
+++ b/build/blog.js
@@ -1,6 +1,6 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=79) [...]
- Copyright (c) 2016 Jed Watson.
+!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=77) [...]
+ Copyright (c) 2017 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;t
- 中中http://dubbo.apache.org/books/dubbo-dev-book-en/impls/container.html;>Container
Extension Points. Configure it with the -D parameter in the java command
or dubbo.properties.
@@ -21,34 +21,35 @@
Automatically load all spring configurations in the
META-INF/spring.
-
+dubbo.spring.config=classpath*:META-INF/spring/*.xml
+
-dubbo.spring.config=classpath*:META-INF/spring/*.xml
-
-### Jetty Container
-
-* Start an embedded Jetty for reporting status.
-* Configure:
-* `dubbo.jetty.port=8080`: configure jetty start up port
-* `dubbo.jetty.directory=/foo/bar`: static file that can be visited by
jetty directly.
-* `dubbo.jetty.page=log,status,system`: configure the displayed page,
loading all pages by default
-
-
-### Log4j Container
-
-* Automatic configuration log4j configuration. At the start of the
multi-process, log files automatically by process sub-directory.
-* Configure:
-* `dubbo.log4j.file=/foo/bar.log`: configure log file path
-* `dubbo.log4j.level=WARN`: configure log level
-* `dubbo.log4j.subdirectory=20880`: configure log sub directory for
multi-process startup and avoiding conflict
-
-## Container startup
-
-load spring by default.
-
-```sh
-java com.alibaba.dubbo.container.Main
+Jetty Container
+
+Start an embedded Jetty for reporting status.
+Configure:
+
+dubbo.jetty.port=8080: configure jetty start up port
+dubbo.jetty.directory=/foo/bar: static file that can be
visited by jetty directly.
+dubbo.jetty.page=log,status,system: configure the displayed
page, loading all pages by default
+
+
+
+Log4j Container
+
+Automatic configuration log4j configuration. At the start of the
multi-process, log files automatically by process sub-directory.
+Configure:
+
+dubbo.log4j.file=/foo/bar.log: configure log file path
+dubbo.log4j.level=WARN: configure log level
+dubbo.log4j.subdirectory=20880: configure log sub directory
for multi-process startup and avoiding conflict
+
+
+
+Co
[incubator-dubbo-website] branch asf-site updated: fix markdown layout error (#140)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 41d9685 fix markdown layout error (#140) 41d9685 is described below commit 41d96850a0c73180f15eec77e10b3630d097dcba Author: ZhangXudong AuthorDate: Thu Sep 6 17:37:12 2018 +0800 fix markdown layout error (#140) --- docs/zh-cn/user/recommend.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh-cn/user/recommend.md b/docs/zh-cn/user/recommend.md index 6dcc6e0..902e244 100644 --- a/docs/zh-cn/user/recommend.md +++ b/docs/zh-cn/user/recommend.md @@ -145,8 +145,8 @@ Dubbo 中所有的配置项都可以配置在 Spring 配置文件中，并且可 4. 服务提供者协议 `dubbo.service.protocol`、服务的监听端口 `dubbo.service.server.port` ```xml - -``` + +``` 5. 服务线程池大小 `dubbo.service.max.thread.threads.size`
[incubator-dubbo-docs] branch diecui1202-patch-1 deleted (was 4b69bb2)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch diecui1202-patch-1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-docs.git. was 4b69bb2 add guide to website The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-dubbo-docs] branch master updated (4687ecf -> b463da6)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-docs.git. from 4687ecf Merge pull request #40 from nzomkxia/link-fix add 4b69bb2 add guide to website new b463da6 Merge pull request #45 from apache/diecui1202-patch-1 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. Summary of changes: README.md | 2 ++ 1 file changed, 2 insertions(+)
[incubator-dubbo-website] branch asf-site updated: markdown layout error (#137)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 98d472e markdown layout error (#137) 98d472e is described below commit 98d472ef12eac2ccac7f470d92140983e81f606f Author: ZhangXudong AuthorDate: Thu Sep 6 15:03:02 2018 +0800 markdown layout error (#137) --- docs/zh-cn/user/demos/service-container.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh-cn/user/demos/service-container.md b/docs/zh-cn/user/demos/service-container.md index 75d9755..12c3efa 100644 --- a/docs/zh-cn/user/demos/service-container.md +++ b/docs/zh-cn/user/demos/service-container.md @@ -14,8 +14,8 @@ * 配置 spring 配置加载位置： ```properties -dubbo.spring.config=classpath*:META-INF/spring/*.xml -``` +dubbo.spring.config=classpath*:META-INF/spring/*.xml +``` ### Jetty Container
[incubator-dubbo] branch 2.6.x updated: Qos enhancement, take #2153 back to 2.6.x (#2455)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 97d20a3 Qos enhancement, take #2153 back to 2.6.x (#2455)
97d20a3 is described below
commit 97d20a362284623f2220f834c7e6498ffe3c951b
Author: Jerrick Zhu
AuthorDate: Thu Sep 6 11:45:34 2018 +0800
Qos enhancement, take #2153 back to 2.6.x (#2455)
---
.../com/alibaba/dubbo/config/ApplicationConfig.java | 3 +++
.../alibaba/dubbo/qos/protocol/QosProtocolWrapper.java | 17 +
.../dubbo/registry/integration/RegistryProtocol.java| 17 -
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ApplicationConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ApplicationConfig.java
index 9238a11..523e005 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ApplicationConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ApplicationConfig.java
@@ -71,10 +71,13 @@ public class ApplicationConfig extends AbstractConfig {
// directory for saving thread dump
private String dumpDirectory;
+// whether to enable qos or not
private Boolean qosEnable;
+// the qos port to listen
private Integer qosPort;
+// should we accept foreign ip or not?
private Boolean qosAcceptForeignIp;
// customized parameters
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java
b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java
index 26692cc..73d1f56 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java
@@ -18,6 +18,8 @@ package com.alibaba.dubbo.qos.protocol;
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.logger.Logger;
+import com.alibaba.dubbo.common.logger.LoggerFactory;
import com.alibaba.dubbo.qos.server.Server;
import com.alibaba.dubbo.rpc.Exporter;
import com.alibaba.dubbo.rpc.Invoker;
@@ -29,8 +31,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import static com.alibaba.dubbo.common.Constants.ACCEPT_FOREIGN_IP;
import static com.alibaba.dubbo.common.Constants.QOS_ENABLE;
import static com.alibaba.dubbo.common.Constants.QOS_PORT;
+import static com.alibaba.dubbo.qos.common.QosConstants.DEFAULT_PORT;
public class QosProtocolWrapper implements Protocol {
+
+private final Logger logger =
LoggerFactory.getLogger(QosProtocolWrapper.class);
+
private static AtomicBoolean hasStarted = new AtomicBoolean(false);
private Protocol protocol;
@@ -76,20 +82,23 @@ public class QosProtocolWrapper implements Protocol {
}
try {
-boolean qosEnable =
Boolean.parseBoolean(url.getParameter(QOS_ENABLE,"true"));
+boolean qosEnable = url.getParameter(QOS_ENABLE,true);
if (!qosEnable) {
+logger.info("qos won't be started because it is disabled. " +
+"Please check dubbo.application.qos.enable is
configured either in system property, " +
+"dubbo.properties or XML/spring boot configuration.");
return;
}
-int port = Integer.parseInt(url.getParameter(QOS_PORT,"2"));
-boolean acceptForeignIp =
Boolean.parseBoolean(url.getParameter(ACCEPT_FOREIGN_IP,"true"));
+int port = url.getParameter(QOS_PORT, DEFAULT_PORT);
+boolean acceptForeignIp =
Boolean.parseBoolean(url.getParameter(ACCEPT_FOREIGN_IP,"false"));
Server server = com.alibaba.dubbo.qos.server.Server.getInstance();
server.setPort(port);
server.setAcceptForeignIp(acceptForeignIp);
server.start();
} catch (Throwable throwable) {
-//throw new RpcException("fail to start qos server", throwable);
+logger.warn("Fail to start qos server: ", throwable);
}
}
}
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
index fd414ed..e1a59b9 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
@@ -135,26 +13
[incubator-dubbo] branch 2.6.x updated: upgrade javadoc to 3.0.1 (#2454)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/2.6.x by this push: new 7ece161 upgrade javadoc to 3.0.1 (#2454) 7ece161 is described below commit 7ece1615389174d091b194b46baceb41a7ed4946 Author: Jerrick Zhu AuthorDate: Thu Sep 6 11:11:36 2018 +0800 upgrade javadoc to 3.0.1 (#2454) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69aa46e..43a160c 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 2.8.2 3.6.0 3.0.1 -3.0.0 +3.0.1 6.1.26 3.0.0 0.8.1
[incubator-dubbo] branch 2.6.x updated: fix telnet invoke NPE #2218 (#2273) (#2453)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 52e9290 fix telnet invoke NPE #2218 (#2273) (#2453)
52e9290 is described below
commit 52e9290d12162d1d483b21070729e7f2c6a04733
Author: Jerrick Zhu
AuthorDate: Thu Sep 6 09:57:44 2018 +0800
fix telnet invoke NPE #2218 (#2273) (#2453)
---
.../protocol/dubbo/telnet/InvokeTelnetHandler.java | 13
.../rpc/protocol/dubbo/support/DemoService.java| 2 ++
.../protocol/dubbo/support/DemoServiceImpl.java| 5 +++
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 36 ++
4 files changed, 56 insertions(+)
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
index 47f11f5..59733dc 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
@@ -60,6 +60,19 @@ public class InvokeTelnetHandler implements TelnetHandler {
for (int i = 0; i < types.length; i++) {
Class type = types[i];
Object arg = args.get(i);
+
+if (arg == null) {
+// if the type is primitive, the method to invoke will cause
NullPointerException definitely
+// so we can offer a specified error message to the invoker in
advance and avoid unnecessary invoking
+if (type.isPrimitive()) {
+throw new NullPointerException(String.format(
+"The type of No.%d parameter is primitive(%s), but
the value passed is null.", i + 1, type.getName()));
+}
+
+// if the type is not primitive, we choose to believe what the
invoker want is a null value
+continue;
+}
+
if (ReflectUtils.isPrimitive(arg.getClass())) {
if (!ReflectUtils.isPrimitive(type)) {
return false;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
index 182a1e8..93c48f5 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
@@ -57,4 +57,6 @@ public interface DemoService {
NonSerialized returnNonSerialized();
+long add(int a, long b);
+
}
\ No newline at end of file
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
index 93c9764..50d98e6 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
@@ -103,4 +103,9 @@ public class DemoServiceImpl implements DemoService {
public NonSerialized returnNonSerialized() {
return new NonSerialized();
}
+
+public long add(int a, long b) {
+return a + b;
+}
+
}
\ No newline at end of file
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
index 04092d0..9dfc20f 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
@@ -33,6 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
@@ -70,6 +71,41 @@ public class InvokerTelnetHandlerTest {
@SuppressWarnings("unchecked")
@Test
+public void testInvokeByPassingNullValue() throws RemotingException {
+mockInvoker = mock(Invoker.class);
+given(mockInvoker.getInterface()).willReturn(DemoService.class);
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+
[incubator-dubbo] branch telnet-npe-2.6.x deleted (was 2ca0af7)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch telnet-npe-2.6.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was 2ca0af7 fix telnet invoke NPE #2218 (#2273) This change permanently discards the following revisions: discard 2ca0af7 fix telnet invoke NPE #2218 (#2273)
[incubator-dubbo] branch telnet-npe-2.6.x created (now 2ca0af7)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a change to branch telnet-npe-2.6.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at 2ca0af7 fix telnet invoke NPE #2218 (#2273) This branch includes the following new commits: new 2ca0af7 fix telnet invoke NPE #2218 (#2273) 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-dubbo] 01/01: fix telnet invoke NPE #2218 (#2273)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch telnet-npe-2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 2ca0af73942d2c9ebcb3ead8eecdc0940bd7bb43
Author: Michael Chow
AuthorDate: Fri Aug 17 11:12:21 2018 +0800
fix telnet invoke NPE #2218 (#2273)
* fix issue #2218
* add some unit tests
---
.../protocol/dubbo/telnet/InvokeTelnetHandler.java | 13
.../rpc/protocol/dubbo/support/DemoService.java| 2 ++
.../protocol/dubbo/support/DemoServiceImpl.java| 5 +++
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 36 ++
4 files changed, 56 insertions(+)
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
index 47f11f5..59733dc 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
@@ -60,6 +60,19 @@ public class InvokeTelnetHandler implements TelnetHandler {
for (int i = 0; i < types.length; i++) {
Class type = types[i];
Object arg = args.get(i);
+
+if (arg == null) {
+// if the type is primitive, the method to invoke will cause
NullPointerException definitely
+// so we can offer a specified error message to the invoker in
advance and avoid unnecessary invoking
+if (type.isPrimitive()) {
+throw new NullPointerException(String.format(
+"The type of No.%d parameter is primitive(%s), but
the value passed is null.", i + 1, type.getName()));
+}
+
+// if the type is not primitive, we choose to believe what the
invoker want is a null value
+continue;
+}
+
if (ReflectUtils.isPrimitive(arg.getClass())) {
if (!ReflectUtils.isPrimitive(type)) {
return false;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
index 182a1e8..93c48f5 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java
@@ -57,4 +57,6 @@ public interface DemoService {
NonSerialized returnNonSerialized();
+long add(int a, long b);
+
}
\ No newline at end of file
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
index 93c9764..50d98e6 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java
@@ -103,4 +103,9 @@ public class DemoServiceImpl implements DemoService {
public NonSerialized returnNonSerialized() {
return new NonSerialized();
}
+
+public long add(int a, long b) {
+return a + b;
+}
+
}
\ No newline at end of file
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
index 04092d0..9dfc20f 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
@@ -33,6 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
@@ -70,6 +71,41 @@ public class InvokerTelnetHandlerTest {
@SuppressWarnings("unchecked")
@Test
+public void testInvokeByPassingNullValue() throws RemotingException {
+mockInvoker = mock(Invoker.class);
+given(mockInvoker.getInterface()).willReturn(DemoService.class);
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"))
[incubator-dubbo] branch 2.6.x updated: Direct return when the server goes down unnormally. (#2451)
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 8ae95c9 Direct return when the server goes down unnormally. (#2451)
8ae95c9 is described below
commit 8ae95c954228f1637d21b037df218a3ed94231c7
Author: 时无两丶 <442367...@qq.com>
AuthorDate: Thu Sep 6 09:26:12 2018 +0800
Direct return when the server goes down unnormally. (#2451)
---
.../alibaba/dubbo/remoting/exchange/Response.java | 5 +
.../remoting/exchange/support/DefaultFuture.java | 23 ++
.../support/header/HeaderExchangeHandler.java | 1 +
3 files changed, 29 insertions(+)
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Response.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Response.java
index 0422a06..d01d20d 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Response.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Response.java
@@ -41,6 +41,11 @@ public class Response {
public static final byte SERVER_TIMEOUT = 31;
/**
+ * channel inactive, directly return the unfinished requests.
+ */
+public static final byte CHANNEL_INACTIVE = 35;
+
+/**
* request format error.
*/
public static final byte BAD_REQUEST = 40;
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java
index eccc86d..a72fadc 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java
@@ -90,6 +90,29 @@ public class DefaultFuture implements ResponseFuture {
}
}
+/**
+ * close a channel when a channel is inactive
+ * directly return the unfinished requests.
+ *
+ * @param channel channel to close
+ */
+public static void closeChannel(Channel channel) {
+for (long id : CHANNELS.keySet()) {
+if (channel.equals(CHANNELS.get(id))) {
+DefaultFuture future = getFuture(id);
+if (future != null && !future.isDone()) {
+Response disconnectResponse = new Response(future.getId());
+disconnectResponse.setStatus(Response.CHANNEL_INACTIVE);
+disconnectResponse.setErrorMessage("Channel " +
+channel +
+" is inactive. Directly return the unFinished
request : " +
+future.getRequest());
+DefaultFuture.received(channel, disconnectResponse);
+}
+}
+}
+}
+
public static void received(Channel channel, Response response) {
try {
DefaultFuture future = FUTURES.remove(response.getId());
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java
index 3c37817..f44318f 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java
@@ -123,6 +123,7 @@ public class HeaderExchangeHandler implements
ChannelHandlerDelegate {
try {
handler.disconnected(exchangeChannel);
} finally {
+DefaultFuture.closeChannel(channel);
HeaderExchangeChannel.removeChannelIfDisconnected(channel);
}
}
[incubator-dubbo-website] branch asf-site updated: add English blog title
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ccdd1e8 add English blog title
ccdd1e8 is described below
commit ccdd1e8f8ecee3fd9c9ff08bd3444a6513d99096
Author: zhuyong
AuthorDate: Wed Sep 5 08:57:35 2018 +0800
add English blog title
---
en-us/blog/dubbo-101.html | 6 +--
en-us/blog/dubbo-101.json | 5 ++-
en-us/blog/dubbo-annotation.html | 6 +--
en-us/blog/dubbo-annotation.json | 5 ++-
...o-basic-usage-dubbo-provider-configuration.html | 8 ++--
...o-basic-usage-dubbo-provider-configuration.json | 5 ++-
en-us/blog/dubbo-generic-invoke.html | 6 +--
en-us/blog/dubbo-generic-invoke.json | 5 ++-
en-us/blog/dubbo-invoke.html | 6 +--
en-us/blog/dubbo-invoke.json | 5 ++-
en-us/blog/dubbo-k8s.html | 38 +-
en-us/blog/dubbo-k8s.json | 5 ++-
en-us/blog/dubbo-loadbalance.html | 6 +--
en-us/blog/dubbo-loadbalance.json | 5 ++-
en-us/blog/dubbo-meetup-beijing-may-12th-2018.html | 6 +--
en-us/blog/dubbo-meetup-beijing-may-12th-2018.json | 5 ++-
.../blog/dubbo-meetup-shanghai-jun-23rd-2018.html | 6 +--
.../blog/dubbo-meetup-shanghai-jun-23rd-2018.json | 5 ++-
en-us/blog/dubbo-new-async.html| 8 ++--
en-us/blog/dubbo-new-async.json| 5 ++-
en-us/blog/dubbo-zk.html | 6 +--
en-us/blog/dubbo-zk.json | 5 ++-
en-us/blog/dubbo2-js.html | 8 ++--
en-us/blog/dubbo2-js.json | 5 ++-
en-us/blog/introduction-to-dubbo-qos.html | 6 +--
en-us/blog/introduction-to-dubbo-qos.json | 5 ++-
en-us/blog/introduction-to-dubbo-spi-2.html| 6 +--
en-us/blog/introduction-to-dubbo-spi-2.json| 5 ++-
en-us/blog/introduction-to-dubbo-spi.html | 8 ++--
en-us/blog/introduction-to-dubbo-spi.json | 5 ++-
en-us/blog/pinpoint.html | 6 +--
en-us/blog/pinpoint.json | 5 ++-
en-us/blog/prepare-an-apache-release.html | 4 +-
en-us/blog/prepare-an-apache-release.json | 4 +-
en-us/blog/sentinel-introduction-for-dubbo.html| 6 +--
en-us/blog/sentinel-introduction-for-dubbo.json| 5 ++-
.../spring-boot-dubbo-start-stop-analysis.html | 6 +--
.../spring-boot-dubbo-start-stop-analysis.json | 5 ++-
en-us/blog/tracing-with-skywalking.html| 6 +--
en-us/blog/tracing-with-skywalking.json| 5 ++-
zh-cn/blog/dubbo-k8s.html | 46 +++---
zh-cn/blog/dubbo-k8s.json | 4 +-
.../blog/dubbo-meetup-shanghai-jun-23rd-2018.html | 6 +--
.../blog/dubbo-meetup-shanghai-jun-23rd-2018.json | 5 ++-
zh-cn/blog/dubbo-meetup-shenzhen.html | 6 +--
zh-cn/blog/dubbo-meetup-shenzhen.json | 5 ++-
zh-cn/blog/introduction-to-dubbo-spi-2.html| 2 +-
zh-cn/blog/introduction-to-dubbo-spi-2.json| 3 +-
.../spring-boot-dubbo-start-stop-analysis.html | 2 +-
.../spring-boot-dubbo-start-stop-analysis.json | 3 +-
zh-cn/blog/tracing-with-skywalking.html| 2 +-
zh-cn/blog/tracing-with-skywalking.json| 3 +-
zh-cn/docs/user/demos/explicit-target.html | 4 +-
zh-cn/docs/user/demos/explicit-target.json | 2 +-
zh-cn/docs/user/maturity.html | 4 +-
zh-cn/docs/user/maturity.json | 2 +-
56 files changed, 212 insertions(+), 144 deletions(-)
diff --git a/en-us/blog/dubbo-101.html b/en-us/blog/dubbo-101.html
index 54cffa6..d8d167e 100644
--- a/en-us/blog/dubbo-101.html
+++ b/en-us/blog/dubbo-101.html
@@ -4,10 +4,10 @@
-
-
+
+
- dubbo-101
+ Your First Dubbo Demo
diff --git a/en-us/blog/dubbo-101.json b/en-us/blog/dubbo-101.json
index 11284ad..99bbcf8 100644
--- a/en-us/blog/dubbo-101.json
+++ b/en-us/blog/dubbo-101.json
@@ -1,4 +1,7 @@
{
"filename": "dubbo-101.md",
- "__html": "Your First Dubbo Demo\nJava RMI
Introduction\nJava RMI (Remote Method Invocation) is a mechanism that
allows users to access or invocate an object and a method running on another
JVM (Java Virtual Machine). RMI is an implementation of RPC (Remote Procedure
Call) in java with support of OOP (Object Oriented Paradigms). Instead of
bothering IDL (Interface Define Language), users can build distributed
applications by depending on interfaces in an
[incubator-dubbo-website] branch asf-site updated: add title, keywords, descriptions to English blogs (#132)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 9792980 add title, keywords, descriptions to English blogs (#132) 9792980 is described below commit 979298047a779cc1d3edafd4ecc6029e74999574 Author: Song Kun AuthorDate: Wed Sep 5 08:56:33 2018 +0800 add title, keywords, descriptions to English blogs (#132) --- blog/en-us/dubbo-101.md| 6 blog/en-us/dubbo-annotation.md | 6 ...bbo-basic-usage-dubbo-provider-configuration.md | 8 - blog/en-us/dubbo-generic-invoke.md | 6 blog/en-us/dubbo-invoke.md | 5 +++ blog/en-us/dubbo-k8s.md| 36 +++- blog/en-us/dubbo-loadbalance.md| 8 +++-- blog/en-us/dubbo-meetup-beijing-may-12th-2018.md | 6 blog/en-us/dubbo-meetup-shanghai-jun-23rd-2018.md | 6 blog/en-us/dubbo-new-async.md | 9 - blog/en-us/dubbo-zk.md | 6 blog/en-us/dubbo2-js.md| 10 +- blog/en-us/introduction-to-dubbo-qos.md| 6 blog/en-us/introduction-to-dubbo-spi-2.md | 6 blog/en-us/introduction-to-dubbo-spi.md| 8 - blog/en-us/pinpoint.md | 6 blog/en-us/prepare-an-apache-release.md| 5 +++ blog/en-us/sentinel-introduction-for-dubbo.md | 6 .../en-us/spring-boot-dubbo-start-stop-analysis.md | 6 blog/en-us/tracing-with-skywalking.md | 28 blog/zh-cn/dubbo-k8s.md| 38 -- blog/zh-cn/dubbo-meetup-shanghai-jun-23rd-2018.md | 6 blog/zh-cn/dubbo-meetup-shenzhen.md| 6 blog/zh-cn/introduction-to-dubbo-spi-2.md | 1 + .../zh-cn/spring-boot-dubbo-start-stop-analysis.md | 1 + blog/zh-cn/tracing-with-skywalking.md | 1 + docs/zh-cn/user/demos/explicit-target.md | 2 +- docs/zh-cn/user/maturity.md| 2 +- 28 files changed, 198 insertions(+), 42 deletions(-) diff --git a/blog/en-us/dubbo-101.md b/blog/en-us/dubbo-101.md index 2a4f2dc..01e6937 100644 --- a/blog/en-us/dubbo-101.md +++ b/blog/en-us/dubbo-101.md @@ -1,3 +1,9 @@ +--- +title: Your First Dubbo Demo +keywords: Dubbo, RPC, RMI +description: Modern distributed frameworks is similiar to RMI in terms of concepts. They both use Java interface as a service contract, archive service registry and discovery by a registry center, and Shield communication details by a proxy. +--- + # Your First Dubbo Demo ## Java RMI Introduction diff --git a/blog/en-us/dubbo-annotation.md b/blog/en-us/dubbo-annotation.md index 4ab206e..6e90411 100644 --- a/blog/en-us/dubbo-annotation.md +++ b/blog/en-us/dubbo-annotation.md @@ -1,3 +1,9 @@ +--- +title: Use Annotations In Dubbo +keywords: Dubbo, Annotation, Spring +description: This article will introduce you how to use annotations instead of XML to develop Dubbo applications, such as `@EnableDubbo`, `@Service` and `@Reference`. +--- + # Use Annotations In Dubbo With the widely promotion and implementation of Microservices Architecture, the Microservices Architecture represented by Spring Boot and Spring Cloud, in Java ecosystem, introduced some brand new programming model, like: diff --git a/blog/en-us/dubbo-basic-usage-dubbo-provider-configuration.md b/blog/en-us/dubbo-basic-usage-dubbo-provider-configuration.md index 8f0d26b..f674e08 100644 --- a/blog/en-us/dubbo-basic-usage-dubbo-provider-configuration.md +++ b/blog/en-us/dubbo-basic-usage-dubbo-provider-configuration.md @@ -1,4 +1,10 @@ -Dubbo Basic Usage-Dubbo Provider Configuration +--- +title: Dubbo Basic Usage -- Dubbo Provider Configuration +keywords: Dubbo, Provider, Configuration +description: This article will introduce you how to config Dubbo, by XML, property files, annotations or Java code. +--- + +Dubbo Basic Usage -- Dubbo Provider Configuration --- # Dubbo Basic Usage diff --git a/blog/en-us/dubbo-generic-invoke.md b/blog/en-us/dubbo-generic-invoke.md index 98f7fbf..5d8f0b1 100644 --- a/blog/en-us/dubbo-generic-invoke.md +++ b/blog/en-us/dubbo-generic-invoke.md @@ -1,3 +1,9 @@ +--- +title: Generic invoke of Dubbo +keywords: Dubbo, Generic invoke +description: This article introduces you when and how to use generic invoke of Dubbo. +--- + # Generic invoke of Dubbo The generic invoke could be considered to be used in the following cases: diff --git a/blog/en-us/dubbo-invoke.md b/blog/en-us/dubbo-invoke.md index ab51e2d..56422dd 100644 --- a/blog/en-us/dubbo-invoke.md +++ b/blog/en-us/dubbo-invoke.md @@ -1,3 +1,8 @@ +--- +title: Dubbo: Several ways about
[incubator-dubbo-website] branch asf-site updated: add compatible
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 469b327 add compatible
469b327 is described below
commit 469b3273df1925b34ab0b4d27270b0aefd572a0c
Author: zhuyong
AuthorDate: Tue Sep 4 16:46:27 2018 +0800
add compatible
---
...bbo-basic-usage-dubbo-provider-configuration.md | 2 +-
blog/zh-cn/dubbo-compatible.md | 197
blog/zh-cn/dubbo-contribue-to-opensource.md| 2 +-
blog/zh-cn/dubbo-meetup-chengdu.md | 4 +-
blog/zh-cn/dubbo-meetup-shanghai-jun-23rd-2018.md | 4 +-
blog/zh-cn/dubbo-meetup-shenzhen.md| 4 +-
blog/zh-cn/introduction-to-dubbo-spi.md| 1 -
blog/zh-cn/optimization-branch-prediction.md | 1 -
build/blog.js | 2 +-
site_config/blog.js| 7 +
...o-basic-usage-dubbo-provider-configuration.html | 3 +-
...o-basic-usage-dubbo-provider-configuration.json | 2 +-
zh-cn/blog/dubbo-compatible.html | 198 +
zh-cn/blog/dubbo-compatible.json | 7 +
zh-cn/blog/dubbo-contribue-to-opensource.html | 3 +-
zh-cn/blog/dubbo-contribue-to-opensource.json | 2 +-
zh-cn/blog/dubbo-meetup-chengdu.html | 2 +-
zh-cn/blog/dubbo-meetup-chengdu.json | 2 +-
.../blog/dubbo-meetup-shanghai-jun-23rd-2018.html | 2 +-
.../blog/dubbo-meetup-shanghai-jun-23rd-2018.json | 2 +-
zh-cn/blog/dubbo-meetup-shenzhen.html | 2 +-
zh-cn/blog/dubbo-meetup-shenzhen.json | 2 +-
zh-cn/blog/index.html | 2 +-
zh-cn/blog/introduction-to-dubbo-spi.html | 3 +-
zh-cn/blog/introduction-to-dubbo-spi.json | 2 +-
zh-cn/blog/optimization-branch-prediction.html | 3 +-
zh-cn/blog/optimization-branch-prediction.json | 2 +-
27 files changed, 433 insertions(+), 30 deletions(-)
diff --git a/blog/zh-cn/dubbo-basic-usage-dubbo-provider-configuration.md
b/blog/zh-cn/dubbo-basic-usage-dubbo-provider-configuration.md
index 09a9a45..e4349f5 100644
--- a/blog/zh-cn/dubbo-basic-usage-dubbo-provider-configuration.md
+++ b/blog/zh-cn/dubbo-basic-usage-dubbo-provider-configuration.md
@@ -5,7 +5,7 @@ description: 主要讲述如何配置dubbo，按照配置方式上可以分为
---
# Dubbo基本用法之Provider配置
+
## Dubbo基本用法
diff --git a/blog/zh-cn/dubbo-compatible.md b/blog/zh-cn/dubbo-compatible.md
new file mode 100644
index 000..dd64448
--- /dev/null
+++ b/blog/zh-cn/dubbo-compatible.md
@@ -0,0 +1,197 @@
+---
+title: Dubbo 2.7.x repackage后的兼容实现方案
+keywords: Dubbo, repackage, 兼容
+description: 本文简单描述了2.7.x repackage后对老版本的兼容性实现方案。
+---
+
+# Dubbo 2.7.x repackage后的兼容实现方案
+
+Dubbo至加入Apache孵化器以来，一个很强的诉求就是需要rename groupId和package
name，这两项工作在项目毕业前需要完成。其中rename
package相对来说复杂一些，除了要修改所有类的包名为`org.apache.dubbo`外，更多的是需要考虑如何老版本的兼容性。
+
+常见的兼容性包括但不限于以下几种情况：
+
+* 用户API
+ * 编程API
+ * Spring注解
+* 扩展SPI
+ * 扩展Filter
+
+2.7.x里就是通过增加了一个新的模块`dubbo-compatible`来解决以上兼容性问题。
+
+## 编程使用API
+
+编程使用API是最直接最原始的使用方式，其他方式诸如Spring schema、注解等方式都是基于原始API的；因此非常有必要对API编程形式进行兼容。
+
+所有编程相关API的兼容代码均在`com.alibaba.dubbo.config`包下，下面我们看看几个常见API的兼容实现。
+
+### ApplicationConfig
+
+```java
+package com.alibaba.dubbo.config;
+
+@Deprecated
+public class ApplicationConfig extends
org.apache.dubbo.config.ApplicationConfig {
+
+public ApplicationConfig() {
+super();
+}
+
+public ApplicationConfig(String name) {
+super(name);
+}
+}
+```
+
+### ProtocolConfig
+
+```java
+package com.alibaba.dubbo.config;
+
+@Deprecated
+public class ProtocolConfig extends org.apache.dubbo.config.ProtocolConfig {
+
+public ProtocolConfig() {
+}
+
+public ProtocolConfig(String name) {
+super(name);
+}
+
+public ProtocolConfig(String name, int port) {
+super(name, port);
+}
+}
+```
+
+可以看到：
+
+1. 兼容类是直接通过继续repacakge后的类，达到最大程度的代码复用；
+2. 构造函数也需要保持兼容；
+
+整个兼容包中，除了上述API以外，包括一些常用的类比如`Constants`、`URL`以及绝大部分的兼容类都是通过简单的继承，让用户基于老的API实现的类能正确运行。
+
+## Spring注解
+
+Spring注解诸如`@EnableDubbo`、`@Service`以及`@Reference`，由于不能使用继承，故这些注解类是通过代码拷贝来实现的；用于处理这些注解的Spring
BeanPostProcessor以及Parser等相关的类，也是通过拷贝来实现；
+
+这类兼容代码分别位于兼容包的以下几个package中：
+
+* com.alibaba.dubbo.config.annotation
+* com.alibaba.dubbo.config.spring.context.annotation
+* org.apache.dubbo.config.spring
+
+所以这里要特别强调的是，这类代码在2.7.x里存在2份，因此有修改的同时需要同步修改。
+
+## 扩展SPI
+
+Dubbo的SPI扩展机制，可以通过[Dubbo可扩展机制实战](http://dubbo.apache.org/zh-cn/blog/introduction-to-dubbo-spi.html)这篇博客详细了解。
+
+以Filter扩展为例，简单来说就是：
+
+1. MyFilter需要实现Filter接口
+2. 在META-INF/dubbo下，增加META-INF/dubbo/com.alibaba.dubbo.rpc.Filter，内容为：
+
+ ```
+ myFilter=com.test.MyFilter
+ ```
+
+看似简单的两点，对Dubbo框架来说，需要：
+
+1. 正确加载配置文件META-INF/dubbo
[incubator-dubbo-website] branch asf-site updated: fix typo
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 21d0500 fix typo
21d0500 is described below
commit 21d0500d02093dfe8000ed001c352821ebaa5912
Author: zhuyong
AuthorDate: Tue Sep 4 13:31:16 2018 +0800
fix typo
---
blog/zh-cn/how-to-involve-dubbo-community.md | 2 +-
zh-cn/blog/how-to-involve-dubbo-community.html | 4 ++--
zh-cn/blog/how-to-involve-dubbo-community.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/blog/zh-cn/how-to-involve-dubbo-community.md
b/blog/zh-cn/how-to-involve-dubbo-community.md
index 0fb4d8d..1aa3218 100644
--- a/blog/zh-cn/how-to-involve-dubbo-community.md
+++ b/blog/zh-cn/how-to-involve-dubbo-community.md
@@ -109,4 +109,4 @@ Dubbo正在成为Apache顶级项目的路上——Apache孵化项目中。
希望越来越多的公司团队和个人能够贡献到国际化的开源社区里去，一起打造我们中国的开源品牌！也希望大家都能愉快去贡献，罗马非一日建成，但付出一定会有回报。
-这里透露一个小福利，所有Apache Committer可以免费使用InteliJ的全套付费产品，包括全宇宙最好用的IDEA。
\ No newline at end of file
+这里透露一个小福利，所有Apache Committer可以免费使用IntelliJ的全套付费产品，包括全宇宙最好用的IDEA。
\ No newline at end of file
diff --git a/zh-cn/blog/how-to-involve-dubbo-community.html
b/zh-cn/blog/how-to-involve-dubbo-community.html
index 0795afe..4a081f4 100644
--- a/zh-cn/blog/how-to-involve-dubbo-community.html
+++ b/zh-cn/blog/how-to-involve-dubbo-community.html
@@ -12,7 +12,7 @@
- EnEn
前言
本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题，相反，我们认为这个话题非常重要，甚至建议这个话题以后每次meetup都要讲。
@@ -86,7 +86,7 @@
进⼊ Apache 分为三个阶段，准备阶段、孵化阶段和毕业阶段。准备阶段需要做的事情有找到愿意帮助孵化的导师，向Apache
提交进⼊孵化的申请，经过导师们讨论并投票，如果通过的话就可以进⼊入孵化。孵化阶段分为两大环节，第⼀个环节是公司和个人签署协议向Apache
移交代码和知识产权，之后就是在导师的指导下按照Apache的规范做版本迭代、社区运营、发展更多的Committer；如果最终通过了成熟度评估，就可以顺利毕业成为Apache的顶级项目。
结语
希望越来越多的公司团队和个人能够贡献到国际化的开源社区里去，一起打造我们中国的开源品牌！也希望大家都能愉快去贡献，罗马非一日建成，但付出一定会有回报。
-这里透露一个小福利，所有Apache Committer可以免费使用InteliJ的全套付费产品，包括全宇宙最好用的IDEA。
+这里透露一个小福利，所有Apache Committer可以免费使用IntelliJ的全套付费产品，包括全宇宙最好用的IDEA。
DisclaimerApache Dubbo is an effort undergoing incubation at The Apache
Software Foundation (ASF), sponsored by the Incubator. Incubatio [...]
https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"</a>;>
https://f.alicdn.com/react/15.4.1/react-dom.min.js"</a>;>
diff --git a/zh-cn/blog/how-to-involve-dubbo-community.json
b/zh-cn/blog/how-to-involve-dubbo-community.json
index a237647..8a87f59 100644
--- a/zh-cn/blog/how-to-involve-dubbo-community.json
+++ b/zh-cn/blog/how-to-involve-dubbo-community.json
@@ -1,6 +1,6 @@
{
"filename": "how-to-involve-dubbo-community.md",
- "__html": "如何参与贡献Dubbo社区\n\n前言\n本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题，相反，我们认为这个话题非常重要，甚至建议这个话题以后每次meetup都要讲。\nDubbo的发展历史大家应该并不陌生了，这里我还是简单回顾一下。Dubbo于2011年在github开源，后面几年由于一些原因停止了维护，直接去年7月份阿里重启维护，并于2018年2月16日捐献给Apache。\n为什么会选择捐献给Apache，主要是为了打消社区对Dubbo未来发展的顾虑，给Dubbo用户足够的信心；Apache认为社区大于代码，非常注重多样性，强调一个项⽬需要有多个公司和个人贡献者参与，现在Dubbo的发展完全是按The
[...]
+ "__html": "如何参与贡献Dubbo社区\n\n前言\n本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题，相反，我们认为这个话题非常重要，甚至建议这个话题以后每次meetup都要讲。\nDubbo的发展历史大家应该并不陌生了，这里我还是简单回顾一下。Dubbo于2011年在github开源，后面几年由于一些原因停止了维护，直接去年7月份阿里重启维护，并于2018年2月16日捐献给Apache。\n为什么会选择捐献给Apache，主要是为了打消社区对Dubbo未来发展的顾虑，给Dubbo用户足够的信心；Apache认为社区大于代码，非常注重多样性，强调一个项⽬需要有多个公司和个人贡献者参与，现在Dubbo的发展完全是按The
[...]
"title": "如何参与贡献Dubbo社区",
"keywords": "Dubbo, Apache Way",
"description": "本文介绍了如何以Apache Way的方式参与Dubbo社区并做贡献"
[incubator-dubbo-website] branch asf-site updated: good to SEO
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 66fa7a4 good to SEO 66fa7a4 is described below commit 66fa7a40dbfd08359c616ba7452750a02383d5a7 Author: zhuyong AuthorDate: Tue Sep 4 11:33:57 2018 +0800 good to SEO --- README.md| 13 + blog/zh-cn/dubbo-101.md | 6 ++ blog/zh-cn/dubbo-annotation.md | 6 ++ .../dubbo-basic-usage-dubbo-provider-configuration.md| 8 +++- blog/zh-cn/dubbo-contribue-to-opensource.md | 6 ++ blog/zh-cn/dubbo-generic-invoke.md | 6 ++ blog/zh-cn/dubbo-integrate-with-hystrix.md | 6 ++ blog/zh-cn/dubbo-invoke.md | 6 ++ blog/zh-cn/dubbo-k8s.md | 16 blog/zh-cn/dubbo-loadbalance.md | 6 ++ blog/zh-cn/dubbo-meetup-chengdu.md | 6 ++ blog/zh-cn/dubbo-new-async.md| 7 +++ blog/zh-cn/dubbo-zk.md | 7 +++ blog/zh-cn/dubbo2-js.md | 6 ++ blog/zh-cn/how-to-involve-dubbo-community.md | 6 ++ blog/zh-cn/introduction-to-dubbo-qos.md | 6 ++ blog/zh-cn/introduction-to-dubbo-spi-2.md| 6 +- blog/zh-cn/introduction-to-dubbo-spi.md | 6 ++ blog/zh-cn/optimization-branch-prediction.md | 4 blog/zh-cn/pinpoint.md | 6 ++ blog/zh-cn/prepare-an-apache-release.md | 7 +++ blog/zh-cn/sentinel-introduction-for-dubbo.md| 6 ++ blog/zh-cn/spring-boot-dubbo-start-stop-analysis.md | 7 ++- blog/zh-cn/tracing-with-skywalking.md| 5 + build/blog.js| 2 +- site_config/blog.js | 13 ++--- zh-cn/blog/dubbo-101.html| 6 +++--- zh-cn/blog/dubbo-101.json| 5 - zh-cn/blog/dubbo-annotation.html | 6 +++--- zh-cn/blog/dubbo-annotation.json | 5 - .../dubbo-basic-usage-dubbo-provider-configuration.html | 8 .../dubbo-basic-usage-dubbo-provider-configuration.json | 5 - zh-cn/blog/dubbo-contribue-to-opensource.html| 6 +++--- zh-cn/blog/dubbo-contribue-to-opensource.json| 5 - zh-cn/blog/dubbo-generic-invoke.html | 6 +++--- zh-cn/blog/dubbo-generic-invoke.json | 5 - zh-cn/blog/dubbo-integrate-with-hystrix.html | 6 +++--- zh-cn/blog/dubbo-integrate-with-hystrix.json | 5 - zh-cn/blog/dubbo-invoke.html | 6 +++--- zh-cn/blog/dubbo-invoke.json | 5 - zh-cn/blog/dubbo-k8s.html| 10 +- zh-cn/blog/dubbo-k8s.json| 5 - zh-cn/blog/dubbo-loadbalance.html| 6 +++--- zh-cn/blog/dubbo-loadbalance.json| 5 - zh-cn/blog/dubbo-meetup-chengdu.html | 6 +++--- zh-cn/blog/dubbo-meetup-chengdu.json | 5 - zh-cn/blog/dubbo-new-async.html | 6 +++--- zh-cn/blog/dubbo-new-async.json | 5 - zh-cn/blog/dubbo-zk.html | 6 +++--- zh-cn/blog/dubbo-zk.json | 5 - zh-cn/blog/dubbo2-js.html| 6 +++--- zh-cn/blog/dubbo2-js.json| 5 - zh-cn/blog/how-to-involve-dubbo-community.html | 6 +++--- zh-cn/blog/how-to-involve-dubbo-community.json | 5 - zh-cn/blog/index.html| 2 +- zh-cn/blog/introduction-to-dubbo-qos.html| 6 +++--- zh-cn/blog/introduction-to-dubbo-qos.json| 5 - zh-cn/blog/introduction-to-dubbo-spi-2.html | 7 +++ zh-cn/blog/introduction-to-dubbo-spi-2.json | 4 +++- zh-cn/blog/introduction-to-dubbo-spi.html| 6 +++--- zh-cn/blog/introduction-to-dubbo-spi.json| 5 - zh-cn/blog/optimization-branch-prediction.html | 2 +- zh-cn/blog/optimization-branch-prediction.json | 3 ++- zh-cn/blog/pinpoint.html | 6 +++--- zh-cn/blog/pinpoint.json | 5
[incubator-dubbo-website] branch asf-site updated: update readme
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new e52c7e3 update readme
e52c7e3 is described below
commit e52c7e37437229bf15ca4420ea651e2350ab50cb
Author: zhuyong
AuthorDate: Tue Sep 4 10:21:11 2018 +0800
update readme
---
README.md | 12 +---
blog/zh-cn/how-to-involve-dubbo-community.md | 2 +-
zh-cn/blog/how-to-involve-dubbo-community.html | 4 ++--
zh-cn/blog/how-to-involve-dubbo-community.json | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index b33591e..593fc08 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,15 @@ If your version of docsite is less then `1.0.0`, please
upgrade to `1.0.0`.
1. Run `npm install docsite -g` to install the dev tool.
2. Run `npm i` in the root directory to install the dependencies.
-3. Run `docsite start` in the root directory to start a local server, you will
see the website in '127.0.0.1://8080'.
+3. Run `docsite start` in the root directory to start a local server, you will
see the website in 'http://127.0.0.1:8080'.
4. Run `docsite build` to build source code.
5. Verify your change locally: `python -m SimpleHTTPServer 8000`
-6. Commit all the changes.
-7. Push to asf-site branch.
+
+## How to send a PR
+
+1. Do not use `git add .` to commit all the changes.
+2. Just push your changed files, such as:
+* *.md
+ * blog.js or docs.js or site.js
+3. Send a PR to asf-site branch.
diff --git a/blog/zh-cn/how-to-involve-dubbo-community.md
b/blog/zh-cn/how-to-involve-dubbo-community.md
index 1c218c9..26dc03c 100644
--- a/blog/zh-cn/how-to-involve-dubbo-community.md
+++ b/blog/zh-cn/how-to-involve-dubbo-community.md
@@ -4,7 +4,7 @@
## 前言
-本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题吗？相反，我们认为这个话题非常重要，建议这个话题以后每次meetup都要讲。
+本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题，相反，我们认为这个话题非常重要，甚至建议这个话题以后每次meetup都要讲。
Dubbo的发展历史大家应该并不陌生了，这里我还是简单回顾一下。Dubbo于2011年在github开源，后面几年由于一些原因停止了维护，直接去年7月份阿里重启维护，并于2018年2月16日捐献给Apache。
diff --git a/zh-cn/blog/how-to-involve-dubbo-community.html
b/zh-cn/blog/how-to-involve-dubbo-community.html
index 0872f4e..6efa64c 100644
--- a/zh-cn/blog/how-to-involve-dubbo-community.html
+++ b/zh-cn/blog/how-to-involve-dubbo-community.html
@@ -12,10 +12,10 @@
- EnEn
前言
-本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题吗？相反，我们认为这个话题非常重要，建议这个话题以后每次meetup都要讲。
+本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题，相反，我们认为这个话题非常重要，甚至建议这个话题以后每次meetup都要讲。
Dubbo的发展历史大家应该并不陌生了，这里我还是简单回顾一下。Dubbo于2011年在github开源，后面几年由于一些原因停止了维护，直接去年7月份阿里重启维护，并于2018年2月16日捐献给Apache。
为什么会选择捐献给Apache，主要是为了打消社区对Dubbo未来发展的顾虑，给Dubbo用户足够的信心；Apache认为社区大于代码，非常注重多样性，强调一个项⽬需要有多个公司和个人贡献者参与，现在Dubbo的发展完全是按The
Apache Way社区化的方式来运作的。
Apache的诞生
diff --git a/zh-cn/blog/how-to-involve-dubbo-community.json
b/zh-cn/blog/how-to-involve-dubbo-community.json
index c1a5db8..3531d45 100644
--- a/zh-cn/blog/how-to-involve-dubbo-community.json
+++ b/zh-cn/blog/how-to-involve-dubbo-community.json
@@ -1,4 +1,4 @@
{
"filename": "how-to-involve-dubbo-community.md",
- "__html": "如何参与贡献Dubbo社区\n\n前言\n本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题吗？相反，我们认为这个话题非常重要，建议这个话题以后每次meetup都要讲。\nDubbo的发展历史大家应该并不陌生了，这里我还是简单回顾一下。Dubbo于2011年在github开源，后面几年由于一些原因停止了维护，直接去年7月份阿里重启维护，并于2018年2月16日捐献给Apache。\n为什么会选择捐献给Apache，主要是为了打消社区对Dubbo未来发展的顾虑，给Dubbo用户足够的信心；Apache认为社区大于代码，非常注重多样性，强调一个项⽬需要有多个公司和个人贡献者参与，现在Dubbo的发展完全是按The
[...]
+ "__html": "如何参与贡献Dubbo社区\n\n前言\n本文首次分享是在Apache
Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题，相反，我们认为这个话题非常重要，甚至建议这个话题以后每次meetup都要讲。\nDubbo的发展历史大家应该并不陌生了，这里我还是简单回顾一下。Dubbo于2011年在github开源，后面几年由于一些原因停止了维护，直接去年7月份阿里重启维护，并于2018年2月16日捐献给Apache。\n为什么会选择捐献给Apache，主要是为了打消社区对Dubbo未来发展的顾虑，给Dubbo用户足够的信心；Apache认为社区大于代码，非常注重多样性，强调一个项⽬需要有多个公司和个人贡献者参与，现在Dubbo的发展完全是按The
[...]
}
\ No newline at end of file
[incubator-dubbo-website] branch asf-site updated: add how to involve dubbo community
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 3016481 add how to involve dubbo community 3016481 is described below commit 30164811cc10b036e362fc2e20722360784dc50f Author: zhuyong AuthorDate: Tue Sep 4 10:08:44 2018 +0800 add how to involve dubbo community --- blog/zh-cn/how-to-involve-dubbo-community.md | 106 build/blog.js | 2 +- img/blog/involve-dubbo/apache-history.png | Bin 0 -> 240521 bytes img/blog/involve-dubbo/apache-org.png | Bin 0 -> 131032 bytes img/blog/involve-dubbo/apache-way.png | Bin 0 -> 272260 bytes img/blog/involve-dubbo/dubbo-community.png | Bin 0 -> 246902 bytes img/blog/involve-dubbo/dubbo-project.png | Bin 0 -> 412187 bytes img/blog/involve-dubbo/get-into-apache.png | Bin 0 -> 298404 bytes img/blog/involve-dubbo/head.jpg| Bin 0 -> 229503 bytes site_config/blog.js| 23 -- zh-cn/blog/how-to-involve-dubbo-community.html | 107 + zh-cn/blog/how-to-involve-dubbo-community.json | 4 + zh-cn/blog/index.html | 2 +- 13 files changed, 234 insertions(+), 10 deletions(-) diff --git a/blog/zh-cn/how-to-involve-dubbo-community.md b/blog/zh-cn/how-to-involve-dubbo-community.md new file mode 100644 index 000..1c218c9 --- /dev/null +++ b/blog/zh-cn/how-to-involve-dubbo-community.md @@ -0,0 +1,106 @@ +# 如何参与贡献Dubbo社区 + + + +## 前言 + +本文首次分享是在Apache Dubbo(incubating)成都meetup上，这个话题是第一次在meetup上讲，不是我们没有更好的话题吗？相反，我们认为这个话题非常重要，建议这个话题以后每次meetup都要讲。 + +Dubbo的发展历史大家应该并不陌生了，这里我还是简单回顾一下。Dubbo于2011年在github开源，后面几年由于一些原因停止了维护，直接去年7月份阿里重启维护，并于2018年2月16日捐献给Apache。 + +为什么会选择捐献给Apache，主要是为了打消社区对Dubbo未来发展的顾虑，给Dubbo用户足够的信心；Apache认为`社区大于代码`，非常注重多样性，强调一个项⽬需要有多个公司和个人贡献者参与，现在Dubbo的发展完全是按`The Apache Way`社区化的方式来运作的。 + + +## Apache的诞生 + +说到Apache，大家都非常熟悉了，它是全球目前最大的软件基金；Apache的很多项目我们都用过，比如Maven、Log4j、Tomcat等，但有一个项目要特别强调的，那就是 Apache httpd server，这是Apache的第一个项目。 + +Apache软件基金会正式创建于1999年，主要是为公众提供有用的免费软件，并为软件开发者社区提供支持和服务；它的创建者是一个自称为`Apache组织`的群体； + +早在1995年，这个组织就存在了，他们聚集在一起，在美国伊利诺伊大学超级计算机应用程序国家中心开发的NCSA HTTPd服务器的基础上开发与维护了一个叫Apache的HTTP服务器。 + +最早NCSA HTTPd服务器是一个叫Rob McCool的人开发的，但是后来慢慢失去了兴趣，导致这个功能强大又好用的服务器没人维护；于是一些爱好者和用户就自发开始维护起来，并不断改善功能、发布版本；为了更好进行沟通，一哥们就创建了一个邮件组，并把维护工作高效组织起来，且自称是`Apache组织`，并把这个软件叫`Apache 服务器`。 + +这也是为什么Apache的所有的项目到今天为止依然以邮件列表作为沟通的主要方式。 + +关于Apache的命名来源，从北美当地的一支叫`Apache`的印第安部落名称而来，这支部落以高超的军事素养和超人的忍耐力著称，19世纪后半期对侵占他们领土的入侵者进行了反抗；为了对这支部落表示敬仰，就取了这个名字；但这里还流传着一个小故事，说是在NCSA HTTPd基础上，大家都通过打补丁不断在修改这个软件，被戏称为`A Patchy Server`，和`Apache Server`读音很像。 + + + +随着后来商业需求扩大，围绕Apache HTTP服务器的项目越来越多，后来越来越多的项目启动，也有很多外部组织捐献项目；为了让这些外部项目能顺利进入到Apache基金会，2002年创建了Incubator（孵化）项目。可以看到，经过10多年的发展，到2010年，75个顶级项目，30个孵化项目，每天2697封讨论邮件；2018年这个数据进一步增长，194个顶级项目，54个孵化项目，3255个committers；其中中国人主导的项目，有RocketMQ，WeeX，ECharts，Skywalking等。 + +Dubbo正在成为Apache顶级项目的路上——Apache孵化项目中。 + +回顾一下Apache这些历史和数据，我们不难发现几个关键词：兴趣、参与、邮件；这些就是我们后面要重点介绍的`The Apache Way`。 + +## ASF组织架构 + + + +我们知道每个组织都有它自己的架构，ASF同样也不例外；那Apache的组织架构是什么样的呢？它有什么独特的地方吗？这里特别要强调的是Project Management Committees，即 PMC，每个项目从孵化阶段开始就会有PMC，主要负责保证开源项目的社区活动都能运转良好，这里运转的机制就是`The Apache Way`。 + +图中，Board就是负责整个基金会符合章程的运作。Board我们一般很少能接触到，接触更多的是PMC以及下面的这几层。 + +参与Apache项目社区活动的人，一般分为以下几类： + +* 直接用户：在座的都是Dubbo的用户，可能部分现在还不是，但将来肯定会是 + +* 贡献者：部分用户在使用Dubbo过程中，遇到问题，自己通过分析调试找到解决方案，并提交给Dubbo官方，最终被接受，这些用户就是Dubbo的贡献者 + +* 提交者：贡献多了，经过PMC的提议和投票，就会成为Committer；Committer即意味着正式加入Apache，拥有个人Apache帐号以及相应项目的写权限 + +* PMC：Committer再往上走就是PMC，这个必须由现有PMC成员提名 + +个人在社区的成长，就像我们在公司晋升一样，一步一步往上走。 + +本文的目的就是告诉大家，从User到Contributor没有大家想像的那么难，从Contributor到Committer也不是不可能；只要大家拥有一颗开源的心，找到自己感兴趣的项目，并持续投入，付出肯定会有回报。 + +## The Apache Way + +就像你加入一家公司需要了解这家公司的文化一样，参与Apache开源项目之前，同样我们需要需要了解ASF的文化，这个文化就称为`The Apache Way`。 + + + +这里想特别强调以下几点： + +* 社区胜于代码：把项目构建出来这不是开源，去构建社区才是真正的开源；对社区而言，一切都是围绕代码而生，无代码则社区不复存在；在代码之上，则是如何做事、如何待人、如何决策的理念体现；一个健康的社区远比优秀的代码重要——如果代码奇烂无比，社区可以重写，但社区有了毛病，代码最终也会付之东流； +* 公开透明与共识决策：`If it doesn't happen on email, it doesn't happen.` 所有的决定，不管是技术feature、发展方向，还是版本发布等，都应该被公开讨论，而形式就是邮件列表，这些讨论过程和结论都会被永久存档；而讨论的过程，就是大家自由发表意见的过程，但最终大家要投票，比较民主的做法； +* 任人唯贤：`Those that have proven they can do, get to do more.` 特别强调一点，贡献绝不仅仅是代码，贡献可以是很多方面，接下来我们结合Dubbo来讲，大家如何参与并贡献； + +## 参与Dubbo社区 + + + +要参与Dubbo社区，就要先大概了解一下目前社区的工作方式。总结一句话就是4个角色、3个途径以及2个代码组； + +1. 4个角色前面也提到过了，分别是User、Contributor、Committer、PPMC；这里特别要强调用的是，角色之间不是孤立的，比如提功能建议的也可以是Committer或Contributor等；PPMC有投票权，但其他人一样也可以投票，这本身就是一种参与、一种贡献； +2. 3个途径，分别是Dubbo官网、github、dev邮件列表；目前比较活跃的是
[incubator-dubbo-website] branch asf-site updated: fix分组聚合中的示例代码链接404问题 (#129)
This is an automated email from the ASF dual-hosted git repository. jerrick pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 2b25a27 fix分组聚合中的示例代码链接404问题 (#129) 2b25a27 is described below commit 2b25a27b8ece6a2f58a2f7c1d8aa3da2b9e7aaa1 Author: chlsmile AuthorDate: Tue Sep 4 09:14:24 2018 +0800 fix分组聚合中的示例代码链接404问题 (#129) --- docs/zh-cn/user/demos/group-merger.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh-cn/user/demos/group-merger.md b/docs/zh-cn/user/demos/group-merger.md index 51ceee3..f17ce83 100644 --- a/docs/zh-cn/user/demos/group-merger.md +++ b/docs/zh-cn/user/demos/group-merger.md @@ -2,7 +2,7 @@ 按组合并返回结果 [^1]，比如菜单服务，接口一样，但有多种实现，用group区分，现在消费方需从每种group中调用一次返回结果，合并结果返回，这样就可以实现聚合菜单项。 -相关代码可以参考 [dubbo 项目中的示例](https://github.com/apache/incubator-dubbo/tree/master/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge) +相关代码可以参考 [dubbo 项目中的示例](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-merge) ## 配置 @@ -51,4 +51,4 @@ ``` [^1]: 从 `2.1.0` 版本开始支持 -[^2]: 参见：[合并结果扩展](http://dubbo.apache.org/books/dubbo-dev-book/impls/merger.html) +[^2]: 参见：[合并结果扩展](http://dubbo.apache.org/zh-cn/docs/dev/impls/merger.html)
