[incubator-dubbo.wiki] branch master updated: Updated FAQ (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new de815b9 Updated FAQ (markdown) de815b9 is described below commit de815b98f6a529392ed0c32e7f5b19325176e6ea Author: Xin Wang <lovep...@hotmail.com> AuthorDate: Sat Apr 28 16:28:33 2018 +0800 Updated FAQ (markdown) --- FAQ.md | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 351255f..7cb24a9 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,6 +1,15 @@ Q: Where is dubbo-admin? >A: dubbo-admin has been moved from core repository to >https://github.com/apache/incubator-dubbo-ops since 2.6.1 +Q: What's the difference between version 2.6.x and version 2.5.x ? + +>A: +>* Currently, dubbo keeps two versions evolve in parallel: 2.5.x, 2.6.x, check #1208 for detailed version management plan. +>* For contributors, please make sure all changes on the right base branch, that is, only use 2.5.x branch for bugfixes, otherwise use master. +>* For committers, make sure select the right label and target branch for every PR, make sure 2.5.x merge to master as soon as possible. +>* Feature Version：higher version, e.g. 2.6.x. We add new features to this version, so applications have opportunities try new features. And also we will merge changes made in the GA version. +>* BugFix Version：lower version，e.g. 2.5.x. This is called the GA version, which can be applied in production. We are supposed only to fix bugs in this version, and increase the third version number when release. + Q: dubbo-admin在tomcat下部署报： Could not open ServletContext resource [/WEB-INF/applicationContext.xml] 参考提问 [issue#735](https://github.com/alibaba/dubbo/issues/735) @@ -8,4 +17,4 @@ Q: dubbo-admin在tomcat下部署报： Could not open ServletContext resource [/ Q: 工程在docker bridag网络环境部署时，如何设置注册宿主机ip地址 参考提问 [issue#742](https://github.com/alibaba/dubbo/issues/742) ->A: dubbo支持在启动阶段通过命令行参数指定注册的ip、port；具体使用方法可参照[dubbo-docker-sample](https://github.com/dubbo/dubbo-docker-sample) \ No newline at end of file +>A: dubbo支持在启动阶段通过命令行参数指定注册的ip、port；具体使用方法可参照[dubbo-docker-sample](https://github.com/dubbo/dubbo-docker-sample) -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo] branch master updated: fixed start.sh #1879 (#1900)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 5916e8b fixed start.sh #1879 (#1900)
5916e8b is described below
commit 5916e8b1e853c74ed9d2b832f170756b35f478fb
Author: AfeiJavaer <404961...@qq.com>
AuthorDate: Thu Jun 7 19:30:58 2018 +0800
fixed start.sh #1879 (#1900)
---
.../src/main/resources/META-INF/assembly/bin/start.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
index 3b491f0..4cddcd0 100755
---
a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
+++
b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
@@ -79,7 +79,7 @@ while [ $COUNT -lt 1 ]; do
COUNT=`netstat -an | grep $SERVER_PORT | wc -l`
fi
else
- COUNT=`ps -f | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk
'{print $2}' | wc -l`
+ COUNT=`ps -ef | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk
'{print $2}' | wc -l`
fi
if [ $COUNT -gt 0 ]; then
break
@@ -87,6 +87,6 @@ while [ $COUNT -lt 1 ]; do
done
echo "OK!"
-PIDS=`ps -f | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk '{print $2}'`
+PIDS=`ps -ef | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk '{print
$2}'`
echo "PID: $PIDS"
echo "STDOUT: $STDOUT_FILE"
--
To stop receiving notification emails like this one, please contact
wang...@apache.org.
[incubator-dubbo] branch master updated: fix old groupId (#1959)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 5c62d1c fix old groupId (#1959)
5c62d1c is described below
commit 5c62d1c28ee48b985840d12122876ef08a6cbd26
Author: Jerrick Zhu
AuthorDate: Tue Jun 19 13:53:58 2018 +0800
fix old groupId (#1959)
---
dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dubbo-remoting/dubbo-remoting-p2p/pom.xml
b/dubbo-remoting/dubbo-remoting-p2p/pom.xml
index fb86ba5..63d58ab 100644
--- a/dubbo-remoting/dubbo-remoting-p2p/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-p2p/pom.xml
@@ -36,7 +36,7 @@
${project.parent.version}
-com.alibaba
+org.apache.dubbo
dubbo-remoting-netty
${project.parent.version}
test
[incubator-dubbo] branch master updated: [Dubbo-1691] Add unit tests for MulticastRegister #1691 (#1738)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 8b55a0b [Dubbo-1691] Add unit tests for MulticastRegister #1691
(#1738)
8b55a0b is described below
commit 8b55a0b31e1c7f9b7d6df5171865bbc11a4d8544
Author: Song Kun
AuthorDate: Fri Jun 8 11:41:08 2018 +0800
[Dubbo-1691] Add unit tests for MulticastRegister #1691 (#1738)
* Add unit tests for MulticastRegister, add some comments and fix some typo.
* Update MulticastRegistryTest.java
* Update MulticastRegistryTest.java
update code review error
---
.../alibaba/dubbo/registry/RegistryService.java| 2 +-
.../registry/multicast/MulticastRegistry.java | 6 +
.../registry/multicast/MulticastRegistryTest.java | 125 ++---
3 files changed, 115 insertions(+), 18 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryService.java
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryService.java
index 764c5d5..2494d1e 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryService.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryService.java
@@ -54,7 +54,7 @@ public interface RegistryService {
void unregister(URL url);
/**
- * Subscrib to eligible registered data and automatically push when the
registered data is changed.
+ * Subscribe to eligible registered data and automatically push when the
registered data is changed.
*
* Subscribing need to support contracts:
* 1. When the URL sets the check=false parameter. When the registration
fails, the exception is not thrown and retried in the background.
diff --git
a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
b/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
index d392839..bdb124b 100644
---
a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
+++
b/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
@@ -145,6 +145,9 @@ public class MulticastRegistry extends FailbackRegistry {
return false;
}
+/**
+ * Remove the expired providers, only when "clean" parameter is true.
+ */
private void clean() {
if (admin) {
for (Set providers : new
HashSet>(received.values())) {
@@ -299,6 +302,9 @@ public class MulticastRegistry extends FailbackRegistry {
}
}
+/**
+ * Remove the expired providers(if clean is true), leave the multicast
group and close the multicast socket.
+ */
@Override
public void destroy() {
super.destroy();
diff --git
a/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java
b/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java
index 3870d54..30fca7e 100644
---
a/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java
+++
b/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java
@@ -27,12 +27,12 @@ import java.net.MulticastSocket;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
public class MulticastRegistryTest {
@@ -44,31 +44,38 @@ public class MulticastRegistryTest {
private URL consumerUrl = URL.valueOf("subscribe://" +
NetUtils.getLocalHost() + "/" + service + "?arg1=1=2");
private MulticastRegistry registry = new MulticastRegistry(registryUrl);
-/**
- * @throws java.lang.Exception
- */
@Before
-public void setUp() throws Exception {
+public void setUp() {
registry.register(serviceUrl);
}
+/**
+ * Test method for {@link
com.alibaba.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)}.
+ */
@Test(expected = IllegalArgumentException.class)
public void testUrlError() {
URL errorUrl = URL.valueOf("multicast://mullticast/");
new MulticastRegistry(errorU
[incubator-dubbo.wiki] branch master updated: add committer-registration-process-guide
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 68c8f8c add committer-registration-process-guide 68c8f8c is described below commit 68c8f8cde632a5fd630dbd5bdddbee7314866eaa Author: Xin Wang AuthorDate: Thu May 31 11:30:21 2018 +0800 add committer-registration-process-guide --- _Sidebar.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_Sidebar.md b/_Sidebar.md index a061637..5da739e 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -6,5 +6,6 @@ * [[Test Coverage Guide|Test-coverage-guide]] * [[CLA Signing Guide|CLA-signing-guide]] * Committer Guide +* [[Committer Registration Process Guide|committer-registration-process-guide]] * Release Notes * Community -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo.wiki] branch master updated: Updated _Sidebar (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 5ca0022 Updated _Sidebar (markdown) 5ca0022 is described below commit 5ca00228851aaa995f6ebb1d62c451f7d35617d4 Author: Xin Wang AuthorDate: Thu May 31 11:39:59 2018 +0800 Updated _Sidebar (markdown) --- _Sidebar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Sidebar.md b/_Sidebar.md index 5da739e..3d99429 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -6,6 +6,6 @@ * [[Test Coverage Guide|Test-coverage-guide]] * [[CLA Signing Guide|CLA-signing-guide]] * Committer Guide -* [[Committer Registration Process Guide|committer-registration-process-guide]] +* [[New Committer Guide|New-Committer-Guide]] * Release Notes * Community -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo.wiki] branch master updated: init new committer guide
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new a2d5951 init new committer guide a2d5951 is described below commit a2d595194389566490c1608524b83e7ce7144d95 Author: Xin Wang AuthorDate: Fri Jun 1 00:16:30 2018 +0800 init new committer guide --- New-Committer-Guide.md | 90 ++ 1 file changed, 90 insertions(+) diff --git a/New-Committer-Guide.md b/New-Committer-Guide.md new file mode 100644 index 000..c3007f8 --- /dev/null +++ b/New-Committer-Guide.md @@ -0,0 +1,90 @@ +# Apache committer guide + +## First: How to become a committer + +### Initializes the initiator of the project hatching +At the project incubator stage, there will be an initialize committers list in the proposal of the incubator project. Confirm that you are one of the initialize committers. After the vote is passed in the Apache incubator community, the committer can start preparing his account. You can see [incubator wiki](https://wiki.apache.org/incubator/). + +### The active contributor is elected as a committer +In the late development process, a active contributor can be elected as a committer. See [how to become a committer](https://www.apache.org/dev/new-committers-guide.html#becoming-a-committer) + +## Second: The individual contributor submits ICLA + +### 1, Apache ID +Choose a Apache ID not in the [apache committers list page](http://people.apache.org/committer-index.html). + +### 2, Individual Contributor License Agreement (ICLA): +Download the [ICLA template](https://www.apache.org/licenses/icla.pdf) to find the available ID. After filling the icla.pdf personal information correctly, printing, signing, scanning, and sending mail as an attachment to the secretary secret...@apache.org, the secretary will help to create the Apache user ID. At the same time, a your...@apache.org mailbox can be created. You can see if the user has been created on the [apache committers list page (http://people.apache.org/committer-inde [...] + +## Third: Join the Apache developer group + +* 1, login the [Apache account tool](https://id.apache.org/), when you login at the first time, you can select the "Change password?" checkbox to get the initializer password. Then the initializer password will be sent to the forward mailbox (the developer mail recorded in the project incubator proposal) + +* 2, about Apache mailbox: apache.org mailbox does not have its own mail content storage server. It needs to borrow other mail providers' mail content storage and mail sending functions. In many voting sessions, Apache mailbox is recommended. + +There is a question about how to configure the apache.org mailbox forwarding function in other mailboxes. + +1) inbox: to receive mails that sent to youer...@apache.org mailbox. The forward mailbox in the first step the configured int the Apache account tool can use forward mailbox to pick up the mail. + +2) the Outbox: the sent email will shows the sender as your...@apache.org account. Please refer to: [set up Apache mailbox guide](https://reference.apache.org/committer/email) and [gmail mailbox setting]http://gmailblog.blogspot.com/2009/07/send-mail-from-another-address-without.html. In other mailbox service settings, this forwarding mode is not easy to find. Gmail is the most convenient, so it is recommended to use Gmail (not advertising). + +* 3, Modify the homepage URL option in the edit page, homepage link of your account can be added in [apache committer index page](http://people.apache.org/committer-index.html) + +* 4, Modify the GitHub account in the edit page, and an email will be sent to invite you to join the github.com/apache-commiiters group. Now, please learn from the way [ASF works](http://www.apache.org/foundation/how-it-works.html#developers) to do some basic preparation of ASF development. + +## Fourth: To obtain write permission of the project + +The operation of the [GitBox account link tool](https://gitbox.apache.org/setup/) + +### 1, Apache account authorization + +According to the prompt, the OAuth protocol of Apache account is authorized to login. + +### 2, Github account authorization + +According to the prompt, the OAuth protocol of Github account is authorized to login. + +### 3, Set up GitHub account in github.com, two-factors authorization (2FA) + +According to [authorized GitHub 2FA wiki](https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/) operation: + +* 1) install Google identity checker on mobile phone app +* 2), Following the [authorized GitHub 2FA wiki](https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/), you can operation step by step . + +In the [two-factors aut
[incubator-dubbo.wiki] branch master updated: Updated New Committer Guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 1a10420 Updated New Committer Guide (markdown) 1a10420 is described below commit 1a1042081ad23e43a37bce11043c652a6c4948b2 Author: Xin Wang AuthorDate: Fri Jun 1 00:42:36 2018 +0800 Updated New Committer Guide (markdown) --- New-Committer-Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/New-Committer-Guide.md b/New-Committer-Guide.md index c3007f8..d7380a7 100644 --- a/New-Committer-Guide.md +++ b/New-Committer-Guide.md @@ -2,7 +2,7 @@ ## First: How to become a committer -### Initializes the initiator of the project hatching +### Initializer committers at the project incubator stage At the project incubator stage, there will be an initialize committers list in the proposal of the incubator project. Confirm that you are one of the initialize committers. After the vote is passed in the Apache incubator community, the committer can start preparing his account. You can see [incubator wiki](https://wiki.apache.org/incubator/). ### The active contributor is elected as a committer -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo] branch master updated: [Dubbo-1684] add unit test for dubbo spring config (#1809)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 b7dde72 [Dubbo-1684] add unit test for dubbo spring config (#1809)
b7dde72 is described below
commit b7dde7236ff255cc51e087f025dc096dc0395a00
Author: Huang YunKun
AuthorDate: Fri Jun 1 13:07:03 2018 +0800
[Dubbo-1684] add unit test for dubbo spring config (#1809)
* add test for config spring module
* add more test for serviceBean and refBean
---
.codecov.yml | 3 +-
.../alibaba/dubbo/config/spring/ConfigTest.java| 2 +-
.../dubbo/config/spring/ServiceBeanTest.java | 40 ++
.../ReferenceAnnotationBeanPostProcessorTest.java | 23 +++
.../spring/schema/DubboNamespaceHandlerTest.java | 160 +
.../spring/status/DataSourceStatusCheckerTest.java | 100 +
.../spring/status/SpringStatusCheckerTest.java | 80 +++
.../META-INF/spring/dubbo-annotation-consumer.xml | 3 +
...ay-fixed-time.xml => consumer-notification.xml} | 67 -
.../dubbo/config/spring/delay-fixed-time.xml | 5 +-
.../{delay-fixed-time.xml => multi-monitor.xml}| 74 +-
.../{delay-fixed-time.xml => provider-multi.xml} | 80 ++-
...lay-fixed-time.xml => provider-with-module.xml} | 78 +-
...ay-fixed-time.xml => provider-with-monitor.xml} | 72 +-
14 files changed, 601 insertions(+), 186 deletions(-)
diff --git a/.codecov.yml b/.codecov.yml
index bd786c1..3d04ce5 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -6,4 +6,5 @@ coverage:
threshold: 0.1%
ignore:
- "dubbo-demo/.*"
- - "dubbo-common/src/main/java/com/alibaba/dubbo/common/json/*.java" #
internal JSON impl is deprecate, ignore test coverage for them
\ No newline at end of file
+ - "dubbo-common/src/main/java/com/alibaba/dubbo/common/json/*.java" #
internal JSON impl is deprecate, ignore test coverage for them
+ -
"dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/AnnotationBean.java"
# Deprecated
\ No newline at end of file
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 80de429..86c37be 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
@@ -46,7 +46,7 @@ import com.alibaba.dubbo.rpc.RpcContext;
import com.alibaba.dubbo.rpc.RpcException;
import com.alibaba.dubbo.rpc.service.GenericException;
import com.alibaba.dubbo.rpc.service.GenericService;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ServiceBeanTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ServiceBeanTest.java
new file mode 100644
index 000..11f7055
--- /dev/null
+++
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ServiceBeanTest.java
@@ -0,0 +1,40 @@
+/*
+ * 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 com.alibaba.dubbo.config.spring;
+
+import com.alibaba.dubbo.config.annotation.Service;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.mockito.Mockito.mock;
+
+public class ServiceBeanTest {
+@Test
+public void testGetService() {
+TestService service = mock(TestService.class);
+ServiceBean serviceBean = new ServiceBean(service);
+
+Service beanService = serviceBean.getService();
+Assert.assertThat(beanService, not
[incubator-dubbo.wiki] branch master updated: Updated New Committer Guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 4184dee Updated New Committer Guide (markdown) 4184dee is described below commit 4184deee4cb989f3d9a0cf78e0ed31663a87f68f Author: Xin Wang AuthorDate: Sat Jun 2 22:11:09 2018 +0800 Updated New Committer Guide (markdown) --- New-Committer-Guide.md | 50 -- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/New-Committer-Guide.md b/New-Committer-Guide.md index 2ec3fd3..d5739a5 100644 --- a/New-Committer-Guide.md +++ b/New-Committer-Guide.md @@ -1,40 +1,40 @@ -# Apache committer guide +# Apache Committer Guide -## First: How to become a committer +## First: How to become a committer -### Initializer committers at the project incubator stage -At the project incubator stage, there will be an initialize committers list in the proposal of the incubator project. Confirm that you are one of the initialize committers. After the vote is passed in the Apache incubator community, the committer can start preparing his account. You can see [incubator wiki](https://wiki.apache.org/incubator/). +### Initial committers at the project incubator stage +At the project incubator stage, there will be an initial committers list in the proposal of the incubator project. Confirm that you are one of the initial committers. After the vote is passed in the Apache incubator community, these committers can start preparing their account. See [incubator wiki](https://wiki.apache.org/incubator/) for details. ### The active contributor is elected as a committer -In the late development process, an active contributor can be elected as a committer. See [how to become a committer](https://www.apache.org/dev/new-committers-guide.html#becoming-a-committer) +At the late development stage, an active contributor can be elected as a committer. See [how to become a committer](https://www.apache.org/dev/new-committers-guide.html#becoming-a-committer) -## Second: The individual contributor submits ICLA +## Second: The individual contributor signs ICLA ### 1, Apache ID Choose a Apache ID not in the [apache committers list page](http://people.apache.org/committer-index.html). ### 2, Individual Contributor License Agreement (ICLA): -Download the [ICLA template](https://www.apache.org/licenses/icla.pdf) to find the available ID. After filling the icla.pdf personal information correctly, printing, signing, scanning, and sending mail as an attachment to the secretary secret...@apache.org, the secretary will help to create the Apache user ID. At the same time, a your...@apache.org mailbox can be created. You can see if the user has been created on the [apache committers list page (http://people.apache.org/committer-inde [...] +Download the [ICLA template](https://www.apache.org/licenses/icla.pdf). After filling the icla.pdf with personal information correctly, print, sign, scan, and send it in mail as an attachment to the secretary secret...@apache.org, the secretary will help to create the Apache user ID. At the same time, a your...@apache.org mailbox will be created. You can see if the user has been created on the [apache committers list page (http://people.apache.org/committer-index.html). -## Third: Join the Apache developer group +## Third: Join The Apache Developer Group -* 1, login the [Apache account tool](https://id.apache.org/), when you login at the first time, you can select the "Change password?" checkbox to get the initializer password. Then the initializer password will be sent to the forward mailbox (the developer mail recorded in the project incubator proposal) +* 1, login via the [Apache account tool](https://id.apache.org/), when you login at the first time, you can select the "Change password?" checkbox to get the initial password. Then the initial password will be sent to the forward mailbox (the developer mail recorded in the project incubator proposal) -* 2, about Apache mailbox: apache.org mailbox does not have its own mail content storage server. It needs to borrow other mail providers' mail content storage and mail sending functions. In many voting sessions, Apache mailbox is recommended. +* 2, about Apache mailbox: does not have its own mail content storage server. It needs to borrow the mail content storage and mail sending functions of other mail providers. In many voting sessions, Apache mailbox is recommended. -There is a question about how to configure the apache.org mailbox forwarding function in other mailboxes. +There is a question about how to configure the apache.org mailbox forwarding function using other mailboxes. -1) inbox: to receive mails that sent to youer...@apache.org mailbox. The forward mailb
[incubator-dubbo.wiki] branch master updated: Updated New Committer Guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new b3ba940 Updated New Committer Guide (markdown) b3ba940 is described below commit b3ba9402555800232aedfeb39ffb2df7c32453d1 Author: Xin Wang AuthorDate: Sat Jun 2 22:11:45 2018 +0800 Updated New Committer Guide (markdown) --- New-Committer-Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/New-Committer-Guide.md b/New-Committer-Guide.md index d5739a5..ac29273 100644 --- a/New-Committer-Guide.md +++ b/New-Committer-Guide.md @@ -82,7 +82,7 @@ If not discussed in the community (mailing list), just as it did not happen ### A small benefit -Jetbrains company gives Apache committers a small benefit, which is free to use IDEA's full series products. The specific address is: https://www.jetbrains.com/shop/eform/apache? Product=ALL +Jetbrains company gives Apache committers a small benefit, which is free to use IDEA's full series products. The specific address is: https://www.jetbrains.com/shop/eform/apache?Product=ALL ### Reference wiki https://www.apache.org/dev/new-committers-guide.html \ No newline at end of file -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo] branch master updated: Add Swagger UI integration and fixed #1642 (#1856)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 71fda0a Add Swagger UI integration and fixed #1642 (#1856)
71fda0a is described below
commit 71fda0a5fd305d923579161d6c4cdd972f187033
Author: kimmking
AuthorDate: Wed Jun 6 16:27:13 2018 +0800
Add Swagger UI integration and fixed #1642 (#1856)
* update cxf version and add test cases
* support jdk7
* add profile for dependency in jdk9
* modify profile location
* fix jaxb version
* add dependency for jdk9
* extract dependencies to dependencies bom project
* add SwaggerUI Integration for Rest web service
* add approved license.
* remove author info
* adjust dependency order
* add javadoc
* exclude jsr311 1.1.1 version in pom
* add test cases for Swagger Integration
---
dependencies-bom/pom.xml | 14 +
dubbo-rpc/dubbo-rpc-rest/pom.xml | 51 +
.../swagger/DubboSwaggerApiListingResource.java| 47
.../integration/swagger/DubboSwaggerService.java | 43 +++
.../DubboSwaggerApiListingResourceTest.java| 64 ++
.../rest/integration/swagger/SwaggerService.java | 34
6 files changed, 230 insertions(+), 23 deletions(-)
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index ac111df..9df4853 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -111,6 +111,8 @@
2.2.7
1.2.0
+
+1.5.19
@@ -353,6 +355,18 @@
${activation_version}
+
+
+io.swagger
+swagger-annotations
+${swagger_version}
+
+
+io.swagger
+swagger-jaxrs
+${swagger_version}
+
+
org.apache.curator
diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml
index 27f7c2b..eb9ab76 100644
--- a/dubbo-rpc/dubbo-rpc-rest/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml
@@ -28,12 +28,16 @@
false
+
+com.alibaba
+dubbo-config-api
+${project.parent.version}
+
com.alibaba
dubbo-rpc-api
${project.parent.version}
-
com.alibaba
dubbo-remoting-http
@@ -67,28 +71,6 @@
resteasy-jdk-http
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
org.jboss.resteasy
resteasy-jackson-provider
@@ -104,11 +86,34 @@
netty-all
+
+
+io.swagger
+swagger-annotations
+
+
+ javax.ws.rs
+jsr311-api
+
+
+
+
+io.swagger
+swagger-jaxrs
+
+
+javax.ws.rs
+jsr311-api
+
+
+
+
com.alibaba
dubbo-serialization-jdk
${project.parent.version}
test
+
\ No newline at end of file
diff --git
a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java
new file mode 100644
index 000..fc5ec6d
--- /dev/null
+++
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java
@@ -0,0 +1,47 @@
+/*
+ * 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,
+
[incubator-dubbo] branch master updated: Enchance test coverage of dubbo cluster module (#1885)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 282 Enchance test coverage of dubbo cluster module (#1885)
282 is described below
commit 2828d38424bf936e21d16e6f32c8750685b7
Author: Xin Wang
AuthorDate: Thu Jun 7 19:06:41 2018 +0800
Enchance test coverage of dubbo cluster module (#1885)
* 修改测试
* modify test case of dubbo-cluster
* update test
* #1679 Enhance the test coverage part-1 : dubbo-cluster module
* add asf header
* add setup
* add setup
* add test case
* fix test case
* add ignore
---
.../cluster/configurator/AbstractConfigurator.java | 4 -
.../loadbalance/ConsistentHashLoadBalance.java | 1 +
.../absent/AbsentConfiguratorTest.java | 27 +--
.../cluster/configurator/consts/UrlConstant.java | 31 +++
.../override/OverrideConfiguratorTest.java | 20 +-
.../rpc/cluster/directory/MockDirInvocation.java | 66 ++
.../rpc/cluster/directory/StaticDirectoryTest.java | 65 ++
.../loadbalance/ConsistentHashLoadBalanceTest.java | 30 +--
.../loadbalance/LeastActiveBalanceTest.java| 42
.../cluster/loadbalance/LoadBalanceBaseTest.java | 148
.../rpc/cluster/loadbalance/LoadBalanceTest.java | 204
.../cluster/loadbalance/RandomLoadBalanceTest.java | 57 +
.../loadbalance/RoundRobinLoadBalanceTest.java | 29 +--
.../dubbo/rpc/cluster/merger/ResultMergerTest.java | 257 +
.../router/condition/ConditionRouterTest.java | 132 +--
.../cluster/router/file/FileRouterEngineTest.java | 2 +-
.../cluster/router/script/ScriptRouterTest.java| 20 +-
.../support/AbstractClusterInvokerTest.java| 2 +-
.../support/FailSafeClusterInvokerTest.java| 2 +-
.../support/FailbackClusterInvokerTest.java| 2 +-
.../support/FailfastClusterInvokerTest.java| 2 +-
.../cluster/support/ForkingClusterInvokerTest.java | 2 +-
.../support/wrapper/MockClusterInvokerTest.java| 2 +-
.../extensionloader/ExtensionLoaderTest.java | 2 +-
.../ExtensionLoader_Adaptive_Test.java | 2 +-
.../ext6_inject/impl/Ext6Impl1.java| 2 +-
.../com/alibaba/dubbo/common/json/JSONTest.java| 2 +-
.../alibaba/dubbo/config/ReferenceConfigTest.java | 2 +-
.../com/alibaba/dubbo/config/url/UrlTestBase.java | 2 +-
.../alibaba/dubbo/config/spring/ConfigTest.java| 2 +-
.../support/AbstractRegistryFactoryTest.java | 2 +-
.../remoting/buffer/DirectChannelBufferTest.java | 2 +-
.../remoting/buffer/HeapChannelBufferTest.java | 2 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java| 2 +-
.../dubbo/remoting/codec/TelnetCodecTest.java | 2 +-
.../handler/ConnectChannelHandlerTest.java | 2 +-
.../handler/WrappedChannelHandlerTest.java | 2 +-
.../transport/mina/ClientToServerTest.java | 2 +-
.../support/header/HeartbeatHandlerTest.java | 2 +-
.../transport/netty/ClientToServerTest.java| 2 +-
.../protocol/dubbo/DubboInvokerAvilableTest.java | 2 +-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 4 +-
.../rpc/protocol/dubbo/ImplicitCallBackTest.java | 2 +-
.../rpc/protocol/injvm/InjvmProtocolTest.java | 4 +-
.../dubbo/rpc/protocol/rmi/RmiProtocolTest.java| 2 +-
.../dubbo/examples/validation/ValidationTest.java | 2 +-
46 files changed, 784 insertions(+), 413 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
index a213375..42b688b 100644
---
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
+++
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
@@ -40,10 +40,6 @@ public abstract class AbstractConfigurator implements
Configurator {
this.configuratorUrl = url;
}
-public static void main(String[] args) {
-System.out.println(URL.encode("timeout=100"));
-}
-
@Override
public URL getUrl() {
return configuratorUrl;
diff --git
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
index 595cec9..d65113b 100644
---
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
+++
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.jav
[incubator-dubbo] branch master updated: fix #1845 (#1851)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 2262450 fix #1845 (#1851)
2262450 is described below
commit 22624508bbd30dd83b09b48303196d7dcd73c410
Author: lzj <371209...@qq.com>
AuthorDate: Mon May 28 10:21:15 2018 +0800
fix #1845 (#1851)
---
.../src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java| 2 +-
.../src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java| 2 +-
.../com/alibaba/dubbo/registry/integration/RegistryDirectory.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
index b15129b..f82fe04 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
@@ -454,7 +454,7 @@ public class ProtocolConfig extends AbstractConfig {
this.extension = extension;
}
-public void destory() {
+public void destroy() {
if (name != null) {
ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(name).destroy();
}
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
index 4d10c72..797471c 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
@@ -39,7 +39,7 @@ public class ProtocolConfigTest {
MockProtocol2.delegate = protocol;
ProtocolConfig protocolConfig = new ProtocolConfig();
protocolConfig.setName("mockprotocol2");
-protocolConfig.destory();
+protocolConfig.destroy();
Mockito.verify(protocol).destroy();
}
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
index e832dae..4bd0908 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
@@ -557,10 +557,10 @@ public class RegistryDirectory extends
AbstractDirectory implements Notify
try {
invoker.destroy();
if (logger.isDebugEnabled()) {
-logger.debug("destory invoker[" +
invoker.getUrl() + "] success. ");
+logger.debug("destroy invoker[" +
invoker.getUrl() + "] success. ");
}
} catch (Exception e) {
-logger.warn("destory invoker[" + invoker.getUrl()
+ "] faild. " + e.getMessage(), e);
+logger.warn("destroy invoker[" + invoker.getUrl()
+ "] faild. " + e.getMessage(), e);
}
}
}
--
To stop receiving notification emails like this one, please contact
wang...@apache.org.
[incubator-dubbo] branch master updated: update CXF to latest version and add test case for webservice protocol (#1564)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 259c072 update CXF to latest version and add test case for webservice
protocol (#1564)
259c072 is described below
commit 259c07228c9fe14285c7101e7e2d070acdbfa5ce
Author: kimmking <kimmking...@gmail.com>
AuthorDate: Mon May 28 14:46:09 2018 +0800
update CXF to latest version and add test case for webservice protocol
(#1564)
* update cxf version and add test cases
* support jdk7
* add profile for dependency in jdk9
* modify profile location
* fix jaxb version
* add dependency for jdk9
* extract dependencies to dependencies bom project
---
dependencies-bom/pom.xml | 33 -
dubbo-rpc/dubbo-rpc-webservice/pom.xml | 21 ++
.../protocol/webservice/WebServiceProtocol.java| 7 +-
.../dubbo/rpc/protocol/webservice/DemoService.java | 43
.../rpc/protocol/webservice/DemoServiceImpl.java | 80 ++
.../dubbo/rpc/protocol/webservice/User.java| 38 ++
.../webservice/WebserviceProtocolTest.java | 71 +++
7 files changed, 291 insertions(+), 2 deletions(-)
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 94bfa1e..89de3c3 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -84,7 +84,7 @@
2.12.0
2.9.0
1.3.6
-3.0.14
+3.1.15
0.8.0
4.0.38
3.1.0
@@ -107,6 +107,9 @@
1.2.2
3.4
0.6
+
+2.2.7
+1.2.0
@@ -321,6 +324,34 @@
commons-lang3
${commons_lang3_version}
+
+
+
+javax.xml.bind
+jaxb-api
+${jaxb_version}
+
+
+com.sun.xml.bind
+jaxb-impl
+${jaxb_version}
+
+
+com.sun.xml.bind
+jaxb-core
+${jaxb_version}
+
+
+javax.activation
+javax.activation-api
+${activation_version}
+
+
+com.sun.activation
+javax.activation
+${activation_version}
+
+
org.apache.curator
diff --git a/dubbo-rpc/dubbo-rpc-webservice/pom.xml
b/dubbo-rpc/dubbo-rpc-webservice/pom.xml
index a2b656d..cdb5403 100644
--- a/dubbo-rpc/dubbo-rpc-webservice/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-webservice/pom.xml
@@ -41,6 +41,26 @@
${project.parent.version}
+javax.xml.bind
+jaxb-api
+
+
+com.sun.xml.bind
+jaxb-impl
+
+
+com.sun.xml.bind
+jaxb-core
+
+
+javax.activation
+javax.activation-api
+
+
+com.sun.activation
+javax.activation
+
+
org.apache.cxf
cxf-rt-frontend-simple
@@ -53,4 +73,5 @@
spring-context
+
\ No newline at end of file
diff --git
a/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
b/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
index 995f5c5..f501a42 100644
---
a/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
+++
b/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
@@ -95,7 +95,12 @@ public class WebServiceProtocol extends
AbstractProxyProtocol {
return new Runnable() {
@Override
public void run() {
-serverFactoryBean.destroy();
+if(serverFactoryBean.getServer()!= null) {
+serverFactoryBean.getServer().destroy();
+}
+if(serverFactoryBean.getBus()!=null) {
+serverFactoryBean.getBus().shutdown(true);
+}
}
};
}
diff --git
a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoService.java
b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoService.java
new file mode 100644
index 000..d3c664c
--- /dev/null
+++
b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoService.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundatio
[incubator-dubbo] branch master updated: [Dubbo-1695] Enhance the test coverage part-16 : dubbo-rpc/dubbo-rpc-api module (#2004)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 6b5b430 [Dubbo-1695] Enhance the test coverage part-16 :
dubbo-rpc/dubbo-rpc-api module (#2004)
6b5b430 is described below
commit 6b5b4308c84acb979ff1cd0e46c327a84db1339c
Author: tooyoung
AuthorDate: Mon Jul 2 10:03:17 2018 +0800
[Dubbo-1695] Enhance the test coverage part-16 : dubbo-rpc/dubbo-rpc-api
module (#2004)
* add unit test for rpc filter
* rebase master
* MICS: add test
* add test for context
* remove unused file
* reformat test code
---
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 148 +
.../Person.java => ServiceHolderTest.java} | 79 +--
.../org/apache/dubbo/rpc/StaticContextTest.java| 64 +
.../dubbo/rpc/filter/ClassLoaderFilterTest.java| 53
.../dubbo/rpc/filter/ExceptionFilterTest.java | 71 ++
.../dubbo/rpc/filter/ExecuteLimitFilterTest.java | 131 ++
.../apache/dubbo/rpc/filter/GenericFilterTest.java | 88
.../dubbo/rpc/filter/GenericImplFilterTest.java| 113
.../apache/dubbo/rpc/filter/TimeoutFilterTest.java | 66 +
.../apache/dubbo/rpc/filter/TokenFilterTest.java | 90 +
.../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 56
.../rpc/proxy/InvokerInvocationHandlerTest.java| 54
.../javassist/JavassistProxyFactoryTest.java} | 72 --
.../dubbo/rpc/proxy/jdk/JdkProxyFactoryTest.java | 11 ++
.../org/apache/dubbo/rpc/support/DemoService.java | 2 +
.../apache/dubbo/rpc/support/DemoServiceImpl.java | 2 +-
.../apache/dubbo/rpc/support/LocalException.java | 9 ++
.../org/apache/dubbo/rpc/support/MyInvoker.java| 5 +
.../java/org/apache/dubbo/rpc/support/Person.java | 7 +
19 files changed, 1030 insertions(+), 91 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
new file mode 100644
index 000..d298824
--- /dev/null
+++
b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
@@ -0,0 +1,148 @@
+package org.apache.dubbo.rpc;
+
+import org.apache.dubbo.common.URL;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+public class RpcContextTest {
+
+@Test
+public void testGetContext() {
+
+RpcContext rpcContext = RpcContext.getContext();
+Assert.assertNotNull(rpcContext);
+
+RpcContext.removeContext();
+// if null, will return the initialize value.
+//Assert.assertNull(RpcContext.getContext());
+Assert.assertNotNull(RpcContext.getContext());
+Assert.assertNotEquals(rpcContext, RpcContext.getContext());
+
+RpcContext serverRpcContext = RpcContext.getServerContext();
+Assert.assertNotNull(serverRpcContext);
+
+RpcContext.removeServerContext();
+Assert.assertNotEquals(serverRpcContext,
RpcContext.getServerContext());
+
+}
+
+@Test
+public void testAddress() {
+RpcContext context = RpcContext.getContext();
+context.setLocalAddress("127.0.0.1", 20880);
+Assert.assertTrue(context.getLocalAddress().getPort() == 20880);
+Assert.assertEquals("127.0.0.1:20880",
context.getLocalAddressString());
+
+context.setRemoteAddress("127.0.0.1", 20880);
+Assert.assertTrue(context.getRemoteAddress().getPort() == 20880);
+Assert.assertEquals("127.0.0.1:20880",
context.getRemoteAddressString());
+
+context.setRemoteAddress("127.0.0.1", -1);
+context.setLocalAddress("127.0.0.1", -1);
+Assert.assertTrue(context.getRemoteAddress().getPort() == 0);
+Assert.assertTrue(context.getLocalAddress().getPort() == 0);
+Assert.assertEquals("127.0.0.1", context.getRemoteHostName());
+Assert.assertEquals("127.0.0.1", context.getLocalHostName());
+}
+
+@Test
+public void testCheckSide() {
+
+RpcContext context = RpcContext.getContext();
+
+//TODO fix npe
+//context.isProviderSide();
+
+
context.setUrl(URL.valueOf("test://test:11/test?accesslog=true=dubbo=1.1"));
+Assert.assertFalse(context.isConsumerSide());
+Assert.assertTrue(context.isProviderSide());
+
+
context.setUrl(URL.valueOf("test://test:11/test?accesslog=true=dubbo=1.1=consumer"));
+Assert.assertTrue(context.isConsumerSide());
+Assert.assertFalse(context.is
[incubator-dubbo-spring-boot-project] branch master updated: Update .travis.yml
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new c4f29f2 Update .travis.yml c4f29f2 is described below commit c4f29f25f9a9e3573f38be97c0a975208de4b78e Author: Xin Wang AuthorDate: Wed Jun 20 11:00:15 2018 +0800 Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad3b3d8..be807fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: - oraclejdk9 - oraclejdk8 -script: "mvn cobertura:cobertura" +script: "mvn clean package" after_success: - - bash <(curl -s https://codecov.io/bash) -t 89f70bf5-4d6b-4759-8da0-dfab7881fd3e \ No newline at end of file + - bash <(curl -s https://codecov.io/bash) -t 89f70bf5-4d6b-4759-8da0-dfab7881fd3e
[incubator-dubbo.wiki] branch master updated: Updated Test coverage guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 4fde97e Updated Test coverage guide (markdown) 4fde97e is described below commit 4fde97ea81bd9d808e6e33cef9a4c86a8d209f5c Author: Xin Wang <lovep...@hotmail.com> AuthorDate: Fri Apr 27 11:37:31 2018 +0800 Updated Test coverage guide (markdown) --- Test-coverage-guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Test-coverage-guide.md b/Test-coverage-guide.md index 7672f14..74b2f0f 100644 --- a/Test-coverage-guide.md +++ b/Test-coverage-guide.md @@ -7,8 +7,8 @@ * Attention to boundary condition test * Test code should also be designed without writing useless code. * When you find a `method` that is hard to write unit test, if you can be sure the `method` is "smelly code", then refactor it with the committer. - * The mock framework in dubbo is: [mockito](http://site.mockito.org/). + * The mock framework in dubbo is: [mockito](http://site.mockito.org/). Some tutorials:[mockito tutorial](http://www.baeldung.com/bdd-mockito),[mockito refcard])(https://dzone.com/refcardz/mockito) * TDD（optional）：When you start a new issue, you can try to write test case at first ### 3.The specified value of the test coverage - * In the stage, the test coverage specified value of delta changed codes is ：>=60% + * In the stage, the test coverage specified value of delta changed codes is ：>=60%. The higher, the better. * We can see the coverage report in this page: https://codecov.io/gh/apache/incubator-dubbo \ No newline at end of file -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo-ops] branch master updated: bug issues #45 dubbo-admin.xml配置问题 (#47)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git The following commit(s) were added to refs/heads/master by this push: new 79daef6 bug issues #45 dubbo-admin.xml配置问题 (#47) 79daef6 is described below commit 79daef651d89f651186377801d965636ce3994c6 Author: giraffe <756345...@qq.com> AuthorDate: Fri Jun 22 09:22:39 2018 +0800 bug issues #45 dubbo-admin.xml配置问题 (#47) --- dubbo-admin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml index 6d357eb..1ce9b29 100644 --- a/dubbo-admin/pom.xml +++ b/dubbo-admin/pom.xml @@ -64,7 +64,7 @@ com.alibaba dubbo -2.6.1 +2.6.2
[incubator-dubbo] branch master updated: fix unit test failure (#2097)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 ad126d5 fix unit test failure (#2097)
ad126d5 is described below
commit ad126d53bb220dc8c46fbf40cf763afa65c5145b
Author: Ian Luo
AuthorDate: Wed Jul 18 17:17:40 2018 +0800
fix unit test failure (#2097)
---
.../test/java/org/apache/dubbo/config/AbstractConfigTest.java| 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
index 60b33df..ac231cb 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.dubbo.config;
+import junit.framework.TestCase;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.utils.ConfigUtils;
import org.apache.dubbo.config.api.Greeting;
import org.apache.dubbo.config.support.Parameter;
-import junit.framework.TestCase;
+import org.hamcrest.Matchers;
import org.junit.Test;
import java.lang.annotation.ElementType;
@@ -32,6 +33,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import static org.junit.Assert.assertThat;
+
public class AbstractConfigTest {
@Test
@@ -267,8 +270,8 @@ public class AbstractConfigTest {
TestCase.assertEquals(2, annotationConfig.getParameters().size());
TestCase.assertEquals("v1",
annotationConfig.getParameters().get("k1"));
TestCase.assertEquals("v2",
annotationConfig.getParameters().get("k2"));
-TestCase.assertEquals("",
-annotationConfig.toString());
+assertThat(annotationConfig.toString(),
Matchers.containsString("filter=\"f1, f2\" "));
+assertThat(annotationConfig.toString(),
Matchers.containsString("listener=\"l1, l2\" "));
}
private static class PropertiesConfig extends AbstractConfig {
[incubator-dubbo] branch master updated: Use jacoco instead of cobertura for coverage rate collectiong (#1575)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 c25d462 Use jacoco instead of cobertura for coverage rate collectiong
(#1575)
c25d462 is described below
commit c25d462ff48c725440393da801e8c614df600248
Author: Huang YunKun <hty...@gmail.com>
AuthorDate: Tue Apr 10 11:47:50 2018 +0800
Use jacoco instead of cobertura for coverage rate collectiong (#1575)
---
.travis.yml| 2 +-
.../alibaba/dubbo/common/utils/ReflectUtils.java | 3 ++
pom.xml| 36 ++
3 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 101cb29..e774ec5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,12 @@ language: java
sudo: false # faster builds
jdk:
+- oraclejdk9
- oraclejdk8
- openjdk7
script:
- travis_wait 30 mvn clean package
-- travis_wait 30 mvn cobertura:cobertura
after_success:
- bash <(curl -s https://codecov.io/bash)
diff --git
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java
index 88f4516..f9a8bba 100644
---
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java
+++
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java
@@ -910,6 +910,9 @@ public final class ReflectUtils {
while (cls != null && cls != Object.class) {
Field[] fields = cls.getDeclaredFields();
for (Field field : fields) {
+if (field.isSynthetic()) {
+continue;
+}
Object property = getEmptyObject(field.getType(),
emptyInstances, level + 1);
if (property != null) {
try {
diff --git a/pom.xml b/pom.xml
index 066f75a..f7bcfff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,10 +111,10 @@
2.8.2
3.6.0
3.0.1
-2.7
3.0.0
6.1.26
3.0.0
+0.8.1
@@ -184,7 +184,6 @@
2.7
3.1
3.0.1
-2.7
2.10.1
@@ -338,7 +337,7 @@
true
once
-${argline}
+${argline} ${jacocoArgLine}
@@ -422,16 +421,27 @@
-org.codehaus.mojo
-cobertura-maven-plugin
-${maven_cobertura_version}
-
-
-html
-xml
-
-
-
+org.jacoco
+jacoco-maven-plugin
+${maven_jacoco_version}
+
+
+jacoco-initialize
+
+prepare-agent
+
+
+jacocoArgLine
+
+
+
+jacoco-site
+package
+
+report
+
+
+
--
To stop receiving notification emails like this one, please contact
wang...@apache.org.
[incubator-dubbo-docs] branch master updated (de48f15 -> d742691)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-docs.git. from de48f15 Merge pull request #17 from donhui/patch-1 add ea7a1b4 typo fix new d742691 Merge pull request #19 from shawnsky/modification 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: dubbo-user-book/preface/architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo.wiki] branch master updated: Updated Test coverage guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 72c10a3 Updated Test coverage guide (markdown) 72c10a3 is described below commit 72c10a3c06cd495d253a4c9882e4a97d61233267 Author: Xin Wang <lovep...@hotmail.com> AuthorDate: Wed Apr 25 14:32:20 2018 +0800 Updated Test coverage guide (markdown) --- Test-coverage-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test-coverage-guide.md b/Test-coverage-guide.md index e73aec2..48f76f2 100644 --- a/Test-coverage-guide.md +++ b/Test-coverage-guide.md @@ -7,7 +7,7 @@ * Attention to boundary condition test * Test code should also be designed without writing useless code. * When you find a `method` that is hard to write unit test, if you can be sure the `method` is "smelly code", then refactor it with the committer. - * The mock framework in dubbo is: [jmockit](http://jmockit.github.io/). + * The mock framework in dubbo is: [jmockit](http://jmockit.github.io/) and [easymock](http://easymock.org/). * TDD（optional）：When you start a new issue, you can try to write test case at first ### 3.The specified value of the test coverage * In the stage, the test coverage specified value of delta changed codes is ：>=60% -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo.wiki] branch master updated: Updated Test coverage guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 8155260 Updated Test coverage guide (markdown) 8155260 is described below commit 8155260f7e51fc797afbb2dc8b51b3cb9fbee241 Author: Xin Wang <lovep...@hotmail.com> AuthorDate: Wed Apr 25 14:11:43 2018 +0800 Updated Test coverage guide (markdown) --- Test-coverage-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test-coverage-guide.md b/Test-coverage-guide.md index abdeaef..e73aec2 100644 --- a/Test-coverage-guide.md +++ b/Test-coverage-guide.md @@ -8,7 +8,7 @@ * Test code should also be designed without writing useless code. * When you find a `method` that is hard to write unit test, if you can be sure the `method` is "smelly code", then refactor it with the committer. * The mock framework in dubbo is: [jmockit](http://jmockit.github.io/). - * TDD（optional）：When you start a new issue, you can try to write test case first + * TDD（optional）：When you start a new issue, you can try to write test case at first ### 3.The specified value of the test coverage * In the stage, the test coverage specified value of delta changed codes is ：>=60% * We can see the coverage report in this page: https://codecov.io/gh/apache/incubator-dubbo \ No newline at end of file -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (e4db44c -> 65e0d5e)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from e4db44c Fix typo add de5527c [DUBBO-9]add apache-rat-plugin to check asf license header add 55381b5 extract apache-rat-plugin jar version add 2a34ad1 merge master add 84d5fcf update pom.xml new 65e0d5e Merge pull request #118 from lovepoem/add_apache_rat_plugin_to_check_asf_license_header 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: dubbo-spring-boot-actuator/pom.xml | 17 ++- dubbo-spring-boot-autoconfigure/pom.xml| 17 ++- dubbo-spring-boot-parent/pom.xml | 56 +- .../dubbo-spring-boot-sample-api/pom.xml | 17 ++- .../dubbo-spring-boot-sample-consumer/pom.xml | 17 ++- .../dubbo-spring-boot-sample-provider/pom.xml | 17 ++- dubbo-spring-boot-samples/pom.xml | 17 ++- dubbo-spring-boot-starter/pom.xml | 17 ++- pom.xml| 16 +++ 9 files changed, 182 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #118 from lovepoem/add_apache_rat_plugin_to_check_asf_license_header
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 65e0d5e5a31fbe70242becfd6cf008ffe20633ca Merge: e4db44c 84d5fcf Author: Xin Wang <lovep...@hotmail.com> AuthorDate: Mon Apr 23 12:54:18 2018 +0800 Merge pull request #118 from lovepoem/add_apache_rat_plugin_to_check_asf_license_header [DUBBO-9]add apache-rat-plugin to check asf license header dubbo-spring-boot-actuator/pom.xml | 17 ++- dubbo-spring-boot-autoconfigure/pom.xml| 17 ++- dubbo-spring-boot-parent/pom.xml | 56 +- .../dubbo-spring-boot-sample-api/pom.xml | 17 ++- .../dubbo-spring-boot-sample-consumer/pom.xml | 17 ++- .../dubbo-spring-boot-sample-provider/pom.xml | 17 ++- dubbo-spring-boot-samples/pom.xml | 17 ++- dubbo-spring-boot-starter/pom.xml | 17 ++- pom.xml| 16 +++ 9 files changed, 182 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo-docs] branch master updated (269cab7 -> de48f15)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-docs.git. from 269cab7 Merge pull request #15 from nzomkxia/master add f0684af typo fix new de48f15 Merge pull request #17 from donhui/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: dubbo-user-book/references/telnet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo-docs] 01/01: Merge pull request #17 from donhui/patch-1
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-docs.git commit de48f150927d1907f66988793ca1beb3596a91e8 Merge: 269cab7 f0684af Author: Xin Wang <lovep...@hotmail.com> AuthorDate: Wed Apr 18 10:02:43 2018 +0800 Merge pull request #17 from donhui/patch-1 typo fix dubbo-user-book/references/telnet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact wang...@apache.org.
[incubator-dubbo] branch master updated: Update DemoServiceImpl.java (#1496)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 bb8884e Update DemoServiceImpl.java (#1496)
bb8884e is described below
commit bb8884e04433677d6abc6f05c6ad9d39e3dcf236
Author: mp16 <18189530...@163.com>
AuthorDate: Sun Mar 25 14:10:09 2018 +0800
Update DemoServiceImpl.java (#1496)
update a little spelling error
---
.../main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java
b/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java
index c20dfa6..59281a8 100644
---
a/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java
+++
b/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java
@@ -26,7 +26,7 @@ public class DemoServiceImpl implements DemoService {
public String sayHello(String name) {
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new
Date()) + "] Hello " + name + ", request from consumer: " +
RpcContext.getContext().getRemoteAddress());
-return "Hello " + name + ", response form provider: " +
RpcContext.getContext().getLocalAddress();
+return "Hello " + name + ", response from provider: " +
RpcContext.getContext().getLocalAddress();
}
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
wang...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated (2aa8d95 -> 975f483)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 2aa8d95 Merge branch 'master' into 0.2.0-release add 975f483 Update DubboAutoConfigurationOnMultipleConfigTest.java No new revisions were added by this update. Summary of changes: .../dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 1 - 1 file changed, 1 deletion(-)
[incubator-dubbo-spring-boot-project] branch master updated: 0.2.0 release (#194)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new f8c7eb2 0.2.0 release (#194)
f8c7eb2 is described below
commit f8c7eb200ea618c9faa7cadc2add6540d943ac67
Author: 小马哥
AuthorDate: Wed Jun 20 18:37:28 2018 +0800
0.2.0 release (#194)
* Update travis-ci configuration
* Fix test cases
* Fix CI issue
* Fix CI issue
* Update rat configuration
* Update DubboAutoConfigurationOnMultipleConfigTest.java
---
.travis.yml| 2 +-
...DubboAutoConfigurationOnMultipleConfigTest.java | 3 +-
dubbo-spring-boot-parent/pom.xml | 72 --
3 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index be807fe..958ca14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,4 +9,4 @@ jdk:
script: "mvn clean package"
after_success:
- - bash <(curl -s https://codecov.io/bash) -t
89f70bf5-4d6b-4759-8da0-dfab7881fd3e
+ - bash <(curl -s https://codecov.io/bash) -t
89f70bf5-4d6b-4759-8da0-dfab7881fd3e
\ No newline at end of file
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
index 2d7b004..ee93509 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
@@ -266,10 +266,9 @@ public class DubboAutoConfigurationOnMultipleConfigTest {
Assert.assertNotNull(multipleDubboConfigConfiguration);
}
-@Ignore
@Test
public void testSingleDubboConfigConfiguration() {
-Assert.assertNull(singleDubboConfigConfiguration);
+Assert.assertNotNull(singleDubboConfigConfiguration);
}
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index 5e44781..52beb08 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -33,13 +33,25 @@
1.8
+1.8
+1.8
UTF-8
UTF-8
-2.0.2.RELEASE
+2.0.3.RELEASE
2.6.2
0.2
3.4.9
2.12.0
+
+-server -Xms256m -Xmx512m -XX:PermSize=64m
-XX:MaxPermSize=128m -Dfile.encoding=UTF-8
+-Djava.net.preferIPv4Stack=true
+
+
+
+3.0.2
+3.6.0
+3.0.1
+0.8.1
1.5
0.12
0.8.1
@@ -193,6 +205,7 @@
org.apache.maven.plugins
maven-jar-plugin
+${maven-jar-plugin.version}
true
@@ -201,18 +214,51 @@
true
true
+
+
${project.version}
+
${project.version}
+
+
org.apache.maven.plugins
maven-compiler-plugin
+${maven-compiler-plugin.version}
-${java.version}
-${java.version}
-true
+-proc:none
+true
+${java.source.version}
+${java.target.version}
+${file.encoding}
+
+
+org.jacoco
+jacoco-maven-plugin
+${maven-jacoco-plugin.version}
+
+
+jacoco-initialize
+
+prepare-agent
+
+
+jacocoArgLine
+
+
+
+jacoco-site
+package
+
+report
+
+
+
+
+
org.apache.maven.plugins
maven-enforcer-plugin
@@ -225,7 +271,7 @@
-[1.7,)
+
[incubator-dubbo] branch master updated: fix typo (#2747)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 1a88c22 fix typo (#2747)
1a88c22 is described below
commit 1a88c22574cbb621bae5edadb2f2abd1cd9784d6
Author: yì jí
AuthorDate: Wed Nov 7 14:16:55 2018 +0800
fix typo (#2747)
---
.../org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java
index ba30062..56d4ff6 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * NettyClientHandler
+ * NettyServerHandler
*/
@io.netty.channel.ChannelHandler.Sharable
public class NettyServerHandler extends ChannelDuplexHandler {
[incubator-dubbo-website] branch asf-site updated: Update quick-start.md (#157)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 4932f1b Update quick-start.md (#157)
4932f1b is described below
commit 4932f1b19af4bf23c7b1cd8b18251b8ccb9a26d4
Author: agmtopy <635757...@qq.com>
AuthorDate: Sat Sep 29 14:32:44 2018 +0800
Update quick-start.md (#157)
edit quick-start.md
[示例消费者安装] link change
---
docs/zh-cn/user/quick-start.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/zh-cn/user/quick-start.md b/docs/zh-cn/user/quick-start.md
index 44f1ff1..757cb8a 100644
--- a/docs/zh-cn/user/quick-start.md
+++ b/docs/zh-cn/user/quick-start.md
@@ -89,7 +89,7 @@ public class Provider {
## 服务消费者
-完整安装步骤，请参见：[示例消费者安装](http://dubbo.apache.org/books/dubbo-admin-book/install/consumer-demo.html)
+完整安装步骤，请参见：[示例消费者安装](../admin/install/consumer-demo.md)
### 通过 Spring 配置引用远程服务
[incubator-dubbo-website] branch asf-site updated: change default search engine to google (#155)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 20c755f change default search engine to google (#155)
20c755f is described below
commit 20c755f21918ad4d7f3256d7cef2e65a94afa4c2
Author: chenliandong
AuthorDate: Fri Sep 21 15:47:41 2018 +0800
change default search engine to google (#155)
* feat: 新版站点
* fix: issue #14
* feat: build
* feat: optimization for loading js
* chore: adjust build for loading js
* fix:
[issue28](https://github.com/apache/incubator-dubbo-website/issues/28) not
compiled
* feat: 修改hash类型，支持Google爬虫SEO
* fix: docs page sidemenu unselected
* add star icon && optimize for build
* use react github button
* add attendtion
* build
* modify README.md
* 调整首页按钮颜色
* build
* feat: add google and baidu search
* feat: build
---
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 +-
site_config/site.js | 2 +-
zh-cn/blog/prepare-an-apache-release.html | 4 ++--
zh-cn/blog/prepare-an-apache-release.json | 2 +-
12 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 5fdf26c..ed254ae 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=77) [...]
- Copyright (c) 2017 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=79) [...]
+ Copyright (c) 2016 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 @@ String sayHello(String name);
}
Service provider project
package org.apache.skywalking.demo.provider;
-@Service(version = ${demo.service.version},
-application = ${http://dubbo.application.id;>dubbo.application.id},
-protocol = ${http://dubbo.protocol.id;>dubbo.protocol.id},
[incubator-dubbo] branch 3.x-dev updated (9135546 -> 755bbf9)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch 3.x-dev in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from 9135546 Merge pull request #2434, Remove method.async of provider url. add cd60e58 [Dubbo-2348 ] AbstractRegistry util test enhancement (#2409) add b411a77 set timeout to 3000 (#2536) add 18dee4e code format (#2528) add 4776efb Optimization unnecessary unboxing 'b.booleanValue()' and Remove invalid throws java.lang.Exception (#2529) add e6b0bc8 Support for caching null values (#2480) add 84410f7 issue#2516: Remove getSpringContext() from org.apache.dubbo.config.spring.ServiceBean (#2517) add 0d20194 fix #2532, change different port (#2551) add 4fd352b fix #2533, set timeout to 3000 (#2552) add 755bbf9 rm java 9 and 10 on travis (#2559) No new revisions were added by this update. Summary of changes: .travis.yml| 2 - .../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 +- .../apache/dubbo/generic/GenericServiceTest.java | 2 +- .../apache/dubbo/config/spring/ReferenceBean.java | 20 +++ .../apache/dubbo/config/spring/ServiceBean.java| 7 --- .../spring/extension/SpringExtensionFactory.java | 4 ++ .../spring/status/DataSourceStatusChecker.java | 12 +++- .../config/spring/status/SpringStatusChecker.java | 12 +++- .../spring/status/DataSourceStatusCheckerTest.java | 11 +++- .../spring/status/SpringStatusCheckerTest.java | 13 - .../org/apache/dubbo/cache/filter/CacheFilter.java | 26 - .../apache/dubbo/cache/filter/CacheFilterTest.java | 4 +- .../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 +- .../registry/support/AbstractRegistryTest.java | 18 ++ .../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 +- .../transport/mina/MinaClientToServerTest.java | 2 +- .../remoting/transport/netty4/NettyChannel.java| 20 +-- .../transport/netty4/NettyClientToServerTest.java | 2 +- .../rpc/protocol/dubbo/DubboProtocolTest.java | 24 .../rpc/protocol/dubbo/ExplicitCallbackTest.java | 5 +- .../dubbo/telnet/ListTelnetHandlerTest.java| 8 +-- .../serialize/java/CompactedObjectInputStream.java | 3 +- 38 files changed, 299 insertions(+), 143 deletions(-)
[incubator-dubbo] branch master updated: fix typo (#3110)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 9396ace fix typo (#3110)
9396ace is described below
commit 9396ace4fc00ca8f2e331b49ddabcb1e138e9e1c
Author: kezhenxu94
AuthorDate: Tue Jan 1 14:10:08 2019 +0800
fix typo (#3110)
---
.../dubbo/registry/dubbo/DubboRegistryTest.java| 26 +++---
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DubboRegistryTest.java
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DubboRegistryTest.java
index d6390ff..7129d12 100644
---
a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DubboRegistryTest.java
+++
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DubboRegistryTest.java
@@ -75,31 +75,31 @@ public class DubboRegistryTest {
@Test
public void testRegister() {
dubboRegistry.register(serviceURL);
-assertEquals(1, getRegistereds());
+assertEquals(1, getRegisteredSize());
}
@Test
public void testUnRegister() {
-assertEquals(0, getRegistereds());
+assertEquals(0, getRegisteredSize());
dubboRegistry.register(serviceURL);
-assertEquals(1, getRegistereds());
+assertEquals(1, getRegisteredSize());
dubboRegistry.unregister(serviceURL);
-assertEquals(0, getRegistereds());
+assertEquals(0, getRegisteredSize());
}
@Test
public void testSubscribe() {
dubboRegistry.register(serviceURL);
-assertEquals(1, getRegistereds());
+assertEquals(1, getRegisteredSize());
dubboRegistry.subscribe(serviceURL, notifyListener);
-assertEquals(1, getSubscribeds());
+assertEquals(1, getSubscribedSize());
assertEquals(1, getNotifiedListeners());
}
@Test
public void testUnsubscribe() {
dubboRegistry.subscribe(serviceURL, notifyListener);
-assertEquals(1, getSubscribeds());
+assertEquals(1, getSubscribedSize());
assertEquals(1, getNotifiedListeners());
dubboRegistry.unsubscribe(serviceURL, notifyListener);
assertEquals(0, getNotifiedListeners());
@@ -107,7 +107,7 @@ public class DubboRegistryTest {
private class MockDubboRegistry extends FailbackRegistry {
-private volatile boolean isAvaliable = false;
+private volatile boolean isAvailable = false;
public MockDubboRegistry(URL url) {
super(url);
@@ -116,13 +116,13 @@ public class DubboRegistryTest {
@Override
public void doRegister(URL url) {
logger.info("Begin to register: " + url);
-isAvaliable = true;
+isAvailable = true;
}
@Override
public void doUnregister(URL url) {
logger.info("Begin to ungister: " + url);
-isAvaliable = false;
+isAvailable = false;
}
@Override
@@ -137,7 +137,7 @@ public class DubboRegistryTest {
@Override
public boolean isAvailable() {
-return isAvaliable;
+return isAvailable;
}
}
@@ -145,11 +145,11 @@ public class DubboRegistryTest {
return dubboRegistry.getSubscribed().get(serviceURL).size();
}
-private int getRegistereds() {
+private int getRegisteredSize() {
return dubboRegistry.getRegistered().size();
}
-private int getSubscribeds() {
+private int getSubscribedSize() {
return dubboRegistry.getSubscribed().size();
}
}
[incubator-dubbo] branch master updated: add unit test to dubbo-registry/dubbo-registry-api and dubbo-registry/dubbo-registry-default (#3053)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 cd56069 add unit test to dubbo-registry/dubbo-registry-api and
dubbo-registry/dubbo-registry-default (#3053)
cd56069 is described below
commit cd560698d24aa521ba1b0b45a0ce725308da5af5
Author: XiaoJie Li
AuthorDate: Fri Dec 28 13:02:42 2018 +0800
add unit test to dubbo-registry/dubbo-registry-api and
dubbo-registry/dubbo-registry-default (#3053)
* add FailedRetryTaskTest.java
---
.../dubbo/registry/dubbo/DubboRegistryTest.java| 155 +
1 file changed, 155 insertions(+)
diff --git
a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DubboRegistryTest.java
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DubboRegistryTest.java
new file mode 100644
index 000..d6390ff
--- /dev/null
+++
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DubboRegistryTest.java
@@ -0,0 +1,155 @@
+/*
+ * 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.registry.dubbo;
+
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.NetUtils;
+import org.apache.dubbo.registry.NotifyListener;
+import org.apache.dubbo.registry.RegistryService;
+import org.apache.dubbo.registry.support.FailbackRegistry;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.mock;
+
+public class DubboRegistryTest {
+
+private static final Logger logger =
LoggerFactory.getLogger(DubboRegistryTest.class);
+
+private DubboRegistry dubboRegistry;
+
+private URL registryURL;
+
+private URL serviceURL;
+
+private NotifyListener notifyListener;
+
+private Invoker invoker;
+
+private RegistryService registryService;
+
+@Before
+public void setUp() {
+registryURL = new URL(Constants.REGISTRY_PROTOCOL,
NetUtils.getLocalHost(), NetUtils.getAvailablePort())
+.addParameter(Constants.CHECK_KEY, false)
+.setServiceInterface(RegistryService.class.getName());
+serviceURL = new URL(DubboProtocol.NAME, NetUtils.getLocalHost(),
NetUtils.getAvailablePort())
+.addParameter(Constants.CHECK_KEY, false)
+.setServiceInterface(RegistryService.class.getName());
+
+registryService = new MockDubboRegistry(registryURL);
+
+invoker = mock(Invoker.class);
+given(invoker.getUrl()).willReturn(serviceURL);
+given(invoker.getInterface()).willReturn(RegistryService.class);
+given(invoker.invoke(new RpcInvocation())).willReturn(null);
+
+dubboRegistry = new DubboRegistry(invoker, registryService);
+notifyListener = mock(NotifyListener.class);
+}
+
+@Test
+public void testRegister() {
+dubboRegistry.register(serviceURL);
+assertEquals(1, getRegistereds());
+}
+
+@Test
+public void testUnRegister() {
+assertEquals(0, getRegistereds());
+dubboRegistry.register(serviceURL);
+assertEquals(1, getRegistereds());
+dubboRegistry.unregister(serviceURL);
+assertEquals(0, getRegistereds());
+}
+
+@Test
+public void testSubscribe() {
+dubboRegistry.register(serviceURL);
+assertEquals(1, getRegistereds());
+dubboRegistry.subscribe(serviceURL, notifyListener);
+assertEquals(1, getSubscribeds());
+assertEquals(1, getNotifiedListeners());
+}
+
+@Test
+public void testUnsubscribe() {
+dubboRegistry.subscribe(serviceURL, notifyListener);
+assertEqua
[incubator-dubbo-ops] branch develop updated: unit test for ConfigCenter (#257)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new dfa00dc unit test for ConfigCenter (#257)
dfa00dc is described below
commit dfa00dc44c76a48d8a4d55b905a022238bd420ee
Author: 孙不服
AuthorDate: Sun Jan 20 15:20:53 2019 +0800
unit test for ConfigCenter (#257)
* unit test for ConfigCenter
---
.../apache/dubbo/admin/config/ConfigCenter.java| 2 +-
.../dubbo/admin/config/ConfigCenterTest.java | 140 +
2 files changed, 141 insertions(+), 1 deletion(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
index 491b35e..382e2b2 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
@@ -60,8 +60,8 @@ public class ConfigCenter {
@Value("${admin.config-center.username:}")
private String username;
@Value("${admin.config-center.password:}")
-
private String password;
+
private static String globalConfigPath = "config/dubbo/dubbo.properties";
private static final Logger logger =
LoggerFactory.getLogger(ConfigCenter.class);
diff --git
a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/config/ConfigCenterTest.java
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/config/ConfigCenterTest.java
new file mode 100644
index 000..1be2ba9
--- /dev/null
+++
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/config/ConfigCenterTest.java
@@ -0,0 +1,140 @@
+package org.apache.dubbo.admin.config;
+
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.ExponentialBackoffRetry;
+import org.apache.curator.test.TestingServer;
+import org.apache.dubbo.admin.common.exception.ConfigurationException;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.NetUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+public class ConfigCenterTest {
+
+private String zkAddress;
+private TestingServer zkServer;
+private CuratorFramework zkClient;
+
+@Before
+public void setup() throws Exception {
+int zkServerPort = NetUtils.getAvailablePort();
+zkAddress = "zookeeper://127.0.0.1:" + zkServerPort;
+zkServer = new TestingServer(zkServerPort, true);
+zkClient =
CuratorFrameworkFactory.builder().connectString(zkServer.getConnectString()).retryPolicy(new
ExponentialBackoffRetry(1000, 3)).build();
+zkClient.start();
+}
+
+@After
+public void tearDown() throws IOException {
+zkServer.close();
+zkServer.stop();
+}
+
+@InjectMocks
+private ConfigCenter configCenter;
+
+@Test
+public void testGetDynamicConfiguration() throws Exception {
+// mock @value inject
+ReflectionTestUtils.setField(configCenter, "configCenter", zkAddress);
+ReflectionTestUtils.setField(configCenter, "group", "dubbo");
+ReflectionTestUtils.setField(configCenter, "username", "username");
+ReflectionTestUtils.setField(configCenter, "password", "password");
+
+// config is null
+configCenter.getDynamicConfiguration();
+
+// config is registry address
+zkClient.createContainers("/dubbo/config/dubbo/dubbo.properties");
+zkClient.setData().forPath("/dubbo/config/dubbo/dubbo.properties",
"dubbo.registry.address=zookeeper://test-registry.com:2181".getBytes());
+configCenter.getDynamicConfiguration();
+Object registryUrl = ReflectionTestUtils.getField(configCenter,
"registryUrl");
+assertNotNull(registryUrl);
+assertEquals("test-registry.com", ((URL) registryUrl).getHost());
+
+// config is meta date address
+zkClient.setData().forPath("/dubbo/config/dubbo/dubbo.properties",
"dubbo.metadata-report.address=zookeeper://test-metadata.com:2181".getBytes());
+configCenter.getDynamicConfiguration();
+Object metadataUrl = ReflectionTestUtils.getField(configCenter,
"metadataUrl");
+assertNotNull(metadataUrl);
+
[incubator-dubbo] branch master updated: remove not used import (#3309)
This is an automated email from the ASF dual-hosted git repository. wangxin 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 5c75eb2 remove not used import (#3309) 5c75eb2 is described below commit 5c75eb266fa377b4b18b0ca55483180b331376d3 Author: Xin Wang AuthorDate: Tue Jan 22 19:48:38 2019 +0800 remove not used import (#3309) --- .../src/main/java/org/apache/dubbo/config/spring/ConfigCenterBean.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ConfigCenterBean.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ConfigCenterBean.java index ff7d038..1ea2485 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ConfigCenterBean.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ConfigCenterBean.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.config.spring; -import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.config.ConfigurationUtils; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.config.ApplicationConfig;
[incubator-dubbo] branch master updated: remove unused import (#3311)
This is an automated email from the ASF dual-hosted git repository. wangxin 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 d3b2439 remove unused import (#3311) d3b2439 is described below commit d3b2439e5cc1da55603fa1a386ae0dc8315812c7 Author: Xin Wang AuthorDate: Tue Jan 22 20:33:23 2019 +0800 remove unused import (#3311) * remove not used import * remove unused import --- .../beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java | 3 --- .../beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java index dc3ce79..82fb9b2 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java @@ -16,9 +16,6 @@ */ package org.apache.dubbo.config.spring.beans.factory.annotation; -import org.apache.dubbo.common.Constants; -import org.apache.dubbo.common.utils.ArrayUtils; -import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.spring.ReferenceBean; import org.apache.dubbo.config.spring.ServiceBean; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java index 9c8f522..e07bf15 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java @@ -21,6 +21,7 @@ import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.spring.ReferenceBean; import org.apache.dubbo.config.spring.api.DemoService; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.core.annotation.AnnotationUtils;
[incubator-dubbo-ops] branch develop updated: Add missing license announcement (#271)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git The following commit(s) were added to refs/heads/develop by this push: new 7e1a347 Add missing license announcement (#271) 7e1a347 is described below commit 7e1a3471f0c4dd7582a28d0700090d142fef56c5 Author: Yuhao Bi AuthorDate: Wed Jan 23 07:38:54 2019 +0800 Add missing license announcement (#271) --- .../org/apache/dubbo/admin/config/ConfigCenterTest.java | 17 + .../admin/controller/ConditionRoutesControllerTest.java | 17 + 2 files changed, 34 insertions(+) diff --git a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/config/ConfigCenterTest.java b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/config/ConfigCenterTest.java index 1be2ba9..cb81fa7 100644 --- a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/config/ConfigCenterTest.java +++ b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/config/ConfigCenterTest.java @@ -1,3 +1,20 @@ +/* + * 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.admin.config; import org.apache.curator.framework.CuratorFramework; diff --git a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java index 5ed756c..27f2962 100644 --- a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java +++ b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java @@ -1,3 +1,20 @@ +/* + * 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.admin.controller; import java.util.Arrays;
[incubator-dubbo] branch master updated: add the notice of checkstyle (#2983)
This is an automated email from the ASF dual-hosted git repository. wangxin 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 0648887 add the notice of checkstyle (#2983) 0648887 is described below commit 06488870268ef17e47992082254cb7f026b12291 Author: xujingfeng <250577...@qq.com> AuthorDate: Mon Dec 17 15:56:06 2018 +0800 add the notice of checkstyle (#2983) * add the notice of code style * modify the pic * del teh faq.md, move to dubbo-website --- CONTRIBUTING.md | 12 +++- FAQ.md| 25 - codestyle/manage_profiles.png | Bin 0 -> 430 bytes 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd7dc20..b987b16 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,4 +63,14 @@ Thanks for contributing! ### Code style We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/apache/incubator-dubbo/tree/master/codestyle/dubbo_codestyle_for_idea.xml) for IntelliJ idea, you can import it to you IDE. -If you use Eclipse you can config manually by referencing the same file. \ No newline at end of file +If you use Eclipse you can config manually by referencing the same file. + +**NOTICE** + +It is very important to set the dubbo_codestyle_for_idea.xml, otherwise you will fail to pass the Travis CI. Steps to set the code style are as below: + +1. Enter `Editor > Code Style` +2. To manage a code style scheme, in the Code Style page, select the desired scheme from the drop-down list, and click . +From the drop-down list, select `Import Scheme`, then select this option `IntelliJ IDEA code style XML` to import scheme +3. In the Scheme field, type the name of the new scheme and press ⏎ to save the changes. + diff --git a/FAQ.md b/FAQ.md deleted file mode 100644 index 28e2f0c..000 --- a/FAQ.md +++ /dev/null @@ -1,25 +0,0 @@ -### Where is dubbo-admin? - -dubbo-admin has been moved from core repository to https://github.com/apache/incubator-dubbo-ops since 2.6.1 - -### Which version should I choose? - -Currently, dubbo keeps 3 versions evolve in parallel: - -* 2.7.x (master): requires Java 1.8, major feature branch. - -* 2.6.x: requires Java 1.6, minor feature & bugfix branch, GA, production ready. - -* 2.5.x: requires Java 1.6, maintenance branch, only accept security vulnerability and critical bugfix, expected to be EOL soon. - -check [this](https://github.com/apache/incubator-dubbo/issues/1208) for detailed version management plan. - -For contributors, please make sure all changes on the right branch, that is, most of the pull request should go to 2.7.x, and be backported to 2.6.x and 2.5.x if necessary. If the fix is specific to a branch, please make sure your pull request goes to the right branch. - -For committers, make sure select the right label and target branch for every PR, and don't forget to back port the fix to lower version is necessary. - - How to register ip correctly in docker? - -[Example question](https://github.com/alibaba/dubbo/issues/742) - -Dubbo supports specifying ip/port via system environment variables, examples can be found [here](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-docker). diff --git a/codestyle/manage_profiles.png b/codestyle/manage_profiles.png new file mode 100644 index 000..1664d67 Binary files /dev/null and b/codestyle/manage_profiles.png differ
[incubator-dubbo-website] branch asf-site updated: Translate the developer guide #181 (#188)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 2405d3d Translate the developer guide #181 (#188)
2405d3d is described below
commit 2405d3d2f1bf9bc71a2d48cef2f0c482f7dc1d5e
Author: ateacer
AuthorDate: Thu Nov 22 22:19:51 2018 +0800
Translate the developer guide #181 (#188)
* fix a word error
* translate the new contribute guide
---
.../committer-guide/label-an-issue-guide_dev.md| 3 ++-
.../contributor-guide/new-contributor-guide_dev.md | 30 ++
.../committer-guide/label-an-issue-guide_dev.json | 4 ++-
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
b/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
index 9f62f73..8f40cd8 100644
--- a/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
+++ b/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
@@ -1 +1,2 @@
-# 给问题打标签
\ No newline at end of file
+# 给问题打标签
+
diff --git
a/docs/zh-cn/developers/contributor-guide/new-contributor-guide_dev.md
b/docs/zh-cn/developers/contributor-guide/new-contributor-guide_dev.md
index e81c282..68fdfa0 100644
--- a/docs/zh-cn/developers/contributor-guide/new-contributor-guide_dev.md
+++ b/docs/zh-cn/developers/contributor-guide/new-contributor-guide_dev.md
@@ -1 +1,31 @@
# 新贡献者向导
+
+这篇向导旨在给正在准备向Dubbo提交贡献的新手提供指导。
+
+### 邮件列表描述
+
+邮件列表是Dubbo官方推荐的讨论方式，所有与Dubbo相关的内容都可以在这里讨论，请点击
[issue](https://github.com/apache/incubator-dubbo/issues/1393) 了解更多关于邮件列表订阅的内容
+
+* d...@dubbo.incubator.apache.org：开发邮件列表，您在使用或者开发Dubbo的过程中遇到的任何问题，都可以在这里进行提问。
+*
comm...@dubbo.incubator.apache.org：所有的提交内容都会推送到这个邮件列表，如果您对Dubbo的进展感兴趣，可以订阅这个邮件列表。
+* iss...@dubbo.incubator.apache.org：所有的 JIRA
[issues](https://issues.apache.org/jira/projects/DUBBO/issues)
和修改信息都会推送到这个邮件列表。Dubbo社区已经决定使用github issues代替JIRA issues，因此大部分issues将由github
issues进行跟踪。JIRA issues用于跟踪ASF相关问题。
+
+### 报告问题
+
+### 发送 pull request
+
+* 参考[pull request
template](https://github.com/apache/incubator-dubbo/blob/master/PULL_REQUEST_TEMPLATE.md)中的检查列表
+* 在您发送pull request之前，请同步您的github仓库和远程仓库，这会使您的pull request简单明了，具体操作请看如下所示步骤：
+
+```sh
+git remote add upstream g...@github.com:apache/incubator-dubbo.git
+git fetch upstream
+git rebase upstream/master
+git checkout -b your_awesome_patch
+... add some work
+git push origin your_awesome_patch
+```
+
+### 编码规范
+
+请按照[CONTRIBUTING.md](https://github.com/apache/incubator-dubbo/blob/master/CONTRIBUTING.md)中的编码规范对自己的代码进行检查。
\ No newline at end of file
diff --git
a/zh-cn/docs/developers/committer-guide/label-an-issue-guide_dev.json
b/zh-cn/docs/developers/committer-guide/label-an-issue-guide_dev.json
index 7a5535f..bb757c2 100644
--- a/zh-cn/docs/developers/committer-guide/label-an-issue-guide_dev.json
+++ b/zh-cn/docs/developers/committer-guide/label-an-issue-guide_dev.json
@@ -1,4 +1,6 @@
{
"filename": "label-an-issue-guide_dev.md",
- "__html": "给问题打标签\n"
+ "__html": "给问题打标签\n",
+ "link":
"/zh-cn/docs/developers/committer-guide/label-an-issue-guide_dev.html",
+ "meta": {}
}
\ No newline at end of file
[incubator-dubbo-website] branch asf-site updated: Update the user docs to fix the wrong description of sticky connection. (#189)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 57827a4 Update the user docs to fix the wrong description of sticky connection. (#189) 57827a4 is described below commit 57827a4f1c02848516af469274984883c64d037c Author: 田小波 AuthorDate: Tue Nov 27 13:03:33 2018 +0800 Update the user docs to fix the wrong description of sticky connection. (#189) --- docs/en-us/user/demos/stickiness.md | 9 - docs/zh-cn/user/demos/stickiness.md | 10 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/en-us/user/demos/stickiness.md b/docs/en-us/user/demos/stickiness.md index 37d615d..5db39b3 100644 --- a/docs/en-us/user/demos/stickiness.md +++ b/docs/en-us/user/demos/stickiness.md @@ -5,6 +5,13 @@ Sticky connections are used for stateful services, as much as possible so that c Sticky connections will automatically open [Delayed Connections](./lazy-connect.md) to reduce the number of long connections. ```xml - + ``` +Dubbo supports method-level sticky connection, and if you want more granular control, you can also configure as follow. + +```xml + + + +``` diff --git a/docs/zh-cn/user/demos/stickiness.md b/docs/zh-cn/user/demos/stickiness.md index 24a77df..9eef8f2 100644 --- a/docs/zh-cn/user/demos/stickiness.md +++ b/docs/zh-cn/user/demos/stickiness.md @@ -5,6 +5,14 @@ 粘滞连接将自动开启[延迟连接](./lazy-connect.md)，以减少长连接数。 ```xml - + +``` + +Dubbo 支持方法级别的粘滞连接，如果你想进行更细力度的控制，还可以这样配置。 + +```xml + + + ```
[incubator-dubbo-website] branch asf-site updated: translate the developer guide，issue #181 (#190)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 1afd81c translate the developer guide，issue #181 (#190)
1afd81c is described below
commit 1afd81c37a7a91f51ae3e5a8724ca3c568fea276
Author: ateacer
AuthorDate: Tue Nov 27 13:00:32 2018 +0800
translate the developer guide，issue #181 (#190)
* translate the new contribute guide
* translate the developer guide
* translate the document label an issue guide
---
.../committer-guide/label-an-issue-guide_dev.md| 25 +
.../committer-guide/website-guide_dev.md | 6 +-
.../contributor-guide/cla-signing-guide_dev.md | 23 +
.../contributor-guide/dubbo-extension-guide_dev.md | 48 -
.../mailing-list-subscription-guide_dev.md | 79 +-
.../software-donation-guide_dev.md | 113 -
docs/zh-cn/developers/user-guide/faq_dev.md| 26 -
7 files changed, 315 insertions(+), 5 deletions(-)
diff --git a/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
b/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
index 8f40cd8..55bee74 100644
--- a/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
+++ b/docs/zh-cn/developers/committer-guide/label-an-issue-guide_dev.md
@@ -1,2 +1,27 @@
# 给问题打标签
+如果您正在处理一个问题，请记得**给这个问题标记一个或者多个您认为有意义的标签**。有了标签，其他开发人员就会很轻松地识别出问题，以便对其进行分类并跟踪进度。
+
+对于需要编码和发版修复的issues和pull
requests，需要您**将其标记为[milestone](https://github.com/apache/incubator*dubbo/milestones)**。
+
+一些常用的标签：
+
+* 请求帮助
+ * help wanted
+ * good first issue
+* 优先级
+ * priority/blocker
+ * priority/high
+ * priority/low
+ * priority/normal
+* 状态
+ * status/need-triage
+ * status/DO-NOT-MERGE
+ * status/READY-TO-MERGE
+ * status/invalid
+ * status/wontfix
+* 类型
+ * type/bug
+ * type/documentation
+ * type/enhancement
+ * type/feature
diff --git a/docs/zh-cn/developers/committer-guide/website-guide_dev.md
b/docs/zh-cn/developers/committer-guide/website-guide_dev.md
index 77695ec..5741a2f 100644
--- a/docs/zh-cn/developers/committer-guide/website-guide_dev.md
+++ b/docs/zh-cn/developers/committer-guide/website-guide_dev.md
@@ -1 +1,5 @@
-# 网站向导
\ No newline at end of file
+# 网站向导
+
+1. Apache Dubbo(incubating) 的网站仓库是
https://github.com/apache/incubator-dubbo-website
+2. 网站构建完毕后，它会被自动发布到 dubbo.apache.org，您也可以通过 https://selfserve.apache.org
手动触发（需要使用 Apache 账号登陆）
+
diff --git a/docs/zh-cn/developers/contributor-guide/cla-signing-guide_dev.md
b/docs/zh-cn/developers/contributor-guide/cla-signing-guide_dev.md
index e7d224b..6ae7a04 100644
--- a/docs/zh-cn/developers/contributor-guide/cla-signing-guide_dev.md
+++ b/docs/zh-cn/developers/contributor-guide/cla-signing-guide_dev.md
@@ -1 +1,24 @@
# CLA签署向导
+
+以下情况，需要您签署Apache ICLA：
+
+* 在Dubbo被捐赠给Apache之前，您已经为Dubbo作出了很多贡献，并且您以前没有签署过Alibaba-CLA。
+* 您已经为Dubbo作出了很多贡献，并且您被邀请成为Dubbo提交者，且之前没有签署过Alibaba-CLA或者Apache ICLA。
+
+### 步骤
+
+* 下载这篇[pdf文档](https://www.apache.org/licenses/icla.pdf)
+* 编辑该文档，在必要的空格处填上适当的内容
+* 打印
+* 在打印好的文件上签字
+* 扫描
+* 发送一封邮件到secret...@apache.org，并抄送给priv...@dubbo.apache.org：
+ * 邮件标题为“ICLA submission”
+ * 请在邮件正文附上您的github账号链接
+ * 请记得将您的ICLA文档放入邮件的附件里
+
+### 空格填写必要说明
+
+* Mailing address：首选英文格式的公司地址
+* preferred apache id(s)：如果您被邀请成为一名提交者，那么需要您填写一个apache账号，否则，可以不填
+* notify project：Dubbo（意思就是Dubbo就是通知您签署ICLA的项目）
\ No newline at end of file
diff --git
a/docs/zh-cn/developers/contributor-guide/dubbo-extension-guide_dev.md
b/docs/zh-cn/developers/contributor-guide/dubbo-extension-guide_dev.md
index da06568..79c1ef2 100644
--- a/docs/zh-cn/developers/contributor-guide/dubbo-extension-guide_dev.md
+++ b/docs/zh-cn/developers/contributor-guide/dubbo-extension-guide_dev.md
@@ -1 +1,47 @@
-# Dubbo Extension向导
\ No newline at end of file
+# Dubbo Extension向导
+
+Dubbo使用微内核+插件的设计模式。内核只负责组装插件，Dubbo的功能都是由扩展点（插件）实现，这就意味着Dubbo的所有功能都可以被用户定制的扩展所替代。
+
+### Dubbo生态系统
+
+我们建议您将扩展加入到Dubbo生态系统。使用这种模式，可以使Dubbo的核心仓库更干净，并且可以减少维护工作。更少的代码也可以提高核心仓库的构建速度。
+
+### 依赖
+
+要实现您自己的Dubbo扩展，通常只需依赖API jar就可以满足您的需求。例如：
+
+```xml
+
+org.apache.dubbo
+dubbo-serialization-api
+${dubbo.version}
+
+```
+
+### Src指导
+
+通常，要实现特殊的扩展，只需要参考[开发者指南](http://dubbo.apache.org/#/docs/dev/build.md?lang=en-us)，实现Dubbo必要的接口和合适的扩展即可。除此之外，还有一些其它的事项需要注意：
+
+1. 良好的测试，您需要编写单元测试和冒烟测试以消除潜在的bug。
+2. 没有警告，如有不可避免的警告，请使用@SuppressWarnings阻止它，但是请不要乱用。
+3. README。添加必要的自述以说明如何使用扩展，以及需要注意的事项。
+4. 许可证：请确保使用Apache License 2.0。
+
+### 通知社区
+
+1. 提交您的代码到[github](https://github.com)。
+2.
加入邮件列表（建议）。点击[这里](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide)查看如何加入邮件列表。
+3. 发送一封邮件到d...@incubator.dubbo.apache.org通知社区。
+4. 通常，发送邮件之后，社区会对您的扩展进行讨论，dubbo组的管理员会联系您转移您的项目到dubbo生态系统。
+
+### 转移项目到dubbo生态系统
+
+1. dubbo组的管理员会请您将您的项目的所有者转让给dubbo。
+2. dubbo组的管理员会在dubbo组下新建一个项目并邀请您
[incubator-dubbo.wiki] branch master updated: Updated FAQ (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 2197281 Updated FAQ (markdown) 2197281 is described below commit 21972818beff4be2b1afc5f2a9a03904533a3acc Author: Xin Wang AuthorDate: Mon Nov 19 13:52:05 2018 +0800 Updated FAQ (markdown) --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 41d3074..da9b7df 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,3 +1,3 @@ -FAQ has been migrated to: https://github.com/apache/incubator-dubbo/blob/master/FAQ.md +FAQ has been migrated to: http://dubbo.apache.org/en-us/docs/developers/user-guide/faq_dev.html Pull request welcome! \ No newline at end of file
[incubator-dubbo-website] branch asf-site updated: remove useful files (#180)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 1265cfc remove useful files (#180) 1265cfc is described below commit 1265cfcb7bdb4eeaa9934983d0fb33bc9a752265 Author: Xin Wang AuthorDate: Mon Nov 19 14:14:09 2018 +0800 remove useful files (#180) --- .../committer-guide/label-an-issue-guide.html | 73 --- .../committer-guide/label-an-issue-guide.json | 6 - .../developers/committer-guide/label-an-issue.html | 73 --- .../developers/committer-guide/label-an-issue.json | 6 - .../committer-guide/label-an-issue_dev.html| 73 --- .../committer-guide/label-an-issue_dev.json| 6 - .../committer-guide/new-committer-guide.html | 116 -- .../committer-guide/new-committer-guide.json | 6 - .../developers/committer-guide/website-guide.html | 37 .../developers/committer-guide/website-guide.json | 6 - .../contributor-guide/cla-signing-guide.html | 59 -- .../contributor-guide/cla-signing-guide.json | 6 - .../contributor-guide/dubbo-extension-guide.html | 67 -- .../contributor-guide/dubbo-extension-guide.json | 6 - .../mailing-list-subscription-guide.html | 110 -- .../mailing-list-subscription-guide.json | 6 - .../contributor-guide/new-contributor-guide.html | 56 - .../contributor-guide/new-contributor-guide.json | 6 - .../contributor-guide/software-donation-guide.html | 132 .../contributor-guide/software-donation-guide.json | 6 - .../contributor-guide/test-coverage-guide.html | 53 - .../contributor-guide/test-coverage-guide.json | 6 - en-us/docs/developers/developer1_dev.html | 33 --- en-us/docs/developers/developer1_dev.json | 4 - en-us/docs/developers/developers_dev.html | 233 - en-us/docs/developers/developers_dev.json | 6 - en-us/docs/developers/user-guide/faq-dev.html | 54 - en-us/docs/developers/user-guide/faq-dev.json | 6 - en-us/docs/developers/user-guide/faq.html | 54 - en-us/docs/developers/user-guide/faq.json | 6 - site_config/develop.js | 2 +- .../developers/committer-guide/label-an-issue.html | 33 --- .../developers/committer-guide/label-an-issue.json | 6 - .../committer-guide/label-an-issue_dev.html| 33 --- .../committer-guide/label-an-issue_dev.json| 6 - .../committer-guide/new-committer-guide.html | 101 - .../committer-guide/new-committer-guide.json | 6 - .../developers/committer-guide/website-guide.html | 33 --- .../developers/committer-guide/website-guide.json | 6 - zh-cn/docs/developers/committers_dev.html | 33 --- zh-cn/docs/developers/committers_dev.json | 4 - .../contributor-guide/cla-signing-guide.html | 33 --- .../contributor-guide/cla-signing-guide.json | 6 - .../contributor-guide/dubbo-extension-guide.html | 33 --- .../contributor-guide/dubbo-extension-guide.json | 6 - .../dubbo-extension-guide_dev.html | 33 --- .../mailing-list-subscription-guide.html | 33 --- .../mailing-list-subscription-guide.json | 6 - .../contributor-guide/new-contributor-guide.html | 33 --- .../contributor-guide/new-contributor-guide.json | 6 - .../contributor-guide/software-donation-guide.html | 33 --- .../contributor-guide/software-donation-guide.json | 6 - .../contributor-guide/test-coverage-guide.html | 53 - .../contributor-guide/test-coverage-guide.json | 6 - zh-cn/docs/developers/developer1_dev.html | 33 --- zh-cn/docs/developers/developer1_dev.json | 4 - zh-cn/docs/developers/user-guide/faq.html | 33 --- zh-cn/docs/developers/user-guide/faq.json | 6 - 58 files changed, 1 insertion(+), 1936 deletions(-) diff --git a/en-us/docs/developers/committer-guide/label-an-issue-guide.html b/en-us/docs/developers/committer-guide/label-an-issue-guide.html deleted file mode 100644 index 615bbeb..000 --- a/en-us/docs/developers/committer-guide/label-an-issue-guide.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - label-an-issue-guide - - - - - 中If you are handling an issue, remember to mark the issue cearly with one or more labels whenever you think it's meaningful. With labels on, other developers can easily recognize problems, classify them or track progress. -For issues or pull requests that need coding and further version release to fix, you should always mark it with a https://github.com/apache/incubator-dubbo/milestones;>milestone. -Some frequently used lab
[incubator-dubbo.wiki] branch master updated: Updated New contributor guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new ae6ecfd Updated New contributor guide (markdown) ae6ecfd is described below commit ae6ecfda63f13fe1ed24f0fd6c1d158a2f153139 Author: Xin Wang AuthorDate: Mon Nov 19 22:36:47 2018 +0800 Updated New contributor guide (markdown) --- New-contributor-guide.md | 33 + 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/New-contributor-guide.md b/New-contributor-guide.md index f49593c..f291f9a 100644 --- a/New-contributor-guide.md +++ b/New-contributor-guide.md @@ -1,32 +1 @@ -This is a guide for new comers who wants to contribute to Dubbo. - -### Subscribe to the mailing list - -The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [issue](https://github.com/apache/incubator-dubbo/issues/1393) for detailed documentation on how to subscribe. - -* d...@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: all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development. -* iss...@dubbo.incubator.apache.org: all the JIRA [issues](https://issues.apache.org/jira/projects/DUBBO/issues) and updates will be sent to this mailing list. The Dubbo community has decided to use github issues rather than JIRA issues, therefore it is expected that most of the issues will be tracked by github issues. The JIRA issues are used to track ASF related issues. - - -### Reporting issue - -### Sending pull request - -* Follow the checklist in the [pull request template](https://github.com/apache/incubator-dubbo/blob/master/PULL_REQUEST_TEMPLATE.md) -* Before you sending out the pull request, please sync your forked repository with remote repository, this will make your pull request simple and clear. See guide below: - -```sh -git remote add upstream g...@github.com:apache/incubator-dubbo.git -git fetch upstream -git rebase upstream/master -git checkout -b your_awesome_patch -... add some work -git push origin your_awesome_patch -``` - - -### Code convention - -Please check the [CONTRIBUTING.md](https://github.com/apache/incubator-dubbo/blob/master/CONTRIBUTING.md) for code convention. - + New contributor guide is moved to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/new-contributor-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated New contributor guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 244ee1f Updated New contributor guide (markdown) 244ee1f is described below commit 244ee1f672a873bd47a3858a6e274e8cf9f96500 Author: Xin Wang AuthorDate: Mon Nov 19 22:37:14 2018 +0800 Updated New contributor guide (markdown) --- New-contributor-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/New-contributor-guide.md b/New-contributor-guide.md index f291f9a..457c397 100644 --- a/New-contributor-guide.md +++ b/New-contributor-guide.md @@ -1 +1 @@ - New contributor guide is moved to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/new-contributor-guide_dev.html \ No newline at end of file + New contributor guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/new-contributor-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated Test coverage guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 5c2508c Updated Test coverage guide (markdown) 5c2508c is described below commit 5c2508cee27a76640d407b91d27301b69125c6f5 Author: Xin Wang AuthorDate: Mon Nov 19 22:39:33 2018 +0800 Updated Test coverage guide (markdown) --- Test-coverage-guide.md | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Test-coverage-guide.md b/Test-coverage-guide.md index 18e9e05..7ca1a59 100644 --- a/Test-coverage-guide.md +++ b/Test-coverage-guide.md @@ -1,14 +1 @@ -### 1.The benefits of unit testing - * Unit test code can help everyone to go into details and understand the function of the code. - * We can find bugs by test case, and then enhance the robustness of the code. - * Test case code is also the demo usage of the core code. -### 2.Some design principle of unit test case - * Steps, fine-grained and combination conditions should be well designed. - * Attention to boundary condition test - * Test code should also be designed without writing useless code. - * When you find a `method` that is hard to write unit test, if you can be sure the `method` is "smelly code", then refactor it with the committer. - * The mock framework in dubbo is: [mockito](http://site.mockito.org/). Some tutorials:[mockito tutorial](http://www.baeldung.com/bdd-mockito),[mockito refcard](https://dzone.com/refcardz/mockito) - * TDD（optional）：When you start a new issue, you can try to write test case at first -### 3.The specified value of the test coverage - * In the stage, the test coverage specified value of delta changed codes is ：>=60%. The higher, the better. - * We can see the coverage report in this page: https://codecov.io/gh/apache/incubator-dubbo \ No newline at end of file +Test coverage guide has bean migrated http://dubbo.apache.org/en-us/docs/developers/contributor-guide/test-coverage-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated CLA signing guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 57b4797 Updated CLA signing guide (markdown) 57b4797 is described below commit 57b4797190aacf8ffe17cd5072789308d5cd11b1 Author: Xin Wang AuthorDate: Mon Nov 19 22:40:25 2018 +0800 Updated CLA signing guide (markdown) --- CLA-signing-guide.md | 24 +--- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/CLA-signing-guide.md b/CLA-signing-guide.md index bf017ef..94a2bff 100644 --- a/CLA-signing-guide.md +++ b/CLA-signing-guide.md @@ -1,23 +1 @@ -You are required to sign the Apache ICLA under the following condition: -* You have made lots of contribution to Dubbo before Dubbo get donated to Apache, and you haven't sign the Alibaba-CLA before. -* You have made lots of contribution to Dubbo, and you are invited to become committer of Dubbo, and you have not signed Alibaba-CLA or Apache ICLA before. - - Steps - -* Download this [pdf](https://www.apache.org/licenses/icla.pdf) -* Fill in the necessary blanks -* Print it out -* Sign the printed file -* Scan it -* Send an email to secret...@apache.org and cc priv...@dubbo.apache.org: - * entitled with "ICLA submission" - * please also provide the link to your github account in the email body - * remember to add you ICLA as attachment. - - - Explanation to the fields - -* Mailing address: Your company address in English is preferred. -* preferred apache id(s): if you are invited to become committers, you have to choose one apache id, otherwise you can leave it blank. -* notify project: Dubbo (This means Dubbo is the project who notifies you to sign the ICLA) - +CLA signing guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/mailing-list-subscription-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated Mailing list subscription guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new c3273de Updated Mailing list subscription guide (markdown) c3273de is described below commit c3273def1bf736c59a7f073b55b1f84f2272e67c Author: Xin Wang AuthorDate: Mon Nov 19 22:41:18 2018 +0800 Updated Mailing list subscription guide (markdown) --- Mailing-list-subscription-guide.md | 77 +- 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/Mailing-list-subscription-guide.md b/Mailing-list-subscription-guide.md index 1def3f0..035711a 100644 --- a/Mailing-list-subscription-guide.md +++ b/Mailing-list-subscription-guide.md @@ -1,76 +1 @@ -The Dubbo developer mailing list (d...@dubbo.incubator.apache.org) for Apache Incubator has been established, please feel free to subscribe and refer to [1] for more details. - -Here is a brief guide specific to Dubbo: - -1. Send an email to dev-subscr...@dubbo.incubator.apache.org, you can have empty subject and empty content. You will receive an email with the following content: - -``` -from: dev-h...@dubbo.apache.org -reply-to: dev-sc.xxx.-hello=example@dubbo.apache.org -to: he...@example.com -date: Sat, Feb 24, 2018 at 3:12 PM -subject: confirm subscribe to d...@dubbo.apache.org -mailed-by: apache.org - -Hi! This is the ezmlm program. I'm managing the -d...@dubbo.apache.org mailing list. - -I'm working for my owner, who can be reached -at dev-ow...@dubbo.apache.org. - -To confirm that you would like - - he...@example.com - -added to the dev mailing list, please send -a short reply to this address: - - dev-sc.xxx.-hello=example@dubbo.apache.org - -Usually, this happens when you just hit the "reply" button. -If this does not work, simply copy the address and paste it into -the "To:" field of a new message. - -or click here: -mailto:dev-sc.xxx.-hello=example@dubbo.apache.org - -... -``` - -2. Reply the email directly, you can have empty subject and empty content. You will receive an email with the following content: - -``` -from: dev-h...@dubbo.apache.org -to: he...@example.com -date: Sat, Feb 24, 2018 at 3:14 PM -subject: WELCOME to d...@dubbo.apache.org -mailed-by: apache.org - -Hi! This is the ezmlm program. I'm managing the -d...@dubbo.apache.org mailing list. - -I'm working for my owner, who can be reached -at dev-ow...@dubbo.apache.org. - -Acknowledgment: I have added the address - - he...@example.com - -to the dev mailing list. - -Welcome to d...@dubbo.apache.org! - -Please save this message so that you know the address you are -subscribed under, in case you later want to unsubscribe or change your -subscription address. - -... -``` - -3. After that, you will receive any email that is posted to this mailing list. If you have any further questions, just send email to d...@dubbo.incubator.apache.org and hopefully someone will answer your questions. - -4. If you want to unsubscribe, just send an email to dev-unsubscr...@dubbo.incubator.apache.org, and follow the steps once you get an reply. - -> Note that both d...@dubbo.apache.org and d...@dubbo.incubator.apache.org should work, you can pick any of it. - -[1] http://apache.org/foundation/mailinglists.html#subscribing \ No newline at end of file +Mailing list subscription guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/mailing-list-subscription-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated CLA signing guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new e7cee43 Updated CLA signing guide (markdown) e7cee43 is described below commit e7cee4320df52244a0040469c9bc5c6838f37824 Author: Xin Wang AuthorDate: Mon Nov 19 22:41:44 2018 +0800 Updated CLA signing guide (markdown) --- CLA-signing-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLA-signing-guide.md b/CLA-signing-guide.md index 94a2bff..20ca703 100644 --- a/CLA-signing-guide.md +++ b/CLA-signing-guide.md @@ -1 +1 @@ -CLA signing guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/mailing-list-subscription-guide_dev.html \ No newline at end of file +CLA signing guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/cla-signing-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated New Committer Guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 5fac32c Updated New Committer Guide (markdown) 5fac32c is described below commit 5fac32c853ef7cc1ac1032779c577a97f1026220 Author: Xin Wang AuthorDate: Mon Nov 19 22:43:35 2018 +0800 Updated New Committer Guide (markdown) --- New-Committer-Guide.md | 89 +- 1 file changed, 1 insertion(+), 88 deletions(-) diff --git a/New-Committer-Guide.md b/New-Committer-Guide.md index ac29273..e5988fd 100644 --- a/New-Committer-Guide.md +++ b/New-Committer-Guide.md @@ -1,88 +1 @@ -# Apache Committer Guide - -## First: How to become a committer - -### Initial committers at the project incubator stage -At the project incubator stage, there will be an initial committers list in the proposal of the incubator project. Confirm that you are one of the initial committers. After the vote is passed in the Apache incubator community, these committers can start preparing their account. See [incubator wiki](https://wiki.apache.org/incubator/) for details. - -### The active contributor is elected as a committer -At the late development stage, an active contributor can be elected as a committer. See [how to become a committer](https://www.apache.org/dev/new-committers-guide.html#becoming-a-committer) - -## Second: The individual contributor signs ICLA - -### 1, Apache ID -Choose a Apache ID not in the [apache committers list page](http://people.apache.org/committer-index.html). - -### 2, Individual Contributor License Agreement (ICLA): -Download the [ICLA template](https://www.apache.org/licenses/icla.pdf). After filling the icla.pdf with personal information correctly, print, sign, scan, and send it in mail as an attachment to the secretary secret...@apache.org, the secretary will help to create the Apache user ID. At the same time, a your...@apache.org mailbox will be created. You can see if the user has been created on the [apache committers list page (http://people.apache.org/committer-index.html). - -## Third: Join The Apache Developer Group - -* 1, login via the [Apache account tool](https://id.apache.org/), when you login at the first time, you can select the "Change password?" checkbox to get the initial password. Then the initial password will be sent to the forward mailbox (the developer mail recorded in the project incubator proposal) - -* 2, about Apache mailbox: does not have its own mail content storage server. It needs to borrow the mail content storage and mail sending functions of other mail providers. In many voting sessions, Apache mailbox is recommended. - -There is a question about how to configure the apache.org mailbox forwarding function using other mailboxes. - -1) inbox: to receive mails that sent to youer...@apache.org mailbox. The forward mailbox configured in the Apache account tool in the first step can use the forward mailbox to pick up incoming mail. - -2) the Outbox: emails sent out will show the sender as your...@apache.org account. Please refer to: [set up Apache mailbox guide](https://reference.apache.org/committer/email) and [Gmail mailbox setting](http://gmailblog.blogspot.com/2009/07/send-mail-from-another-address-without.html). In other mailbox service settings, this forwarding mode is not easy to find. Gmail is the most convenient, which is recommended (no advertising). - -* 3, Modify the homepage URL option in the edit page, homepage link of your account can be added in [apache committer index page](http://people.apache.org/committer-index.html) - -* 4, Modify the GitHub account in the edit page, and an email will be sent to invite you to join the github.com/apache-commiiters group. Now, please learn from the way [ASF works](http://www.apache.org/foundation/how-it-works.html#developers) to do some basic preparation of ASF development. - -## Fourth: To obtain write permission of the project - -Operation of the [GitBox account link tool](https://gitbox.apache.org/setup/) - -### 1, Apache account authorization - -According to the prompt, the OAuth protocol of Apache account is authorized to login. - -### 2, Github account authorization - -According to the prompt, the OAuth protocol of Github account is authorized to login. - -### 3, Set up GitHub account in github.com, two-factors authorization (2FA) - -* 1) install "Google Authenticator" app on your cell phone -* 2), Following the [authorized GitHub 2FA wiki](https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/), you can operation step by step . - -In the [two-factors authorization authentication (2. Scan this barcode with your app.)](https://github.com/settings/two_factor_authentication/verify) page, it is not recomme
[incubator-dubbo.wiki] branch master updated: Updated Label an Issue (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 0d8cb71 Updated Label an Issue (markdown) 0d8cb71 is described below commit 0d8cb71579d420afab0a9fa87f7aff1e1b2b246d Author: Xin Wang AuthorDate: Mon Nov 19 22:44:08 2018 +0800 Updated Label an Issue (markdown) --- Label-an-Issue.md | 29 + 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/Label-an-Issue.md b/Label-an-Issue.md index 5f8d8ea..af70615 100644 --- a/Label-an-Issue.md +++ b/Label-an-Issue.md @@ -1,28 +1 @@ -If you are handling an issue, remember to **mark the issue cearly with one or more labels** whenever you think it's meaningful. With labels on, other developers can easily recognize problems, classify them or track progress. - -For issues or pull requests that need coding and further version release to fix, you should always **mark it with a [milestone](https://github.com/apache/incubator-dubbo/milestones)**. - -Some frequently used labels: -* Help Wanted - * help wanted - * good first issue - -* Prority - * priority/blocker - * priority/high - * priority/low - * priority/normal - -* Status - * status/need-triage - * status/DO-NOT-MERGE - * status/READY-TO-MERGE - * status/invalid - * status/wontfix - -* Type - * type/bug - * type/documentation - * type/enhancement - * type/feature - +Label an Issue has been migrated to http://dubbo.apache.org/en-us/docs/developers/committer-guide/label-an-issue-guide_dev.html \ No newline at end of file
[incubator-dubbo] branch master updated: fix wrong word spelling (#3217)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 67df884 fix wrong word spelling (#3217)
67df884 is described below
commit 67df8848dcb00f2e8e60cb4f195794cba45d9a68
Author: mimihom <46643402+mimi...@users.noreply.github.com>
AuthorDate: Sun Jan 13 19:40:50 2019 +0800
fix wrong word spelling (#3217)
---
.../src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index bd6e0fb..c7f62f7 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -96,7 +96,7 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
protected String listener;
/**
- * The owner of zhe service providers
+ * The owner of the service providers
*/
protected String owner;
[incubator-dubbo] branch master updated: add twitter follow (#3104)
This is an automated email from the ASF dual-hosted git repository. wangxin 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 bdb78b8 add twitter follow (#3104) bdb78b8 is described below commit bdb78b8e1f0a63d7899e4637a8f589d75c3f3fdb Author: Xin Wang AuthorDate: Mon Dec 31 17:39:40 2018 +0800 add twitter follow (#3104) * add twitter follow --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b63ab5e..5b00da2 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [](http://isitmaintained.com/project/apache/incubator-dubbo "Average time to resolve an issue") [](http://isitmaintained.com/project/apache/incubator-dubbo "Percentage of issues still open") [](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) +[](https://twitter.com/intent/follow?screen_name=ApacheDubbo) [](https://gitter.im/alibaba/dubbo?utm_source=badge_medium=badge_campaign=pr-badge) 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.
[incubator-dubbo-website] branch asf-site updated: add codecov test coverage address (#208)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 1274248 add codecov test coverage address (#208) 1274248 is described below commit 1274248e5c6484f02282f95415bcc088a33900b2 Author: Xin Wang AuthorDate: Thu Dec 20 12:54:47 2018 +0800 add codecov test coverage address (#208) * add codecov test coverage address * change the date of codecov * delete useless blank --- docs/en-us/user/coveragence.md | 5 +++-- docs/zh-cn/user/coveragence.md | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/en-us/user/coveragence.md b/docs/en-us/user/coveragence.md index 346fc1a..6f15a76 100644 --- a/docs/en-us/user/coveragence.md +++ b/docs/en-us/user/coveragence.md @@ -1,6 +1,7 @@ # Test coverage report - -Based on version `2.0.12`，Statistics on 2012-02-03 +* v2.0 Codecov report , Statistics since 2017-12-29 + The test coverage is : [](https://codecov.io/gh/apache/incubator-dubbo) , we can get the report in https://codecov.io/gh/apache/incubator-dubbo +* v1.0 Based on version `2.0.12`，Statistics on 2012-02-03  diff --git a/docs/zh-cn/user/coveragence.md b/docs/zh-cn/user/coveragence.md index 7c3e09a..508fde1 100644 --- a/docs/zh-cn/user/coveragence.md +++ b/docs/zh-cn/user/coveragence.md @@ -1,6 +1,8 @@ # 测试覆盖率报告 -基于 `2.0.12` 版本，统计于 2012-02-03 +* v2.0 Codecov报表 , 从2017-12-29后开始统计 + 测试覆盖率为 : [](https://codecov.io/gh/apache/incubator-dubbo) , 可以从 https://codecov.io/gh/apache/incubator-dubbo页面得到覆盖率报表 +* v1.0 基于 `2.0.12` 版本，统计于 2012-02-03 
[incubator-dubbo-website] branch asf-site updated: generate html
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 1d96fc9 generate html
1d96fc9 is described below
commit 1d96fc9e6e9fb90ff9bea72fc0131d7e7e52d608
Author: Xin Wang
AuthorDate: Mon Jan 28 09:27:44 2019 +0800
generate html
---
build/blog.js | 6 +-
build/blogDetail.js | 6 +-
build/community.js| 6 +-
build/documentation.js| 6 +-
build/home.js | 6 +-
en-us/docs/developers/developers_dev.html | 21 +-
en-us/docs/developers/developers_dev.json | 2 +-
en-us/docs/user/references/telnet.html| 16 +-
en-us/docs/user/references/telnet.json| 2 +-
md_json/blog.json | 19 ++
zh-cn/blog/Configuration Conclude.html| 189 ++
zh-cn/blog/Configuration Conclude.json| 6 +
zh-cn/blog/Guides for upgrading to 2.7.x.html | 342
zh-cn/blog/Guides for upgrading to 2.7.x.json | 6 +
zh-cn/blog/dubbo-heartbeat-design.html| 358 ++
zh-cn/blog/dubbo-heartbeat-design.json| 10 +
zh-cn/blog/index.html | 2 +-
zh-cn/docs/dev/principals/code-detail.html| 4 +-
zh-cn/docs/dev/principals/code-detail.json| 2 +-
zh-cn/docs/dev/principals/robustness.html | 4 +-
zh-cn/docs/dev/principals/robustness.json | 2 +-
zh-cn/docs/developers/developers_dev.html | 21 +-
zh-cn/docs/developers/developers_dev.json | 2 +-
zh-cn/docs/user/references/telnet.html| 15 +-
zh-cn/docs/user/references/telnet.json| 2 +-
25 files changed, 1010 insertions(+), 45 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 7ff2578..3097b5b 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=80) [...]
- 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=78) [...]
+ 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+8
+carryxyh
+Yuhang Xiu
+Netease
+PPMC
++8
+
+
hyunkun
YunKun Huang
@@ -160,13 +167,6 @@
+8
-carryxyh
-Yuhang Xiu
-Netease
-Committer
-+8
-
-
min
Minxuan Zhuang
Alibaba
@@ -208,6 +208,13 @@
Committer
+8
+
+tswstarplanet
+Taosheng Wei
+NetsUnion
+Committer
++8
+
Contributors
diff --git a/en-us/docs/developers/developers_dev.json
b/en-us/docs/developers/developers_dev.json
index 272fda6..ca181d5 100644
--- a/en-us/docs/developers/developers_dev.json
+++ b/en-us/docs/developers/developers_dev.json
@@ -1,6 +1,6 @@
{
"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\nMent
[incubator-dubbo-website] 01/01: Revert "修改错别字 (#344)"
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch revert-344-asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
commit e58fd52fcf56ec669b134b47cc6b8cce5cf4ef4b
Author: Xin Wang
AuthorDate: Mon Mar 25 19:31:40 2019 +0800
Revert "修改错别字 (#344)"
This reverts commit 8e2afd29e1d6f1235e39ccc6f0c17e0fb07649a5.
---
blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md | 4 ++--
zh-cn/docs/user/preface/requirements.html| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md
b/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md
index bfc7569..1ffc7ba 100644
--- a/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md
+++ b/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md
@@ -11,7 +11,7 @@ description: 首届Dubbo开发者沙龙在北京成功举办
分享嘉宾及主体如下：
- * 罗毅: Dubbo 的现状现状与未来规划
[PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf)
+ * 罗军: Dubbo 的现状现状与未来规划
[PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf)
* 刘军: 第四届阿里中间件性能挑战赛
[PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf)
* 陈志轩: 通过 Dubbo 和 Spring-boot 快速构建微服务
[PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/quickly-building-microservice-with-dubbo-and-springboot.pdf)
- * 王欣: Dubbo 和微店的服务化实践历程分享
[PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf)
+ * 王欣: Dubbo 和微店的服务化实践历程分享
[PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf)
\ No newline at end of file
diff --git a/zh-cn/docs/user/preface/requirements.html
b/zh-cn/docs/user/preface/requirements.html
index f7a4187..50b8edc 100644
--- a/zh-cn/docs/user/preface/requirements.html
+++ b/zh-cn/docs/user/preface/requirements.html
@@ -15,7 +15,7 @@
En
在大规模服务化之前，应用可能只是通过 RMI 或 Hessian 等工具，简单的暴露和引用远程服务，通过配置服务的URL地址进行调用，通过 F5
等硬件进行负载均衡。
-当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。
此时需要一个服务注册中心，动态地注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5
硬件负载均衡器的依赖，也能减少部分成本。
+当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。
此时需要一个服务注册中心，动态的注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5
硬件负载均衡器的依赖，也能减少部分成本。
当进一步发展，服务间依赖关系变得错踪复杂，甚至分不清哪个应用要在哪个应用之前启动，架构师都不能完整的描述应用的架构关系。
这时，需要自动画出应用间的依赖关系图，以帮助架构师理清理关系。
接着，服务的调用量越来越大，服务的容量问题就暴露出来，这个服务需要多少机器支撑？什么时候该加机器？
为了解决这些问题，第一步，要将服务现在每天的调用量，响应时间，都统计出来，作为容量规划的参考指标。其次，要可以动态调整权重，在线上，将某台机器的权重一直加大，并在加大的过程中记录响应时间的变化，直到响应时间到达阈值，记录此时的访问量，再以此访问量乘以机器数反推总容量。
以上是 Dubbo 最基本的几个需求。
@@ -36,4 +36,4 @@
gtag('config', 'UA-112489517-1');
-
+
\ No newline at end of file
[incubator-dubbo-website] branch revert-344-asf-site updated: Update dubbo-meetup-beijing-may-12th-2018.md
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch revert-344-asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/revert-344-asf-site by this push: new 693bc95 Update dubbo-meetup-beijing-may-12th-2018.md 693bc95 is described below commit 693bc9540fbbc29d249a4bcb1378fa6a753531e1 Author: Xin Wang AuthorDate: Mon Mar 25 19:35:05 2019 +0800 Update dubbo-meetup-beijing-may-12th-2018.md --- blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md b/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md index 1ffc7ba..bfc7569 100644 --- a/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md +++ b/blog/zh-cn/dubbo-meetup-beijing-may-12th-2018.md @@ -11,7 +11,7 @@ description: 首届Dubbo开发者沙龙在北京成功举办 分享嘉宾及主体如下： - * 罗军: Dubbo 的现状现状与未来规划 [PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf) + * 罗毅: Dubbo 的现状现状与未来规划 [PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf) * 刘军: 第四届阿里中间件性能挑战赛 [PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf) * 陈志轩: 通过 Dubbo 和 Spring-boot 快速构建微服务 [PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/quickly-building-microservice-with-dubbo-and-springboot.pdf) - * 王欣: Dubbo 和微店的服务化实践历程分享 [PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf) \ No newline at end of file + * 王欣: Dubbo 和微店的服务化实践历程分享 [PDF](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf)
[incubator-dubbo-website] branch revert-344-asf-site created (now e58fd52)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch revert-344-asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git. at e58fd52 Revert "修改错别字 (#344)" This branch includes the following new commits: new e58fd52 Revert "修改错别字 (#344)" 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-website] branch revert-344-asf-site deleted (was 48a88f1)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch revert-344-asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git. was 48a88f1 Update requirements.md 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-website] branch asf-site updated: Revert "修改错别字" (#345)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 92fe7f0 Revert "修改错别字" (#345)
92fe7f0 is described below
commit 92fe7f051f9906f900f18a38b8b36f22137c57ca
Author: Xin Wang
AuthorDate: Mon Mar 25 19:39:14 2019 +0800
Revert "修改错别字" (#345)
* Update requirements.md
---
docs/zh-cn/user/preface/requirements.md | 4 ++--
zh-cn/docs/user/preface/requirements.html | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/zh-cn/user/preface/requirements.md
b/docs/zh-cn/user/preface/requirements.md
index 34167b0..06c25c3 100644
--- a/docs/zh-cn/user/preface/requirements.md
+++ b/docs/zh-cn/user/preface/requirements.md
@@ -4,10 +4,10 @@
在大规模服务化之前，应用可能只是通过 RMI 或 Hessian 等工具，简单的暴露和引用远程服务，通过配置服务的URL地址进行调用，通过 F5
等硬件进行负载均衡。
-**当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。**
此时需要一个服务注册中心，动态的注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5
硬件负载均衡器的依赖，也能减少部分成本。
+**当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。**
此时需要一个服务注册中心，动态地注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5
硬件负载均衡器的依赖，也能减少部分成本。
**当进一步发展，服务间依赖关系变得错踪复杂，甚至分不清哪个应用要在哪个应用之前启动，架构师都不能完整的描述应用的架构关系。**
这时，需要自动画出应用间的依赖关系图，以帮助架构师理清理关系。
**接着，服务的调用量越来越大，服务的容量问题就暴露出来，这个服务需要多少机器支撑？什么时候该加机器？**
为了解决这些问题，第一步，要将服务现在每天的调用量，响应时间，都统计出来，作为容量规划的参考指标。其次，要可以动态调整权重，在线上，将某台机器的权重一直加大，并在加大的过程中记录响应时间的变化，直到响应时间到达阈值，记录此时的访问量，再以此访问量乘以机器数反推总容量。
-以上是 Dubbo 最基本的几个需求。
\ No newline at end of file
+以上是 Dubbo 最基本的几个需求。
diff --git a/zh-cn/docs/user/preface/requirements.html
b/zh-cn/docs/user/preface/requirements.html
index f7a4187..50b8edc 100644
--- a/zh-cn/docs/user/preface/requirements.html
+++ b/zh-cn/docs/user/preface/requirements.html
@@ -15,7 +15,7 @@
En
在大规模服务化之前，应用可能只是通过 RMI 或 Hessian 等工具，简单的暴露和引用远程服务，通过配置服务的URL地址进行调用，通过 F5
等硬件进行负载均衡。
-当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。
此时需要一个服务注册中心，动态地注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5
硬件负载均衡器的依赖，也能减少部分成本。
+当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。
此时需要一个服务注册中心，动态的注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5
硬件负载均衡器的依赖，也能减少部分成本。
当进一步发展，服务间依赖关系变得错踪复杂，甚至分不清哪个应用要在哪个应用之前启动，架构师都不能完整的描述应用的架构关系。
这时，需要自动画出应用间的依赖关系图，以帮助架构师理清理关系。
接着，服务的调用量越来越大，服务的容量问题就暴露出来，这个服务需要多少机器支撑？什么时候该加机器？
为了解决这些问题，第一步，要将服务现在每天的调用量，响应时间，都统计出来，作为容量规划的参考指标。其次，要可以动态调整权重，在线上，将某台机器的权重一直加大，并在加大的过程中记录响应时间的变化，直到响应时间到达阈值，记录此时的访问量，再以此访问量乘以机器数反推总容量。
以上是 Dubbo 最基本的几个需求。
@@ -36,4 +36,4 @@
gtag('config', 'UA-112489517-1');
-
+
\ No newline at end of file
[incubator-dubbo-website] branch revert-323-fix/322 deleted (was 19bc413)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch revert-323-fix/322 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git. was 19bc413 Revert "highlight stars and forks. resolve #322 (#323)" 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-website] branch revert-344-asf-site updated: Update requirements.md
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch revert-344-asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/revert-344-asf-site by this push: new 48a88f1 Update requirements.md 48a88f1 is described below commit 48a88f198926084d560fc94a1f5a000510ef77a2 Author: Xin Wang AuthorDate: Mon Mar 25 19:38:35 2019 +0800 Update requirements.md --- docs/zh-cn/user/preface/requirements.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh-cn/user/preface/requirements.md b/docs/zh-cn/user/preface/requirements.md index 34167b0..06c25c3 100644 --- a/docs/zh-cn/user/preface/requirements.md +++ b/docs/zh-cn/user/preface/requirements.md @@ -4,10 +4,10 @@ 在大规模服务化之前，应用可能只是通过 RMI 或 Hessian 等工具，简单的暴露和引用远程服务，通过配置服务的URL地址进行调用，通过 F5 等硬件进行负载均衡。 -**当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。** 此时需要一个服务注册中心，动态的注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5 硬件负载均衡器的依赖，也能减少部分成本。 +**当服务越来越多时，服务 URL 配置管理变得非常困难，F5 硬件负载均衡器的单点压力也越来越大。** 此时需要一个服务注册中心，动态地注册和发现服务，使服务的位置透明。并通过在消费方获取服务提供方地址列表，实现软负载均衡和 Failover，降低对 F5 硬件负载均衡器的依赖，也能减少部分成本。 **当进一步发展，服务间依赖关系变得错踪复杂，甚至分不清哪个应用要在哪个应用之前启动，架构师都不能完整的描述应用的架构关系。** 这时，需要自动画出应用间的依赖关系图，以帮助架构师理清理关系。 **接着，服务的调用量越来越大，服务的容量问题就暴露出来，这个服务需要多少机器支撑？什么时候该加机器？** 为了解决这些问题，第一步，要将服务现在每天的调用量，响应时间，都统计出来，作为容量规划的参考指标。其次，要可以动态调整权重，在线上，将某台机器的权重一直加大，并在加大的过程中记录响应时间的变化，直到响应时间到达阈值，记录此时的访问量，再以此访问量乘以机器数反推总容量。 -以上是 Dubbo 最基本的几个需求。 \ No newline at end of file +以上是 Dubbo 最基本的几个需求。
[incubator-dubbo-website] branch asf-site updated: build htmls
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 7b273b5 build htmls
7b273b5 is described below
commit 7b273b537a91edb540b7d9fe2a64025d761260cc
Author: Xin Wang
AuthorDate: Mon Mar 25 19:41:39 2019 +0800
build htmls
---
en-us/docs/user/demos/local-stub.html | 2 +-
en-us/docs/user/demos/local-stub.json | 2 +-
zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.html | 2 +-
zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json | 2 +-
zh-cn/docs/user/demos/local-stub.html | 4 ++--
zh-cn/docs/user/demos/local-stub.json | 2 +-
zh-cn/docs/user/preface/requirements.html | 2 +-
zh-cn/docs/user/preface/requirements.json | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/en-us/docs/user/demos/local-stub.html
b/en-us/docs/user/demos/local-stub.html
index 24b276d..3d3c7bc 100644
--- a/en-us/docs/user/demos/local-stub.html
+++ b/en-us/docs/user/demos/local-stub.html
@@ -28,7 +28,7 @@
private final BarService barService;
// The real remote proxy object is passed in
through the constructor
-public (BarService barService) {
+public BarServiceStub(BarService
barService){
this.barService = barService;
}
diff --git a/en-us/docs/user/demos/local-stub.json
b/en-us/docs/user/demos/local-stub.json
index 735e29f..280a4ec 100644
--- a/en-us/docs/user/demos/local-stub.json
+++ b/en-us/docs/user/demos/local-stub.json
@@ -1,6 +1,6 @@
{
"filename": "local-stub.md",
- "__html": "Local stub\nWhen using rpc, the client usually only
the interface, but sometimes the client also want to perform part of the logic
in the client. For example: do ThreadLocal cache, verify parameters, return
mock data when call fails., etc.\nTo solve this problem, you can
configure the stub in the API, so that when the client generates the proxy
instance, it passes the proxy to the Stub via the constructor Local stub\nWhen using rpc, the client usually only
the interface, but sometimes the client also want to perform part of the logic
in the client. For example: do ThreadLocal cache, verify parameters, return
mock data when call fails., etc.\nTo solve this problem, you can
configure the stub in the API, so that when the client generates the proxy
instance, it passes the proxy to the Stub via the constructor 首届Dubbo开发者沙龙在北京成功举办, 超过400位开发者参加。这是一个很好的开始！
分享嘉宾及主体如下：
-罗军: Dubbo 的现状现状与未来规划 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf;>PDF
+罗毅: Dubbo 的现状现状与未来规划 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf;>PDF
刘军: 第四届阿里中间件性能挑战赛 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf;>PDF
陈志轩: 通过 Dubbo 和 Spring-boot 快速构建微服务 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/quickly-building-microservice-with-dubbo-and-springboot.pdf;>PDF
王欣: Dubbo 和微店的服务化实践历程分享 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf">PDF
diff --git a/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
b/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
index 2dcc43f..1c268af 100644
--- a/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
+++ b/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.json
@@ -1,6 +1,6 @@
{
"filename": "dubbo-meetup-beijing-may-12th-2018.md",
- "__html": "首届Dubbo开发者沙龙在北京成功举办\n首届Dubbo开发者沙龙在北京成功举办,
超过400位开发者参加。这是一个很好的开始！\n分享嘉宾及主体如下：\n\n罗军: Dubbo 的现状现状与未来规划
https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf\;>PDF\n刘军:
第四届阿里中间件性能挑战赛 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf\;>PDF\n陈志轩:
通过 Dubbo 和 Spring-b [...]
+ "__html": "首届Dubbo开发者沙龙在北京成功举办\n首届Dubbo开发者沙龙在北京成功举办,
超过400位开发者参加。这是一个很好的开始！\n分享嘉宾及主体如下：\n\n罗毅: Dubbo 的现状现状与未来规划
https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf\;>PDF\n刘军:
第四届阿里中间件性能挑战赛 https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf\;>PDF\n陈志轩:
通过 Dubbo 和 Spring-b [...]
"link": "/zh-cn/blog/dubbo-meetup-beijing-may-12th-2018.html",
"meta": {
"title": "首届Dubbo开发者沙龙在北京成功举办",
diff --git a/zh-cn/docs/user/demos/local-stub.html
b/zh-cn/docs/user/demos/local-stub.html
index 9ca0623..68
[incubator-dubbo-website] branch asf-site updated: genrate htmls
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 55ff61b genrate htmls
55ff61b is described below
commit 55ff61beba90e893b40055eadb00f063687ba7ac
Author: Xin Wang
AuthorDate: Mon Mar 4 18:24:57 2019 +0800
genrate htmls
---
build/blog.js| 2 +-
en-us/blog/introduction-to-dubbo-spi-2.html | 85 +++
en-us/blog/introduction-to-dubbo-spi-2.json | 2 +-
en-us/docs/developers/developers_dev.html| 13 +--
en-us/docs/developers/developers_dev.json| 2 +-
md_json/blog.json| 32 ++
zh-cn/blog/dubbo-admin.html | 2 +-
zh-cn/blog/dubbo-admin.json | 2 +-
zh-cn/blog/dubbo-echo-test.html | 111 +++
zh-cn/blog/dubbo-echo-test.json | 6 ++
zh-cn/blog/dubbo-gracefully-shutdown.html| 130 +++
zh-cn/blog/dubbo-gracefully-shutdown.json| 10 ++
zh-cn/blog/dubboAsync_client.html| 102 ++
zh-cn/blog/dubboAsync_client.json| 10 ++
zh-cn/blog/dubboAsync_server.html| 103 ++
zh-cn/blog/dubboAsync_server.json| 10 ++
zh-cn/blog/index.html| 2 +-
zh-cn/blog/introduction-to-dubbo-spi-2.html | 86 +++
zh-cn/blog/introduction-to-dubbo-spi-2.json | 2 +-
zh-cn/docs/dev/principals/configuration.html | 17 ++-
zh-cn/docs/dev/principals/configuration.json | 2 +-
zh-cn/docs/developers/developers_dev.html| 13 +--
zh-cn/docs/developers/developers_dev.json| 2 +-
zh-cn/docs/source_code_guide/export-service.html | 2 +-
zh-cn/docs/source_code_guide/export-service.json | 2 +-
zh-cn/docs/source_code_guide/refer-service.html | 8 +-
zh-cn/docs/source_code_guide/refer-service.json | 2 +-
27 files changed, 645 insertions(+), 115 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index b8388d7..e3be865 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
中
In the actual implementation of
the Dubbo extensibility mechanism, we learned some concepts of the Dubbo
extension mechanism, explored the implementation of LoadBalance in Dubbo, and
implemented a LoadBalance on our own. Do you think Dubbo's extension mechanism
is great? Next, we will go deep into the source code of Dubbo and see what it
is.
ExtensionLoader
-ExtentionLoader is the core class, which is responsible for
the loading and lifecycle management of extension points. Let's start with this
class. There are many methods of Extension, and the common methods include:
+ExtensionLoader is the core class, which is responsible for
the loading and lifecycle management of extension points. Let's start with this
class. There are many methods of Extension, and the common methods include:
public static T ExtensionLoaderT
getExtensionLoader(ClassT type)
public T getExtension(String name)
@@ -50,12 +49,12 @@ This is a static factory method that enters an extensible
interface and returns
loader = (ExtensionLoaderT) EXTENSION_LOADERS.get(type);
}
return loader;
-}
+}
private ExtensionLoader(Class? type) {
this.type = type;
objectFactory = (type == ExtensionFactory.class ? null :
ExtensionLoader.getExtensionLoader(ExtensionFactory.class).getAdaptiveExtension());
-}
+}
getExtension
@@ -78,9 +77,9 @@ This is a static factory method that enters an extensible
interface and returns
}
}
return (T) instance;
-}
+}
-Some judgments and caching have been made in the getExtention method, and
the main logic is in the createExtension method. Let's move on to the
createExtention method.
+Some judgments and caching have been made in the getExtension method, and
the main logic is in the createExtension method. Let's move on to the
createExtension method.
private T createExtension(String
name) {
// Get the extension class according to the
name of extension point. For example, for LoadBalance, get the
RandomLoadBalance class according to random
Class? clazz = getExtensionClasses().get(name);
@@ -108,7 +107,7 @@ This is a static factory method that enters an extensible
interface and returns
First, get the corresponding extension class according to name. Read the
extension point configuration file from the META-INF folder under
ClassPath.
Use reflection to create an instance of an extended class.
make dependency
[incubator-dubbo-website] branch asf-site updated: add github star and fork icons in home page (#309)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 5d421d1 add github star and fork icons in home page (#309)
5d421d1 is described below
commit 5d421d181e39dab504a8503dafad3d2b0d28bfe4
Author: Xin Wang
AuthorDate: Mon Mar 4 23:55:12 2019 +0800
add github star and fork icons in home page (#309)
* update
* update icon align center
update icon align center
* add imgs
---
img/fork.png | Bin 0 -> 350 bytes
img/star.png | Bin 0 -> 297 bytes
src/pages/home/index.jsx | 30 ++
src/pages/home/index.scss | 35 ++-
4 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/img/fork.png b/img/fork.png
new file mode 100644
index 000..76f8100
Binary files /dev/null and b/img/fork.png differ
diff --git a/img/star.png b/img/star.png
new file mode 100644
index 000..25811c9
Binary files /dev/null and b/img/star.png differ
diff --git a/src/pages/home/index.jsx b/src/pages/home/index.jsx
index 2326a87..16cf50c 100644
--- a/src/pages/home/index.jsx
+++ b/src/pages/home/index.jsx
@@ -17,6 +17,8 @@ class Home extends Language {
super(props);
this.state = {
headerType: 'primary',
+ starCount: 0,
+ forkCount: 0,
};
}
@@ -33,9 +35,19 @@ class Home extends Language {
});
}
});
+
+fetch('//api.github.com/repos/apache/incubator-dubbo')
+.then(res => res.json())
+.then((data) => {
+ this.setState({
+starCount: data.stargazers_count,
+forkCount: data.forks_count,
+ });
+});
}
render() {
+const { starCount, forkCount } = this.state;
const language = this.getLanguage();
const dataSource = homeConfig[language];
const { headerType } = this.state;
@@ -61,6 +73,24 @@ class Home extends Language {
{dataSource.brand.getStartedButton.text}
{dataSource.brand.viewOnGithubButton.text}
+
+ https://github.com/apache/incubator-dubbo;>
+
+
+ Star
+
+ {starCount}
+
+
+ https://github.com/apache/incubator-dubbo/fork;>
+
+
+ Fork
+
+ {forkCount}
+
+
+
diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss
index 71ddeda..496931b 100644
--- a/src/pages/home/index.scss
+++ b/src/pages/home/index.scss
@@ -128,6 +128,39 @@
margin-right: 20px;
}
}
+.github-buttons {
+ margin-top: 20px;
+ a {
+margin-right: 0px;
+margin-left: 20px;
+img {
+ width: 16px;
+ height: 16px;
+}
+div {
+ border-radius: 2px;
+ display: inline-block;
+ height: 24px;
+ line-height: 24px;
+ padding-left: 5px;
+ color: #fff;
+ background: rgba(255, 255, 255, 0.2);
+ .type {
+padding: 0 8px 0 4px;
+ }
+ .line {
+display: inline-block;
+box-sizing: border-box;
+width: 1px;
+height: 12px;
+border-left: 1px solid rgba(255, 255, 255, 0.2);
+ }
+ .count {
+padding: 0 14px;
+ }
+}
+ }
+}
}
.introduction-section {
background: #F9FAFA;
@@ -431,4 +464,4 @@
padding-right: 20px;
}
}
-}
\ No newline at end of file
+}
[incubator-dubbo-website] branch asf-site updated: generate htmls
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new fef32c7 generate htmls
fef32c7 is described below
commit fef32c765301c53bf96a5df4c0a9e3f78c2f20f3
Author: Xin Wang
AuthorDate: Tue Mar 5 00:10:18 2019 +0800
generate htmls
---
build/blog.js | 2 +-
build/blogDetail.js| 2 +-
build/community.js | 2 +-
build/documentation.js | 4 ++--
build/home.css | 26 ++
build/home.js | 4 ++--
en-us/index.html | 2 +-
zh-cn/index.html | 2 +-
8 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index e3be865..6a8bcee 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;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://f.alicdn.com/react/15.4.1/react-with-addons.min.js;>
https://f.alicdn.com/react/15.4.1/react-dom.min.js"</a>;>
diff --git a/zh-cn/index.html b/zh-cn/index.html
index 74ab1f3..6f61cde 100644
--- a/zh-cn/index.html
+++ b/zh-cn/index.html
@@ -12,7 +12,7 @@
<link rel="stylesheet" href="/build/home.css" />
</head>
<body>
- <div id="root"><div class="home-page" data-reactroot=""><section
class="top-section"><header class="header-container
header-container-primary"><div class="header-body"><a
href="/zh-cn/index.html"><img class="logo" src="/img/dubbo_white.png"/></a><div
class="search search-primary"><span class="icon-search"></span></div><span
class="language-switch language-switch-primary">En</span><div
class="header-menu"><img class="header-menu-toggle"
src="/img/menu_white.png"/><ul><li class="menu-item [...]
+ <div id="root"><div class="home-page" data-reactroot=""><section
class="top-section"><header class="header-container
header-container-primary"><div class="header-body"><a
href="/zh-cn/index.html"><img class="logo" src="/img/dubbo_white.png"/></a><div
class="search search-primary"><span class="icon-search"></span></div><span
class="language-switch language-switch-primary">En</span><div
class="header-menu"><img class="header-menu-toggle"
src="/img/menu_white.png"/><ul><li class="menu-item [...]
<script
src="<a rel="nofollow" href="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"">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: generate htmls
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 0506160 generate htmls
0506160 is described below
commit 0506160a6864059609af359d04b6161a702ce8b8
Author: Xin Wang
AuthorDate: Tue Mar 5 00:07:58 2019 +0800
generate htmls
---
src/pages/home/index.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/home/index.jsx b/src/pages/home/index.jsx
index 16cf50c..1626c4b 100644
--- a/src/pages/home/index.jsx
+++ b/src/pages/home/index.jsx
@@ -76,7 +76,7 @@ class Home extends Language {
https://github.com/apache/incubator-dubbo;>
-
+
Star
{starCount}
@@ -84,7 +84,7 @@ class Home extends Language {
https://github.com/apache/incubator-dubbo/fork;>
-
+
Fork
{forkCount}
[incubator-dubbo-website] branch asf-site updated: generate htmls
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d4ba421 generate htmls
d4ba421 is described below
commit d4ba4216244b987bcaba6e7b4669fb80bca5f59a
Author: Xin Wang
AuthorDate: Tue Mar 5 00:06:20 2019 +0800
generate htmls
---
.../committer-guide/new-committer-guide_dev.html | 5 +-
.../committer-guide/new-committer-guide_dev.json | 2 +-
.../committer-guide/release-guide_dev.html | 427 -
.../committer-guide/release-guide_dev.json | 7 +-
en-us/docs/developers/developers_dev.html | 29 +-
en-us/docs/developers/developers_dev.json | 2 +-
en-us/index.html | 2 +-
md_json/docs.json | 10 +-
src/pages/home/index.scss | 4 +-
.../committer-guide/new-committer-guide_dev.html | 3 +
.../committer-guide/new-committer-guide_dev.json | 2 +-
.../committer-guide/release-guide_dev.html | 373 +-
.../committer-guide/release-guide_dev.json | 7 +-
zh-cn/docs/developers/developers_dev.html | 37 +-
zh-cn/docs/developers/developers_dev.json | 2 +-
zh-cn/index.html | 2 +-
16 files changed, 872 insertions(+), 42 deletions(-)
diff --git a/en-us/docs/developers/committer-guide/new-committer-guide_dev.html
b/en-us/docs/developers/committer-guide/new-committer-guide_dev.html
index 605e452..12d90f8 100644
--- a/en-us/docs/developers/committer-guide/new-committer-guide_dev.html
+++ b/en-us/docs/developers/committer-guide/new-committer-guide_dev.html
@@ -91,7 +91,10 @@
The Apache way
See http://apache.org/foundation/governance/;>wiki.
The community is more important than the code
-If not discussed in the community (mailing list), just as it did not happen
+If not discussed in the community (mailing list), just as it did not
happen.
+Add your name
+Please update Dubbo incubator status https://incubator.apache.org/projects/dubbo.html;>page to add your
name. See this http://dubbo.apache.org/en-us/docs/developers/committer-guide/apache-dubbo-page_dev.html;>guide
for instructions.
+Please update Dubbo offiical http://dubbo.apache.org/en-us/docs/developers/developers_dev.html;>website
to update your name.
A small benefit
Jetbrains company gives Apache committers a small benefit, which is free to
use IDEA's full series products. The specific address is: https://www.jetbrains.com/shop/eform/apache?Product=ALL;>https://www.jetbrains.com/shop/eform/apache?Product=ALL
Reference wiki
diff --git a/en-us/docs/developers/committer-guide/new-committer-guide_dev.json
b/en-us/docs/developers/committer-guide/new-committer-guide_dev.json
index 0acdd65..2b215a3 100644
--- a/en-us/docs/developers/committer-guide/new-committer-guide_dev.json
+++ b/en-us/docs/developers/committer-guide/new-committer-guide_dev.json
@@ -1,6 +1,6 @@
{
"filename": "new-committer-guide_dev.md",
- "__html": "Apache Committer Guide\nFirst: How to become a
committer\nInitial committers at the project incubator
stage\nAt the project incubator stage, there will be an initial
committers list in the proposal of the incubator project. Confirm that you are
one of the initial committers. After the vote is passed in the Apache incubator
community, these committers can start preparing their account. See https://wiki.apache.org/incubator/\;>incubator [...]
+ "__html": "Apache Committer Guide\nFirst: How to become a
committer\nInitial committers at the project incubator
stage\nAt the project incubator stage, there will be an initial
committers list in the proposal of the incubator project. Confirm that you are
one of the initial committers. After the vote is passed in the Apache incubator
community, these committers can start preparing their account. See https://wiki.apache.org/incubator/\;>incubator [...]
"link":
"/en-us/docs/developers/committer-guide/new-committer-guide_dev.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/developers/committer-guide/release-guide_dev.html
b/en-us/docs/developers/committer-guide/release-guide_dev.html
index 95b4a38..3b1b42b 100644
--- a/en-us/docs/developers/committer-guide/release-guide_dev.html
+++ b/en-us/docs/developers/committer-guide/release-guide_dev.html
@@ -4,16 +4,435 @@
-
+
- release-guide_dev
+ Release Guide
- 中Please refer to this excellent http://dubbo.apache.org/en-us/blog/prepare-an-apache-release.html;>blog
+ 中In general, Source Release is the key and the required content of Apa
[incubator-dubbo-website] branch asf-site updated: delete incubator-dubbo-website.iml (#332)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new bc2138d delete incubator-dubbo-website.iml (#332) bc2138d is described below commit bc2138d83360781e2699e0b7f7e38d323da62300 Author: jimin AuthorDate: Sat Mar 16 17:34:44 2019 +0800 delete incubator-dubbo-website.iml (#332) --- incubator-dubbo-website.iml | 9 - 1 file changed, 9 deletions(-) diff --git a/incubator-dubbo-website.iml b/incubator-dubbo-website.iml deleted file mode 100644 index 8021953..000 --- a/incubator-dubbo-website.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file
[incubator-dubbo-website] branch asf-site updated: fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml (#331)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new fe9a71d fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml (#331) fe9a71d is described below commit fe9a71de9624424430951008ba4ba1cec93cf26b Author: jimin AuthorDate: Sat Mar 16 21:30:35 2019 +0800 fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml (#331) * add doc How to use Fescar to ensure consistency between Dubbo Microservices * fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml --- .gitignore | 1 + blog/en-us/dubbo-fescar.md | 7 --- blog/zh-cn/dubbo-fescar.md | 7 --- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f538a9d..7a04d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ node_modules/ npm-debug.log *.orig package-lock.json +*.iml \ No newline at end of file diff --git a/blog/en-us/dubbo-fescar.md b/blog/en-us/dubbo-fescar.md index fd68f49..75736f8 100644 --- a/blog/en-us/dubbo-fescar.md +++ b/blog/en-us/dubbo-fescar.md @@ -149,11 +149,12 @@ dubbo-storage-service.xml ``` -### Step 2: Create UNDO_LOG table for Fescar +### Step 2: Create undo_log table for Fescar `UNDO_LOG` table is required by Fescar AT mode. ```sql +-- Note that when Fescar version is upgraded to 0.3.0+, it is changed from the previous normal index to the unique index. CREATE TABLE `undo_log` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `branch_id` bigint(20) NOT NULL, @@ -164,8 +165,8 @@ CREATE TABLE `undo_log` ( `log_modified` datetime NOT NULL, `ext` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`), - KEY `idx_unionkey` (`xid`,`branch_id`) -) ENGINE=InnoDB AUTO_INCREMENT=159 DEFAULT CHARSET=utf8 + UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; ``` ### Step 3: Create tables for example business diff --git a/blog/zh-cn/dubbo-fescar.md b/blog/zh-cn/dubbo-fescar.md index 2dd2bb3..b61afc4 100644 --- a/blog/zh-cn/dubbo-fescar.md +++ b/blog/zh-cn/dubbo-fescar.md @@ -149,11 +149,12 @@ dubbo-storage-service.xml ``` -### Step 2: 为 Fescar 创建 UNDO_LOG 表 +### Step 2: 为 Fescar 创建 undo_log 表 `UNDO_LOG` 此表用于 Fescar 的AT模式。 ```sql +-- 注意当 Fescar 版本升级至 0.3.0+ 将由之前的普通索引变更为唯一索引。 CREATE TABLE `undo_log` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `branch_id` bigint(20) NOT NULL, @@ -164,8 +165,8 @@ CREATE TABLE `undo_log` ( `log_modified` datetime NOT NULL, `ext` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`), - KEY `idx_unionkey` (`xid`,`branch_id`) -) ENGINE=InnoDB AUTO_INCREMENT=159 DEFAULT CHARSET=utf8 + UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; ``` ### Step 3: 创建相关业务表
[incubator-dubbo-website] branch asf-site updated: Revert "highlight stars and forks. resolve #322 (#323)" (#324)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 8c38b97 Revert "highlight stars and forks. resolve #322 (#323)" (#324)
8c38b97 is described below
commit 8c38b97697cdabf83d0248d0fef2ec0acfe095af
Author: Xin Wang
AuthorDate: Thu Mar 14 16:09:04 2019 +0800
Revert "highlight stars and forks. resolve #322 (#323)" (#324)
This reverts commit 49dc2336040852fa6453081d49b84a14676104f6.
---
src/pages/home/index.jsx | 40 ++--
src/pages/home/index.scss | 34 ++
2 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/src/pages/home/index.jsx b/src/pages/home/index.jsx
index d56c707..1626c4b 100644
--- a/src/pages/home/index.jsx
+++ b/src/pages/home/index.jsx
@@ -17,6 +17,8 @@ class Home extends Language {
super(props);
this.state = {
headerType: 'primary',
+ starCount: 0,
+ forkCount: 0,
};
}
@@ -33,9 +35,19 @@ class Home extends Language {
});
}
});
+
+fetch('//api.github.com/repos/apache/incubator-dubbo')
+.then(res => res.json())
+.then((data) => {
+ this.setState({
+starCount: data.stargazers_count,
+forkCount: data.forks_count,
+ });
+});
}
render() {
+const { starCount, forkCount } = this.state;
const language = this.getLanguage();
const dataSource = homeConfig[language];
const { headerType } = this.state;
@@ -61,16 +73,24 @@ class Home extends Language {
{dataSource.brand.getStartedButton.text}
{dataSource.brand.viewOnGithubButton.text}
-
- https://github.com/apache/incubator-dubbo;>
- https://img.shields.io/github/stars/apache/incubator-dubbo.svg?style=for-the-badge;
/>
-
- https://github.com/apache/incubator-dubbo;>
- https://img.shields.io/github/forks/apache/incubator-dubbo.svg?style=for-the-badge;
/>
-
-
+
+ https://github.com/apache/incubator-dubbo;>
+
+
+ Star
+
+ {starCount}
+
+
+ https://github.com/apache/incubator-dubbo/fork;>
+
+
+ Fork
+
+ {forkCount}
+
+
+
diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss
index ae0..3abc3ac 100644
--- a/src/pages/home/index.scss
+++ b/src/pages/home/index.scss
@@ -130,10 +130,36 @@
}
.github-buttons {
margin-top: 20px;
- text-align: center;
- a {
- margin-left: 20px;
- }
+ a {
+margin-right: 10px;
+margin-left: 10px;
+img {
+ width: 16px;
+ height: 16px;
+}
+div {
+ border-radius: 2px;
+ display: inline-block;
+ height: 24px;
+ line-height: 24px;
+ padding-left: 5px;
+ color: #fff;
+ background: rgba(255, 255, 255, 0.2);
+ .type {
+padding: 0 8px 0 4px;
+ }
+ .line {
+display: inline-block;
+box-sizing: border-box;
+width: 1px;
+height: 12px;
+border-left: 1px solid rgba(255, 255, 255, 0.2);
+ }
+ .count {
+padding: 0 14px;
+ }
+}
+ }
}
}
.introduction-section {
[incubator-dubbo-website] branch revert-323-fix/322 created (now 19bc413)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch revert-323-fix/322 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git. at 19bc413 Revert "highlight stars and forks. resolve #322 (#323)" This branch includes the following new commits: new 19bc413 Revert "highlight stars and forks. resolve #322 (#323)" 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-website] 01/01: Revert "highlight stars and forks. resolve #322 (#323)"
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch revert-323-fix/322
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
commit 19bc413aad2a1688b666d0d735698f72b3b23eb3
Author: Xin Wang
AuthorDate: Thu Mar 14 16:08:35 2019 +0800
Revert "highlight stars and forks. resolve #322 (#323)"
This reverts commit 49dc2336040852fa6453081d49b84a14676104f6.
---
src/pages/home/index.jsx | 40 ++--
src/pages/home/index.scss | 34 ++
2 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/src/pages/home/index.jsx b/src/pages/home/index.jsx
index d56c707..1626c4b 100644
--- a/src/pages/home/index.jsx
+++ b/src/pages/home/index.jsx
@@ -17,6 +17,8 @@ class Home extends Language {
super(props);
this.state = {
headerType: 'primary',
+ starCount: 0,
+ forkCount: 0,
};
}
@@ -33,9 +35,19 @@ class Home extends Language {
});
}
});
+
+fetch('//api.github.com/repos/apache/incubator-dubbo')
+.then(res => res.json())
+.then((data) => {
+ this.setState({
+starCount: data.stargazers_count,
+forkCount: data.forks_count,
+ });
+});
}
render() {
+const { starCount, forkCount } = this.state;
const language = this.getLanguage();
const dataSource = homeConfig[language];
const { headerType } = this.state;
@@ -61,16 +73,24 @@ class Home extends Language {
{dataSource.brand.getStartedButton.text}
{dataSource.brand.viewOnGithubButton.text}
-
- https://github.com/apache/incubator-dubbo;>
- https://img.shields.io/github/stars/apache/incubator-dubbo.svg?style=for-the-badge;
/>
-
- https://github.com/apache/incubator-dubbo;>
- https://img.shields.io/github/forks/apache/incubator-dubbo.svg?style=for-the-badge;
/>
-
-
+
+ https://github.com/apache/incubator-dubbo;>
+
+
+ Star
+
+ {starCount}
+
+
+ https://github.com/apache/incubator-dubbo/fork;>
+
+
+ Fork
+
+ {forkCount}
+
+
+
diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss
index ae0..3abc3ac 100644
--- a/src/pages/home/index.scss
+++ b/src/pages/home/index.scss
@@ -130,10 +130,36 @@
}
.github-buttons {
margin-top: 20px;
- text-align: center;
- a {
- margin-left: 20px;
- }
+ a {
+margin-right: 10px;
+margin-left: 10px;
+img {
+ width: 16px;
+ height: 16px;
+}
+div {
+ border-radius: 2px;
+ display: inline-block;
+ height: 24px;
+ line-height: 24px;
+ padding-left: 5px;
+ color: #fff;
+ background: rgba(255, 255, 255, 0.2);
+ .type {
+padding: 0 8px 0 4px;
+ }
+ .line {
+display: inline-block;
+box-sizing: border-box;
+width: 1px;
+height: 12px;
+border-left: 1px solid rgba(255, 255, 255, 0.2);
+ }
+ .count {
+padding: 0 14px;
+ }
+}
+ }
}
}
.introduction-section {
[incubator-dubbo-website] branch asf-site updated: generate htmls (#325)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new aa3ff2f generate htmls (#325)
aa3ff2f is described below
commit aa3ff2feae2916365b5c73c0f2ea32e191ef6265
Author: Xin Wang
AuthorDate: Thu Mar 14 17:29:02 2019 +0800
generate htmls (#325)
---
build/blog.js | 2 +-
build/blogDetail.js| 2 +-
build/community.js | 2 +-
build/documentation.js | 2 +-
build/home.css | 27 ---
build/home.js | 4 ++--
en-us/index.html | 2 +-
zh-cn/index.html | 2 +-
8 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 296d9cf..bf3c331 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;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://f.alicdn.com/react/15.4.1/react-with-addons.min.js;>
https://f.alicdn.com/react/15.4.1/react-dom.min.js"</a>;>
diff --git a/zh-cn/index.html b/zh-cn/index.html
index 4b4e392..b393369 100644
--- a/zh-cn/index.html
+++ b/zh-cn/index.html
@@ -12,7 +12,7 @@
<link rel="stylesheet" href="/build/home.css" />
</head>
<body>
- <div id="root"><div class="home-page" data-reactroot=""><section
class="top-section"><header class="header-container
header-container-primary"><div class="header-body"><a
href="/zh-cn/index.html"><img class="logo" src="/img/dubbo_white.png"/></a><div
class="search search-primary"><span class="icon-search"></span></div><span
class="language-switch language-switch-primary">En</span><div
class="header-menu"><img class="header-menu-toggle"
src="/img/menu_white.png"/><ul><li class="menu-item [...]
+ <div id="root"><div class="home-page" data-reactroot=""><section
class="top-section"><header class="header-container
header-container-primary"><div class="header-body"><a
href="/zh-cn/index.html"><img class="logo" src="/img/dubbo_white.png"/></a><div
class="search search-primary"><span class="icon-search"></span></div><span
class="language-switch language-switch-primary">En</span><div
class="header-menu"><img class="header-menu-toggle"
src="/img/menu_white.png"/><ul><li class="menu-item [...]
<script
src="<a rel="nofollow" href="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"">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] branch revert-3300-add_openjdk_to_travis deleted (was 3aa712a)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch revert-3300-add_openjdk_to_travis in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was 3aa712a Revert "add openjdk to travis (#3300)" This change permanently discards the following revisions: discard 3aa712a Revert "add openjdk to travis (#3300)"
[incubator-dubbo] 01/01: Revert "add openjdk to travis (#3300)"
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch revert-3300-add_openjdk_to_travis in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git commit 3aa712ac155a329b502b778ab31a3d06b7115066 Author: Xin Wang AuthorDate: Tue Mar 12 22:28:59 2019 +0800 Revert "add openjdk to travis (#3300)" This reverts commit bf3b423dc5635511000fbd2dcae1b955fbd87d67. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3821cb..e3f3350 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,7 @@ language: java sudo: false # faster builds jdk: - - openjdk11 - oraclejdk11 - - openjdk8 - oraclejdk8 cache:
[incubator-dubbo] branch revert-3300-add_openjdk_to_travis created (now 3aa712a)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch revert-3300-add_openjdk_to_travis in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at 3aa712a Revert "add openjdk to travis (#3300)" This branch includes the following new commits: new 3aa712a Revert "add openjdk to travis (#3300)" 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] branch master updated: Update junit to 5.4.0 release version (#3441)
This is an automated email from the ASF dual-hosted git repository.
wangxin 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 bccac78 Update junit to 5.4.0 release version (#3441)
bccac78 is described below
commit bccac78e9f1473469e97bebccd516fafaab7e8a1
Author: Xin Wang
AuthorDate: Sat Feb 9 02:17:58 2019 +0800
Update junit to 5.4.0 release version (#3441)
* update junit to 5.4.0 release version
* remove uesles config
---
.../org/apache/dubbo/common/utils/IOUtilsTest.java | 8 +++
.../dubbo/config/AbstractInterfaceConfigTest.java | 5 +---
dubbo-config/dubbo-config-spring/pom.xml | 28 --
.../remoting/p2p/support/FileNetworkerTest.java| 5 +---
pom.xml| 4 ++--
5 files changed, 7 insertions(+), 43 deletions(-)
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
index 9e32f93..3b5743d 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
@@ -21,8 +21,7 @@ package org.apache.dubbo.common.utils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.support.io.TempDirectory;
+import org.junit.jupiter.api.io.TempDir;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -38,7 +37,6 @@ import java.nio.file.Path;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
-@ExtendWith(TempDirectory.class)
public class IOUtilsTest {
private static String TEXT =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890";
@@ -89,7 +87,7 @@ public class IOUtilsTest {
}
@Test
-public void testLines(@TempDirectory.TempDir Path tmpDir) throws Exception
{
+public void testLines(@TempDir Path tmpDir) throws Exception {
File file = tmpDir.getFileName().toAbsolutePath().toFile();
IOUtils.writeLines(file, new String[]{TEXT});
String[] lines = IOUtils.readLines(file);
@@ -118,7 +116,7 @@ public class IOUtilsTest {
}
@Test
-public void testAppendLines(@TempDirectory.TempDir Path tmpDir) throws
Exception {
+public void testAppendLines(@TempDir Path tmpDir) throws Exception {
File file = tmpDir.getFileName().toAbsolutePath().toFile();
IOUtils.appendLines(file, new String[]{"a", "b", "c"});
String[] lines = IOUtils.readLines(file);
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
index f0d1a80..6f30581 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
@@ -34,9 +34,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.support.io.TempDirectory;
-import org.junit.jupiter.api.support.io.TempDirectory.TempDir;
+import org.junit.jupiter.api.io.TempDir;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -48,7 +46,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-@ExtendWith(TempDirectory.class)
public class AbstractInterfaceConfigTest {
private static File dubboProperties;
diff --git a/dubbo-config/dubbo-config-spring/pom.xml
b/dubbo-config/dubbo-config-spring/pom.xml
index 08cc297..988715b 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -129,32 +129,4 @@
test
-
-
-
-
-
-
diff --git
a/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
b/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
index 37818c7..a442173 100644
---
a/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
+++
b/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
@@ -27,9 +27,7 @@ import
org.apache.dubbo.remoting.transport.ChannelHandlerAdapter;
import org.junit.jupiter.api.AfterEach;
[incubator-dubbo-website] branch asf-site updated: fix typo (#292)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 528736b fix typo (#292) 528736b is described below commit 528736b9da0a49a8237c2269561d0a642bc27808 Author: kezhenxu94 AuthorDate: Sun Feb 17 17:47:49 2019 +0800 fix typo (#292) --- docs/zh-cn/source_code_guide/loadbalance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-cn/source_code_guide/loadbalance.md b/docs/zh-cn/source_code_guide/loadbalance.md index d86f9bf..658ea3e 100644 --- a/docs/zh-cn/source_code_guide/loadbalance.md +++ b/docs/zh-cn/source_code_guide/loadbalance.md @@ -233,7 +233,7 @@ int weight = invoker.getUrl().getMethodParameter(invocation.getMethodName(), Con offsetWeight -= getWeight(invokers.get(leastIndex), invocation); ``` -问题出在服务预热阶段，第一行代码直接从 url 中去权重值，未被降权过。第二行代码获取到的是经过降权后的权重。第一行代码获取到的权重值最终会被累加到权重总和 totalWeight 中，这个时候会导致一个问题。offsetWeight 是一个在 [0, totalWeight) 范围内的随机数，而它所减去的是经过降权的权重。很有可能在经过 leastCount 次运算后，offsetWeight 仍然是大于0的，导致无法选中 Invoker。这个问题对应的 issue 为 [#904](https://github.com/apache/incubator-dubbo/issues/904)，并在 pull request [#2172](https://github.com/apache/incubator-dubbo/pull/2172) 中被修复。具体的修复逻辑是将标注一处的代码修改为： +问题出在服务预热阶段，第一行代码直接从 url 中取权重值，未被降权过。第二行代码获取到的是经过降权后的权重。第一行代码获取到的权重值最终会被累加到权重总和 totalWeight 中，这个时候会导致一个问题。offsetWeight 是一个在 [0, totalWeight) 范围内的随机数，而它所减去的是经过降权的权重。很有可能在经过 leastCount 次运算后，offsetWeight 仍然是大于0的，导致无法选中 Invoker。这个问题对应的 issue 为 [#904](https://github.com/apache/incubator-dubbo/issues/904)，并在 pull request [#2172](https://github.com/apache/incubator-dubbo/pull/2172) 中被修复。具体的修复逻辑是将标注一处的代码修改为： ```java // afterWarmup 等价于上面的 weight 变量，这样命名是为了强调该变量经过了 warmup 降权处理
[incubator-dubbo-website] branch asf-site updated: Declare the source version in the first article of the source code guide. (#291)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new d0f2a9e Declare the source version in the first article of the source code guide. (#291) d0f2a9e is described below commit d0f2a9e78a5d0c57f332df43b3304143951b70bb Author: 田小波 AuthorDate: Sun Feb 17 17:49:56 2019 +0800 Declare the source version in the first article of the source code guide. (#291) --- docs/zh-cn/source_code_guide/dubbo-spi.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/zh-cn/source_code_guide/dubbo-spi.md b/docs/zh-cn/source_code_guide/dubbo-spi.md index 3e91631..415a989 100644 --- a/docs/zh-cn/source_code_guide/dubbo-spi.md +++ b/docs/zh-cn/source_code_guide/dubbo-spi.md @@ -8,6 +8,8 @@ description: 本文介绍了 Dubbo SPI 的原理和实现细节 SPI 全称为 Service Provider Interface，是一种服务发现机制。SPI 的本质是将接口实现类的全限定名配置在文件中，并由服务加载器读取配置文件，加载实现类。这样可以在运行时，动态为接口替换实现类。正因此特性，我们可以很容易的通过 SPI 机制为我们的程序提供拓展功能。SPI 机制在第三方框架中也有所应用，比如 Dubbo 就是通过 SPI 机制加载所有的组件。不过，Dubbo 并未使用 Java 原生的 SPI 机制，而是对其进行了增强，使其能够更好的满足需求。在 Dubbo 中，SPI 是一个非常重要的模块。基于 SPI，我们可以很容易的对 Dubbo 进行拓展。如果大家想要学习 Dubbo 的源码，SPI 机制务必弄懂。接下来，我们先来了解一下 Java SPI 与 Dubbo SPI 的用法，然后再来分析 Dubbo SPI 的源码。 +需要特别说明的是，本篇文章以及本系列其他文章所分析的源码版本均为 **dubbo-2.6.4**。因此大家在阅读文章的过程中，需注意将代码版本切换到 dubbo-2.6.4 tag 上。 + ## 2.SPI 示例 ### 2.1 Java SPI 示例
[incubator-dubbo-website] branch asf-site updated: add dubbo admin download link (#290)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new cf0efa1 add dubbo admin download link (#290) cf0efa1 is described below commit cf0efa1aa077bb280043ed6b8edc737cb802e6df Author: min AuthorDate: Sun Feb 17 17:49:30 2019 +0800 add dubbo admin download link (#290) * update 2.7.0 related docs * add update notice for unfinished docs * add dubbo admin download link --- blog/en-us/download.md | 6 +- blog/zh-cn/download.md | 6 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/blog/en-us/download.md b/blog/en-us/download.md index f49bcc2..8557ee5 100644 --- a/blog/en-us/download.md +++ b/blog/en-us/download.md @@ -74,4 +74,8 @@ ## [Dubbo Admin](https://github.com/apache/incubator-dubbo-ops) -All new Dubbo Admin is coming. \ No newline at end of file +### 0.1 (2019-02-15) + +* [source](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/dubbo-ops/0.1/apache-dubbo-ops-incubating-0.1-source-release.zip) | +[asc](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/dubbo-ops/0.1/apache-dubbo-ops-incubating-0.1-source-release.zip.asc) | +[sha512](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/dubbo-ops/0.1/apache-dubbo-ops-incubating-0.1-source-release.sha512) diff --git a/blog/zh-cn/download.md b/blog/zh-cn/download.md index f9fbd90..657969e 100644 --- a/blog/zh-cn/download.md +++ b/blog/zh-cn/download.md @@ -73,4 +73,8 @@ ## [Dubbo Admin](https://github.com/apache/incubator-dubbo-ops) -全新Dubbo Admin即将发布 \ No newline at end of file +### 0.1 (2019-02-15) + +* [source](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/dubbo-ops/0.1/apache-dubbo-ops-incubating-0.1-source-release.zip) | +[asc](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/dubbo-ops/0.1/apache-dubbo-ops-incubating-0.1-source-release.zip.asc) | +[sha512](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/dubbo-ops/0.1/apache-dubbo-ops-incubating-0.1-source-release.sha512)
[incubator-dubbo-website] branch asf-site updated: Add Shenzhen meetup and and Chengdu Meetup summary to blog (#279)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 7bb33af Add Shenzhen meetup and and Chengdu Meetup summary to blog (#279) 7bb33af is described below commit 7bb33afadc1367456be5c5a25260df5329b6fdbf Author: Jlcao AuthorDate: Sat Feb 16 09:39:01 2019 +0800 Add Shenzhen meetup and and Chengdu Meetup summary to blog (#279) * Update contribution.md * Update dummy.md * Update general-knowledge.md * Update redis.md * Update zookeeper.md * Update zookeeper.md * Update redis.md * Update redis.md * Update zookeeper.md * Update redis.md * Update zookeeper.md * Update community.jsx * Create dubbo-meetup-chengdu.html dubbo-meetup-chengdu.html - first commit * Create dubbo-meetup-chengdu.json dubbo-meetup-chengdu.json - first commit * Create dubbo-meetup-shenzhen.html dubbo-meetup-shenzhen.html - first commit * Update dubbo-meetup-chengdu.json * Create dubbo-meetup-shenzhen.json dubbo-meetup-shenzhen.json - first commit * Update index.html Add English version of Shenzhen Meetup and Chengdu Meetup summary. * Update zookeeper.md * Update zookeeper.md * Delete contribution.md * Create contribution.md * Update contribution.md * Update dummy.md * Update redis.md * Update zookeeper.md * Update dummy.md * Delete dubbo-meetup-chengdu.html * Delete dubbo-meetup-chengdu.json * Delete dubbo-meetup-shenzhen.html * Delete dubbo-meetup-shenzhen.json * Update community.jsx * Create dubbo-meetup-shenzhen.md * Update dubbo-meetup-shanghai-jun-23rd-2018.md * Create dubbo-meetup-chengdu.md * Update dubbo-meetup-shanghai-jun-23rd-2018.md * Update dubbo-meetup-beijing-may-12th-2018.md * Update dubbo-meetup-chengdu.md --- blog/en-us/dubbo-meetup-beijing-may-12th-2018.md | 4 ++-- blog/en-us/dubbo-meetup-chengdu.md| 25 +++ blog/en-us/dubbo-meetup-shanghai-jun-23rd-2018.md | 10 - blog/en-us/dubbo-meetup-shenzhen.md | 15 ++ docs/en-us/user/references/registry/redis.md | 4 +++- docs/en-us/user/references/registry/zookeeper.md | 4 +++- docs/zh-cn/user/references/registry/redis.md | 4 +++- docs/zh-cn/user/references/registry/zookeeper.md | 1 + en-us/community/index.html| 4 ++-- 9 files changed, 59 insertions(+), 12 deletions(-) diff --git a/blog/en-us/dubbo-meetup-beijing-may-12th-2018.md b/blog/en-us/dubbo-meetup-beijing-may-12th-2018.md index 8c4a1e5..cdfbbd7 100644 --- a/blog/en-us/dubbo-meetup-beijing-may-12th-2018.md +++ b/blog/en-us/dubbo-meetup-beijing-may-12th-2018.md @@ -1,7 +1,7 @@ --- title: The first Dubbo meetup has been held in Beijing keywords: Dubbo, Beijing, meetup -description: The first Dubbo meetup has been held in Beijing +description: The first Dubbo meetup has been held in Beijing. --- The first Dubbo meetup has been held in Beijing @@ -13,4 +13,4 @@ Please enjoy the slides of the topics: * Ian Luo: Dubbo's present and future (Chinese) [slides](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-present-and-future.pdf) * Jun Liu: Introduction to the 4th Aliware Performance Challenge (Chinese) [slides](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/introduction-to-4th-aliware-performance-challenge.pdf) * Zhixuan Chen: Quickly building Microservice with Dubbo and Spring-boot (Chinese) [slides](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/quickly-building-microservice-with-dubbo-and-springboot.pdf) - * Xin Wang: Dubbo and Weidian's Practice on Microservice Architecture (Chinese) [slides](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf) \ No newline at end of file + * Xin Wang: Dubbo and Weidian's Practice on Microservice Architecture (Chinese) [slides](https://github.com/dubbo/awesome-dubbo/raw/master/slides/meetup/201805%40Beijing/dubbo-and-weidian's-practice-on-microservice-architecture.pdf) diff --git a/blog/en-us/dubbo-meetup-chengdu.md b/blog/en-us/dubbo-meetup-chengdu.md new file mode 100644 index 000..87d6f0f --- /dev/null +++ b/blog/en-us/dubbo-meetup-chengdu.md @@ -0,0 +1,25 @@ +--- +title: The fourth Dubbo meetup has been held in Chengdu +keywords: Dubbo, Chengdu, meetup +description: The fourth Dubbo meetup has been held in Chengdu. +--- + +# The fourth
[incubator-dubbo-website] branch asf-site updated: blog about new dubbo admin (#269)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new bd16b5c blog about new dubbo admin (#269)
bd16b5c is described below
commit bd16b5c308072500bc6aa85c29466e5c10ed64d1
Author: min
AuthorDate: Wed Jan 30 14:03:16 2019 +0800
blog about new dubbo admin (#269)
* blog about new dubbo admin
* Fix misspelling
* add service test blog
* update blog.js
* remove illegal character
* change picture
---
blog/zh-cn/dubbo-admin.md | 71 +
blog/zh-cn/service-test.md| 157 ++
img/blog/admin/appConfig.jpg | Bin 0 -> 158875 bytes
img/blog/admin/complex.jpg| Bin 0 -> 231075 bytes
img/blog/admin/conditionRoute.jpg | Bin 0 -> 143372 bytes
img/blog/admin/config.jpg | Bin 0 -> 159676 bytes
img/blog/admin/metadata.jpg | Bin 0 -> 220394 bytes
img/blog/admin/metadata.png | Bin 0 -> 96953 bytes
img/blog/admin/route.jpg | Bin 0 -> 176274 bytes
img/blog/admin/test.jpg | Bin 0 -> 125324 bytes
img/blog/admin/testFail.jpg | Bin 0 -> 226347 bytes
img/blog/admin/testSearch.jpg | Bin 0 -> 91983 bytes
img/blog/admin/testSuccess.jpg| Bin 0 -> 184130 bytes
img/blog/admin/weight.jpg | Bin 0 -> 118044 bytes
site_config/blog.js | 16 +++-
15 files changed, 243 insertions(+), 1 deletion(-)
diff --git a/blog/zh-cn/dubbo-admin.md b/blog/zh-cn/dubbo-admin.md
new file mode 100644
index 000..2c525cf
--- /dev/null
+++ b/blog/zh-cn/dubbo-admin.md
@@ -0,0 +1,71 @@
+# 新版Dubbo Admin介绍
+
+```
+Demo地址：http://47.91.207.147/#/service
+github: https://github.com/apache/incubator-dubbo-ops
+```
+Dubbo Admin之前的版本过于老旧，也长期疏于维护，因此在去年年中的时候，对该项目进行了一次重构，项目结构上的变化如下：
+* 将后端框架从webx替换成spring boot
+* 前端采用Vue和Vuetify.js作为开发框架
+* 移除velocity模板
+* 集成swagger，提供api管理功能
+
+当前版本的Dubbo Admin包含了之前版本中的绝大部分功能，包括服务治理，服务查询等，同时支持了Dubbo2.7中服务治理的新特性。
+
+
+## 配置规范
+由于在Dubbo2.7中，配置中心和注册中心做了分离，并且增加了元数据中心，因此Dubbo
Admin的配置方式也做了更新，`application.properties`中的配置如下:
+```properties
+admin.registry.address=zookeeper://127.0.0.1:2181
+admin.config-center=zookeeper://127.0.0.1:2181
+admin.metadata.address=zookeeper://127.0.0.1:2181
+```
+也可以和Dubbo2.7一样，在配置中心指定元数据和注册中心的地址，以zookeeper为例，配置的路径和内容如下:
+```properties
+# /dubbo/config/dubbo/dubbo.properties
+dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.metadata-report.address=zookeeper://127.0.0.1:2181
+```
+配置中心里的地址会覆盖掉本地`application.properties`的配置
+
+## 功能介绍
+功能上，主要延续了之前版本的功能，包括服务查询和服务治理，2.7版本在服务治理的功能上有了很大的改进，这些改进也大部分都会以Dubbo
Admin作为入口来体现。
+
+### 标签路由
+标签路由是Dubbo2.7引入的新功能，配置以应用作为维度，给不同的服务器打上不同名字的标签，配置如下图所示：
+
+调用的时候，客户端可以通过`setAttachment`的方式，来设置不同的标签名称，比如本例中，`setAttachment(tag1)`，客户端的选址范围就在如图所示的三台机器中，可以通过这种方式来实现流量隔离，灰度发布等功能。
+
+### 应用级别的服务治理
+在Dubbo2.6及更早版本中，所有的服务治理规则都只针对服务粒度，如果要把某条规则作用到应用粒度上，需要为应用下的所有服务配合相同的规则，变更，删除的时候也需要对应的操作，这样的操作很不友好，因此Dubbo2.7版本中增加了应用粒度的服务治理操作，对于条件路由(包括黑白名单)，动态配置(包括权重，负载均衡)都可以做应用级别的配置：
+
+上图是条件路由的配置，可以按照应用名，服务名两个维度来填写，也可以按照这两个维度来查询。
+
+
+
+条件路由，标签路由和动态配置都采用了`yaml`格式的文本编写，其他的规则配置还是采用了表单的形式。
+
+ 关于兼容性
+Dubbo2.6到Dubbo2.7，服务治理发生了比较大的变化，Dubbo Admin兼容两个版本的用法：
+* 对于服务级别的配置，会按照Dubbo2.6(URL)和Dubbo2.7(配置文件)两种格式进行写入，保证Dubbo2.6的客户端能够正确读取，解析规则
+* 对于应用级别的配置，包括标签路由，只会按照Dubbo2.7的格式进行写入，因为Dubbo2.6无此功能，不需要做向前兼容。
+* Dubbo Admin只会按照Dubbo2.7的格式进行配置读取，因此，所有在Dubbo
Admin上做的配置都可以被读到，但是之前遗留的，Dubbo2.6格式的URL无法被读取。
+* 对于同一个应用或者服务，每种规则只能够配置一条，否则新的会覆盖旧的。
+
+### 配置管理
+配置管理也是配合Dubbo2.7新增的功能，在Dubbo2.7中，增加了全局和应用维度的配置，
+* 全局配置：
+
+全局配置里可以指定注册中心，元数据中心的地址，服务端和客户端的超时时间等，这些配置在全局内生效。除了配置写入，也可以用来查看。如果使用zookeeper作为注册中心和元数据中心，还可以看到配置文件所在位置的目录结构。
+* 应用， 服务配置
+
+应用级别的配置可以为应用或者应用内的服务指定配置，在服务维度上，需要区分提供者和消费者。`dubbo.reference.{serviceName}`表示作为该服务消费者的配置，`dubbo.provider.{servcieName}`表示作为该服务提供者的配置。优先级服务
> 应用 > 全局。其中注册中心和元数据中心的地址，只能在全局配置中指定，这也是Dubbo2.7中推荐的使用方式。
+
+### 元数据和服务测试
+元数据是Dubbo2.7中新引入的元素，主要的使用场景就在Dubbo Admin中，主要体现在两个地方：
+* 服务详情展示：
+
+跟之前版本相比，Dubbo2.7中增加了对服务方法完整签名的记录，因此服务详情中也增加了方法信息的详情，可以看到方法名，方法参数列表以及返回值信息。
+* 服务测试：
+
+更重要的，元数据为服务测试提供了数据基础，可以在页面上调用真实的服务提供者，方便测试，也不需要为了调用服务去搭建一套Dubbo环境以及编写消费端代码。
\ No newline at end of file
diff --git a/blog/zh-cn/service-test.md b/blog/zh-cn/service-test.md
new file mode 100644
index 000..3f7000a
--- /dev/null
+++ b/blog/zh-cn/service-test.md
@@ -0,0 +1,157 @@
+# Dubbo Admin服务测试功能
+基于Dubbo2.7的元数据，Dubbo Admin实现了服务测试功能，可以通过泛化调用，在控制台上调用真实的服务提供者
+
+## 使用方式
+* 部署服务提供者： 可以在[这里](https://
[incubator-dubbo-website] branch asf-site updated: generate htmls (#274)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c540b69 generate htmls (#274)
c540b69 is described below
commit c540b69ce0b63152a396854273b52c6bef09f528
Author: Xin Wang
AuthorDate: Wed Jan 30 21:32:21 2019 +0800
generate htmls (#274)
---
build/blog.js| 6 +++---
build/blogDetail.js | 6 +++---
build/community.js | 6 +++---
build/documentation.js | 6 +++---
build/home.js| 6 +++---
en-us/blog/dubbo-fescar.html | 15 +--
en-us/blog/dubbo-fescar.json | 2 +-
zh-cn/blog/dubbo-fescar.html | 15 +--
zh-cn/blog/dubbo-fescar.json | 2 +-
9 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 1b095c4..b8388d7 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=80) [...]
- 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=78) [...]
+ 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
Step 5: Run example
-Start AccountService
-Start StorageService
-Start OrderService
-Run BusinessService for test
+Start AccountService (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboAccountServiceStarter.java;>DubboAccountServiceStarter).
+Start StorageService (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboStorageServiceStarter.java;>DubboStorageServiceStarter).
+Start OrderService (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboOrderServiceStarter.java;>DubboOrderServiceStarter).
+Run BusinessService for test (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboBusinessTester.java;>DubboBusinessTester).
+
+Related projects
+
+fescar: https://github.com/alibaba/fescar/;>https://github.com/alibaba/fescar/
+fescar-samples : https://github.com/fescar-group/fescar-samples;>https://github.com/fescar-group/fescar-samples
-https://github.com/alibaba/fescar/tree/develop/examples/src/main/java/com/alibaba/fescar/tm/dubbo;>Related
code
-https://github.com/alibaba/fescar/;>learn more about Fescar
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 proce [...]
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/en-us/blog/dubbo-fescar.json b/en-us/blog/dubbo-fescar.json
index e2d3c57..03c119c 100644
--- a/en-us/blog/dubbo-fescar.json
+++ b/en-us/blog/dubbo-fescar.json
@@ -1,6 +1,6 @@
{
"filename": "dubbo-fescar.md",
- "__html": "How to use Fescar to ensure consistency between Dubbo
Microservices\nUse case\nA business logic for user purchasing
commodities. The w
[incubator-dubbo-website] branch asf-site updated: [Blog] update Fescar link url (#273)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 1a08220 [Blog] update Fescar link url (#273) 1a08220 is described below commit 1a08220bcc219fbe6abca98db335f727ac3b4036 Author: jimin AuthorDate: Wed Jan 30 21:28:08 2019 +0800 [Blog] update Fescar link url (#273) * add doc How to use Fescar to ensure consistency between Dubbo Microservices --- blog/en-us/dubbo-fescar.md | 15 --- blog/zh-cn/dubbo-fescar.md | 15 --- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/blog/en-us/dubbo-fescar.md b/blog/en-us/dubbo-fescar.md index 9f78746..fd68f49 100644 --- a/blog/en-us/dubbo-fescar.md +++ b/blog/en-us/dubbo-fescar.md @@ -216,10 +216,11 @@ sh fescar-server.sh 8091 /home/admin/fescar/data/ ### Step 5: Run example -- Start AccountService -- Start StorageService -- Start OrderService -- Run BusinessService for test - -[Related code](https://github.com/alibaba/fescar/tree/develop/examples/src/main/java/com/alibaba/fescar/tm/dubbo) -[learn more about Fescar](https://github.com/alibaba/fescar/) \ No newline at end of file +- Start AccountService ([DubboAccountServiceStarter](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboAccountServiceStarter.java)). +- Start StorageService ([DubboStorageServiceStarter](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboStorageServiceStarter.java)). +- Start OrderService ([DubboOrderServiceStarter](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboOrderServiceStarter.java)). +- Run BusinessService for test ([DubboBusinessTester](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboBusinessTester.java)). + +### Related projects +* fescar: https://github.com/alibaba/fescar/ +* fescar-samples : https://github.com/fescar-group/fescar-samples diff --git a/blog/zh-cn/dubbo-fescar.md b/blog/zh-cn/dubbo-fescar.md index 2d92b08..2dd2bb3 100644 --- a/blog/zh-cn/dubbo-fescar.md +++ b/blog/zh-cn/dubbo-fescar.md @@ -216,10 +216,11 @@ sh fescar-server.sh 8091 /home/admin/fescar/data/ ### Step 5: 运行例子 -- 启动账户服务 -- 启动库存服务 -- 启动订单服务 -- 运行BusinessService入口 - -[相关代码](https://github.com/alibaba/fescar/tree/develop/examples/src/main/java/com/alibaba/fescar/tm/dubbo) -[学习更多关于Fescar的内容](https://github.com/alibaba/fescar/) \ No newline at end of file +- 启动账户服务 ([DubboAccountServiceStarter](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboAccountServiceStarter.java))。 +- 启动库存服务 ([DubboStorageServiceStarter](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboStorageServiceStarter.java))。 +- 启动订单服务 ([DubboOrderServiceStarter](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboOrderServiceStarter.java))。 +- 运行BusinessService入口 ([DubboBusinessTester](https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboBusinessTester.java))。 + +### 相关项目 +* fescar: https://github.com/alibaba/fescar/ +* fescar-samples : https://github.com/fescar-group/fescar-samples
[incubator-dubbo-website] branch asf-site updated: 修改章节 2.7.x升级步骤及注意事项 中的单词拼写错误问题 (#272)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 305f756 修改章节 2.7.x升级步骤及注意事项 中的单词拼写错误问题 (#272)
305f756 is described below
commit 305f75601ff51bd3f54b8c8a650dd24db01eb02c
Author: yuxiao
AuthorDate: Wed Jan 30 22:17:37 2019 +0800
修改章节 2.7.x升级步骤及注意事项 中的单词拼写错误问题 (#272)
* 修改单词拼写错误
---
docs/zh-cn/user/versions/version-270.md | 2 +-
zh-cn/docs/user/versions/version-270.html | 342 --
2 files changed, 1 insertion(+), 343 deletions(-)
diff --git a/docs/zh-cn/user/versions/version-270.md
b/docs/zh-cn/user/versions/version-270.md
index 27b6a03..f19a794 100644
--- a/docs/zh-cn/user/versions/version-270.md
+++ b/docs/zh-cn/user/versions/version-270.md
@@ -222,7 +222,7 @@ dubbo.protocol.port=20880
-Maven坐标升级比较直观，只需要修改相应的pom文件就可以了；而package变更则可能会带来编译问题，升级过程需要用户修改代码。因此为了减少用户升级成本，让用户可以做到渐进式升级，2.7.0版本继续保留了一些常用基础API和SP`com.alibaba.dubb`的支持。
+Maven坐标升级比较直观，只需要修改相应的pom文件就可以了；而package变更则可能会带来编译问题，升级过程需要用户修改代码。因此为了减少用户升级成本，让用户可以做到渐进式升级，2.7.0版本继续保留了一些常用基础API和SPI`com.alibaba.dubbo`的支持。
API编程接口
diff --git a/zh-cn/docs/user/versions/version-270.html
b/zh-cn/docs/user/versions/version-270.html
deleted file mode 100644
index 94428bb..000
--- a/zh-cn/docs/user/versions/version-270.html
+++ /dev/null
@@ -1,342 +0,0 @@
-
-
-
-
-
-
-
-
-
- version-270
-
-
-
-
- En环境要求：需要Java 8及以上版本。
-2.7.0版本在改造的过程中遵循了一个原则，即保持与低版本的兼容性，因此从功能层面来说它是与2.6.x及更低版本完全兼容的。这里所说的兼容性主要是和包重命名相关的，接下来会详细说明影响点。另外，虽然功能用法保持向后兼容，但参考本文能帮助您尽快用到2.7.0版本的新特性。
-升级步骤
-
-升级pom到2.7.0（以all-in-one依赖为例）。
-
-properties
-dubbo.version2.7.0/dubbo.version
-/properties
-dependencyManagement
-dependencies
-dependency
-groupIdorg.apache.dubbo/groupId
-artifactIddubbo-dependencies-bom/artifactId
-version${dubbo.version}/version
-typepom/type
-scopeimport/scope
-/dependency
-/dependencies
-/dependencyManagement
-
-dependencies
-dependency
-groupIdorg.apache.dubbo/groupId
-artifactIddubbo/artifactId
-version${dubbo.version}/version
-/dependency
-dependency
-groupIdio.netty/groupId
-artifactIdnetty-all/artifactId
-/dependency
-/dependencies
-
-如果升级依赖后出现API或SPI扩展相关的编译错误，请参考包兼容性问题
-此时重新部署应用，所有默认行为和2.6.x保持一致，如果要用到2.7的新特性，则需要继续做以下配置（可选）：
-
-简化的URL
-配置元数据中心
-使用外部化配置
-服务治理规则
-使用异步API
-
-下面我们就对这几部分的配置分别做详细说明。
-简化的URL
-!--
simplified="true"表示注册简化版的URL到Registry --
-dubbo:registry address="zookeeper://127.0.0.1:2181" simplified="true"/
-
-dubbo.registry.simplified=true
-
-建议将此配置集中管理，参考外部化配置。
-
-URL简化只是剔除了一些纯粹的查询用的参数，并没有做大刀阔斧的服务发现模型改造，因此精简后的URL完全可以被2.6及以下版本的消费端实现服务发现与调用，同样2.7版本也可以发现和调用低版本的提供者。
-
-配置元数据中心
-dubbo:metadata-report address="redis://127.0.0.1:6379"/
-
-dubbo.metadataReport.address=redis://127.0.0.1:6379
-
-建议将此配置集中管理，参考外部化配置。
-在此了解更多元数据中心设计目的与用途。
-使用外部化配置
-需要在项目启动前，使用https://github.com/apache/incubator-dubbo-ops;>最新版本Dubbo-OPS完成外部化配置迁移，理论上配置中心支持所有本地dubbo.properties所支持的配置项。
-以XML开发形式为例，假设我们本地有如下配置：
-dubbo:application name="demo-provider"/
-dubbo:conig-center
address="zookeeper://127.0.0.1:2181"/
-
-dubbo:registry address="zookeeper://127.0.0.1:2181" simplified="true"/
-dubbo:metadata-report address="redis://127.0.0.1:6379"/
-dubbo:protocol name="dubbo" port="20880"/
-
-bean id="demoService"
class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/
-dubbo:service interface="org.apache.dubbo.samples.basic.api.DemoService"
ref="demoService"/
-
-通过http://47.91.207.147/#/management?key=global;>OPS控制台将以下全局配置迁移到配置中心，成为所有应用共享的配置。
-dubbo.registry.address=zookeeper://127.0.0.1:2181
-dubbo.registry.simplified=true
-
-dubbo.metadataReport.address=redis://127.0.0.1:6379
-
-dubbo.protocol.name=dubbo
-dubbo.protocol.port=20880
-
-这样应用开发者只需要关心配置中心的配置。
-dubbo:application name="demo-provider"/
-dubbo:conig-center
address="zookeeper://127.0.0.1:2181"/
-
-bean id="demoService"
class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/
-dubbo:service interface="org.apache.dubbo.samples.basic.api.DemoService"
ref="demoService"/
-
-这里增加了一篇Dubbo配置方式的说明文档，详细描述了Dubbo当前支持的配置类型、不同配置之间的覆盖关系等。
-服务治理规则迁移
-2.7版本可以读取到老的治理规则，因此不用担心升级2.7的应用后老规则会失效，可以选择先升级上线，再慢慢的做增量式规则迁移。
-请参考http://47.91.207.147/#/governance/routingRule;>OPS -
服务治理了解规则配置方式，这里我们重点关注的是规则格式，以下提供几个简单示例：
-
-
-条件路由
-scope: application
-force: true
-runtime: true
-enabled: true
-key: governance-conditionrouter-consumer
-conditions:
- - application=app1 = address=*:20880
- - application=app2 = address=*:20881
-...
-
-
-
-标签路由
-force: false
-
[incubator-dubbo-website] branch asf-site updated: generate htmls
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ed88999 generate htmls
new 1821cf3 Merge remote-tracking branch 'dubbo_site_remote/asf-site'
into asf-site
ed88999 is described below
commit ed88999b025479d64ab37f22955354f3db86b47e
Author: Xin Wang
AuthorDate: Wed Jan 30 21:31:17 2019 +0800
generate htmls
---
build/blog.js| 6 +++---
build/blogDetail.js | 6 +++---
build/community.js | 6 +++---
build/documentation.js | 6 +++---
build/home.js| 6 +++---
en-us/blog/dubbo-fescar.html | 15 +--
en-us/blog/dubbo-fescar.json | 2 +-
zh-cn/blog/dubbo-fescar.html | 15 +--
zh-cn/blog/dubbo-fescar.json | 2 +-
9 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/build/blog.js b/build/blog.js
index 1b095c4..b8388d7 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=80) [...]
- 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=78) [...]
+ 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
Step 5: Run example
-Start AccountService
-Start StorageService
-Start OrderService
-Run BusinessService for test
+Start AccountService (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboAccountServiceStarter.java;>DubboAccountServiceStarter).
+Start StorageService (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboStorageServiceStarter.java;>DubboStorageServiceStarter).
+Start OrderService (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboOrderServiceStarter.java;>DubboOrderServiceStarter).
+Run BusinessService for test (https://github.com/fescar-group/fescar-samples/blob/master/dubbo/src/main/java/com/alibaba/fescar/samples/dubbo/starter/DubboBusinessTester.java;>DubboBusinessTester).
+
+Related projects
+
+fescar: https://github.com/alibaba/fescar/;>https://github.com/alibaba/fescar/
+fescar-samples : https://github.com/fescar-group/fescar-samples;>https://github.com/fescar-group/fescar-samples
-https://github.com/alibaba/fescar/tree/develop/examples/src/main/java/com/alibaba/fescar/tm/dubbo;>Related
code
-https://github.com/alibaba/fescar/;>learn more about Fescar
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 proce [...]
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/en-us/blog/dubbo-fescar.json b/en-us/blog/dubbo-fescar.json
index e2d3c57..03c119c 100644
--- a/en-us/blog/dubbo-fescar.json
+++ b/en-us/blog/dubbo-fescar.json
@@ -1,6 +1,6 @@
{
"filename": "dubbo-fescar.md",
- "__html": "How to use Fescar to ensure consistency between Dubbo
Microservi
[incubator-dubbo-website] branch asf-site updated: gene html
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 230b82a gene html
230b82a is described below
commit 230b82ad01bcf0ee4dba2cc016d314fa1af6f4b3
Author: Xin Wang
AuthorDate: Wed Jan 30 22:22:30 2019 +0800
gene html
---
zh-cn/docs/user/versions/version-270.html | 342 ++
zh-cn/docs/user/versions/version-270.json | 2 +-
2 files changed, 343 insertions(+), 1 deletion(-)
diff --git a/zh-cn/docs/user/versions/version-270.html
b/zh-cn/docs/user/versions/version-270.html
new file mode 100644
index 000..5581eff
--- /dev/null
+++ b/zh-cn/docs/user/versions/version-270.html
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+
+
+
+ version-270
+
+
+
+
+ En环境要求：需要Java 8及以上版本。
+2.7.0版本在改造的过程中遵循了一个原则，即保持与低版本的兼容性，因此从功能层面来说它是与2.6.x及更低版本完全兼容的。这里所说的兼容性主要是和包重命名相关的，接下来会详细说明影响点。另外，虽然功能用法保持向后兼容，但参考本文能帮助您尽快用到2.7.0版本的新特性。
+升级步骤
+
+升级pom到2.7.0（以all-in-one依赖为例）。
+
+properties
+dubbo.version2.7.0/dubbo.version
+/properties
+dependencyManagement
+dependencies
+dependency
+groupIdorg.apache.dubbo/groupId
+artifactIddubbo-dependencies-bom/artifactId
+version${dubbo.version}/version
+typepom/type
+scopeimport/scope
+/dependency
+/dependencies
+/dependencyManagement
+
+dependencies
+dependency
+groupIdorg.apache.dubbo/groupId
+artifactIddubbo/artifactId
+version${dubbo.version}/version
+/dependency
+dependency
+groupIdio.netty/groupId
+artifactIdnetty-all/artifactId
+/dependency
+/dependencies
+
+如果升级依赖后出现API或SPI扩展相关的编译错误，请参考包兼容性问题
+此时重新部署应用，所有默认行为和2.6.x保持一致，如果要用到2.7的新特性，则需要继续做以下配置（可选）：
+
+简化的URL
+配置元数据中心
+使用外部化配置
+服务治理规则
+使用异步API
+
+下面我们就对这几部分的配置分别做详细说明。
+简化的URL
+!--
simplified="true"表示注册简化版的URL到Registry --
+dubbo:registry address="zookeeper://127.0.0.1:2181" simplified="true"/
+
+dubbo.registry.simplified=true
+
+建议将此配置集中管理，参考外部化配置。
+
+URL简化只是剔除了一些纯粹的查询用的参数，并没有做大刀阔斧的服务发现模型改造，因此精简后的URL完全可以被2.6及以下版本的消费端实现服务发现与调用，同样2.7版本也可以发现和调用低版本的提供者。
+
+配置元数据中心
+dubbo:metadata-report address="redis://127.0.0.1:6379"/
+
+dubbo.metadataReport.address=redis://127.0.0.1:6379
+
+建议将此配置集中管理，参考外部化配置。
+在此了解更多元数据中心设计目的与用途。
+使用外部化配置
+需要在项目启动前，使用https://github.com/apache/incubator-dubbo-ops;>最新版本Dubbo-OPS完成外部化配置迁移，理论上配置中心支持所有本地dubbo.properties所支持的配置项。
+以XML开发形式为例，假设我们本地有如下配置：
+dubbo:application name="demo-provider"/
+dubbo:conig-center
address="zookeeper://127.0.0.1:2181"/
+
+dubbo:registry address="zookeeper://127.0.0.1:2181" simplified="true"/
+dubbo:metadata-report address="redis://127.0.0.1:6379"/
+dubbo:protocol name="dubbo" port="20880"/
+
+bean id="demoService"
class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/
+dubbo:service interface="org.apache.dubbo.samples.basic.api.DemoService"
ref="demoService"/
+
+通过http://47.91.207.147/#/management?key=global;>OPS控制台将以下全局配置迁移到配置中心，成为所有应用共享的配置。
+dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.registry.simplified=true
+
+dubbo.metadataReport.address=redis://127.0.0.1:6379
+
+dubbo.protocol.name=dubbo
+dubbo.protocol.port=20880
+
+这样应用开发者只需要关心配置中心的配置。
+dubbo:application name="demo-provider"/
+dubbo:conig-center
address="zookeeper://127.0.0.1:2181"/
+
+bean id="demoService"
class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/
+dubbo:service interface="org.apache.dubbo.samples.basic.api.DemoService"
ref="demoService"/
+
+这里增加了一篇Dubbo配置方式的说明文档，详细描述了Dubbo当前支持的配置类型、不同配置之间的覆盖关系等。
+服务治理规则迁移
+2.7版本可以读取到老的治理规则，因此不用担心升级2.7的应用后老规则会失效，可以选择先升级上线，再慢慢的做增量式规则迁移。
+请参考http://47.91.207.147/#/governance/routingRule;>OPS -
服务治理了解规则配置方式，这里我们重点关注的是规则格式，以下提供几个简单示例：
+
+
+条件路由
+---
+scope: application
+force: true
+runtime: true
+enabled: true
+key: governance-conditionrouter-consumer
+conditions:
+ - application=app1 = address=*:20880
+ - application=app2 = address=*:20881
+...
+
+
+
+标签路由
+---
+force: false
+runtime: true
+enabled: true
+key: governance-tagrouter-provider
+tags:
+ - name: tag1
+addresses: ["127.0.0.1:20880"]
+ - name: tag2
+addresses: ["127.0.0.1:20881"]
+...
+
+
+
+动态配置（覆盖规则）
+---
+scope: service
+key: org.apache.dubbo.samples.governance.api.DemoService
+enabled: true
+configs:
+- addresses: [0.0.0.0]
+ side: consumer
+ parameters:
+timeout: 6000
+...
+
+
+
+关于治理规则更多详细说明，请参考路由规则和覆盖规则用户文档。
+也可继续了解https://github.com/apache/incubator-dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-governance;>使用示例。
+使用异步API
+这部分的接口和低版本同样是完全兼容的，你仅须在打算使用CompletableFuture提供的回调或者异步组装能力时，再考虑升级这部分内容即可。
[dubbo-erlang] branch master updated: Update README.md
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-erlang.git The following commit(s) were added to refs/heads/master by this push: new 03010f1 Update README.md 03010f1 is described below commit 03010f16d6fe8997c3d2c6143d5aa0ae7bff9e74 Author: Xin Wang AuthorDate: Sat May 25 17:34:22 2019 +0800 Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5b6944d..880b154 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ dubboerl = Apache Dubbo Erlang Implementation. -[](https://travis-ci.org/apache/incubator-dubbo-erlang) -[](https://codecov.io/gh/apache/incubator-dubbo-erlang) +[](https://travis-ci.org/apache/dubbo-erlang) +[](https://codecov.io/gh/apache/dubbo-erlang) Feature list -
[dubbo-go] branch master updated: Imp: add Client.GetPendingResponse to limit the lock scope (#83)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/master by this push:
new 4f7ef9d Imp: add Client.GetPendingResponse to limit the lock scope
(#83)
4f7ef9d is described below
commit 4f7ef9ddef1de6dc7cb121947357234a0202c056
Author: Xin.Zh
AuthorDate: Sat Jun 8 10:15:27 2019 +0800
Imp: add Client.GetPendingResponse to limit the lock scope (#83)
* Imp: add Client.GetPendingResponse to limit the lock scope
* Fix: return pkg len as case 1
* Mod: update getty version
* Fix: use bufio.NewReadSize instead of bufio.NewReader
* Fix: return {nil, 0, nil} for tcp case 1
* Fix: return {nil, 0, nil} for tcp case 1 for server handler
---
go.mod | 4 ++--
go.sum | 23 ++-
protocol/dubbo/client.go | 9 -
protocol/dubbo/codec.go | 17 -
protocol/dubbo/readwriter.go | 18 --
5 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/go.mod b/go.mod
index df9ce48..0527279 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
module github.com/apache/dubbo-go
require (
- github.com/dubbogo/getty v0.0.0-20190523180329-bdf5e640ea53
- github.com/dubbogo/hessian2 v0.0.0-20190606185624-13bbc9786e3f
+ github.com/dubbogo/getty v0.0.0-20190607120257-8b0e100a88af // indirect
+ github.com/dubbogo/hessian2 v0.0.0-20190607144249-afb8cbfad2cb //
indirect
github.com/pkg/errors v0.8.1
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec
github.com/stretchr/testify v1.3.0
diff --git a/go.sum b/go.sum
index f3cd528..8617076 100644
--- a/go.sum
+++ b/go.sum
@@ -1,33 +1,19 @@
github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dubbogo/getty v0.0.0-20190523180329-bdf5e640ea53
h1:bniSNoC4xnAbrx4estwc9F0qkWnh6ZDsAS0y9d7mPos=
-github.com/dubbogo/getty v0.0.0-20190523180329-bdf5e640ea53/go.mod
h1:cRMSuoCmwc5lULFFnYZTxyCfZhObmRTNbS7XRnPNHSo=
-github.com/dubbogo/hessian2 v0.0.0-20190606185624-13bbc9786e3f
h1:oN6hLbasIJuqlT+/R0F1dVIDaXG+Sun9PE6yFogTtSs=
-github.com/dubbogo/hessian2 v0.0.0-20190606185624-13bbc9786e3f/go.mod
h1:XFGDn4oSZX26zkcfhkM/fCJrOqwQJxk/xgWW1KMJBKM=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/dubbogo/getty v0.0.0-20190607120257-8b0e100a88af/go.mod
h1:cRMSuoCmwc5lULFFnYZTxyCfZhObmRTNbS7XRnPNHSo=
+github.com/dubbogo/hessian2 v0.0.0-20190607144249-afb8cbfad2cb/go.mod
h1:XFGDn4oSZX26zkcfhkM/fCJrOqwQJxk/xgWW1KMJBKM=
github.com/golang/snappy v0.0.1/go.mod
h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gorilla/websocket v1.4.0
h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
github.com/gorilla/websocket v1.4.0/go.mod
h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod
h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0
h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0
h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod
h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.0/go.mod
h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec
h1:6ncX5ko6B9LntYM0YBRXkiSaZMmLYeZ/NWcmeB43mMY=
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec
h1:6ncX5ko6B9LntYM0YBRXkiSaZMmLYeZ/NWcmeB43mMY=
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod
h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
-github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod
h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/stretchr/objx v0.1.0/go.mod
h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.0/go.mod
h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0
h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0
h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod
h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.3.0/go.mod
h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI
[dubbo] branch master updated (8479906 -> 8f783fa)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from 8479906 Improve java doc for dubbo-remoting-netty4 (#4180) add 8f783fa optimize junit Assert usage (#4214) No new revisions were added by this update. Summary of changes: .../org/apache/dubbo/rpc/cluster/StickyTest.java | 4 +- .../dubbo/rpc/cluster/merger/ResultMergerTest.java | 12 ++--- .../router/condition/ConditionRouterTest.java | 22 .../support/AbstractClusterInvokerTest.java| 20 .../support/wrapper/MockClusterInvokerTest.java| 22 .../test/java/org/apache/dubbo/common/URLTest.java | 12 ++--- .../common/beanutil/JavaBeanSerializeUtilTest.java | 14 ++--- .../apache/dubbo/common/bytecode/MixinTest.java| 7 +-- .../apache/dubbo/common/bytecode/WrapperTest.java | 8 +-- .../common/compiler/support/ClassUtilsTest.java| 2 +- .../common/extension/ExtensionLoaderTest.java | 18 +++ .../extension/support/ActivateComparatorTest.java | 1 - .../org/apache/dubbo/common/json/JSONTest.java | 6 ++- .../threadlocal/InternalThreadLocalTest.java | 29 +-- .../NamedInternalThreadFactoryTest.java| 2 +- .../support/eager/EagerThreadPoolExecutorTest.java | 8 ++- .../common/utils/CompatibleTypeUtilsTest.java | 2 +- .../apache/dubbo/common/utils/MethodUtilsTest.java | 4 +- .../apache/dubbo/common/utils/PojoUtilsTest.java | 6 +-- .../org/apache/dubbo/config/MethodConfigTest.java | 3 +- .../apache/dubbo/config/ReferenceConfigTest.java | 10 ++-- .../AnnotationPropertyValuesAdapterTest.java | 10 ++-- .../annotation/ReferenceBeanBuilderTest.java | 2 +- .../apache/dubbo/cache/filter/CacheFilterTest.java | 4 +- .../support/jvalidation/JValidationTest.java | 1 - .../identifier/MetadataIdentifierTest.java | 1 - .../support/AbstractMetadataReportTest.java| 8 +-- .../dubbo/monitor/support/MonitorFilterTest.java | 4 +- .../dubbo/qos/command/util/CommandHelperTest.java | 1 - .../dubbo/registry/PerformanceRegistryTest.java| 1 - .../registry/support/AbstractRegistryTest.java | 2 +- .../registry/support/FailbackRegistryTest.java | 2 +- .../registry/dubbo/RegistryDirectoryTest.java | 60 +++--- .../dubbo/registry/dubbo/RegistryProtocolTest.java | 11 ++-- .../dubbo/registry/etcd/EtcdRegistryTest.java | 30 +-- .../multiple/MultipleRegistry2S2RTest.java | 30 +-- .../dubbo/remoting/codec/ExchangeCodecTest.java| 28 +- .../handler/ConnectChannelHandlerTest.java | 2 +- .../handler/HeaderExchangeHandlerTest.java | 2 +- .../remoting/transport/AbstractCodecTest.java | 5 +- .../dubbo/remoting/etcd/jetcd/JEtcdClientTest.java | 4 +- .../support/header/HeartbeatHandlerTest.java | 4 +- .../transport/netty/ClientReconnectTest.java | 8 +-- .../transport/netty4/ClientReconnectTest.java | 8 +-- .../curator/CuratorZookeeperClientTest.java| 1 - .../curator/CuratorZookeeperTransporterTest.java | 1 - .../java/org/apache/dubbo/rpc/AppResponseTest.java | 4 +- .../java/org/apache/dubbo/rpc/RpcContextTest.java | 8 +-- .../apache/dubbo/rpc/filter/tps/StatItemTest.java | 4 +- .../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 6 +-- .../protocol/dubbo/DubboInvokerAvilableTest.java | 18 +++ .../rpc/protocol/dubbo/ImplicitCallBackTest.java | 14 ++--- .../dubbo/ReferenceCountExchangeClientTest.java| 8 +-- .../dubbo/telnet/CurrentTelnetHandlerTest.java | 1 - .../dubbo/rpc/validation/ValidationTest.java | 2 +- .../dubbo/rpc/protocol/http/HttpProtocolTest.java | 2 +- .../DubboSwaggerApiListingResourceTest.java| 2 - .../dubbo/rpc/protocol/rmi/RmiProtocolTest.java| 5 +- .../dubbo/rpc/protocol/thrift/ThriftCodecTest.java | 2 +- .../serialize/base/AbstractSerializationTest.java | 8 +-- .../serialize/hessian2/Hessian2PersonOkTest.java | 1 - .../protostuff/ProtostuffSerializationTest.java| 1 - .../support/SerializableClassRegistryTest.java | 1 - 63 files changed, 260 insertions(+), 269 deletions(-)
[dubbo] branch master updated: [Dubbo-4183] Fix unstable tests in ConditionRouterTest (#4226)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 78aea48 [Dubbo-4183] Fix unstable tests in ConditionRouterTest
(#4226)
78aea48 is described below
commit 78aea48cd710fc797b69c4eb2176f72554be3fd7
Author: Huang YunKun
AuthorDate: Thu Jun 6 22:52:44 2019 +0800
[Dubbo-4183] Fix unstable tests in ConditionRouterTest (#4226)
---
.../router/condition/ConditionRouterTest.java | 109 ++---
.../store/etcd/EtcdMetadataReportTest.java | 2 +
2 files changed, 56 insertions(+), 55 deletions(-)
diff --git
a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java
b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java
index a88a759..ba400f0 100644
---
a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java
+++
b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java
@@ -18,7 +18,6 @@ package org.apache.dubbo.rpc.cluster.router.condition;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcInvocation;
@@ -37,7 +36,7 @@ import static
org.apache.dubbo.rpc.cluster.Constants.FORCE_KEY;
import static org.apache.dubbo.rpc.cluster.Constants.RULE_KEY;
public class ConditionRouterTest {
-
+private static final String LOCAL_HOST = "127.0.0.1";
private URL SCRIPT_URL =
URL.valueOf("condition://0.0.0.0/com.foo.BarService");
@BeforeAll
@@ -90,9 +89,9 @@ public class ConditionRouterTest {
List> invokers = new ArrayList>();
Invoker invoker1 = new MockInvoker(URL.valueOf(
"dubbo://10.20.3.3:20880/com.foo.BarService?default.serialization=fastjson"));
-Invoker invoker2 = new
MockInvoker(URL.valueOf("dubbo://" + NetUtils.getLocalHost()
+Invoker invoker2 = new
MockInvoker(URL.valueOf("dubbo://" + LOCAL_HOST
+ ":20880/com.foo.BarService"));
-Invoker invoker3 = new
MockInvoker(URL.valueOf("dubbo://" + NetUtils.getLocalHost()
+Invoker invoker3 = new
MockInvoker(URL.valueOf("dubbo://" + LOCAL_HOST
+ ":20880/com.foo.BarService"));
invokers.add(invoker1);
invokers.add(invoker2);
@@ -102,32 +101,32 @@ public class ConditionRouterTest {
System.err.println(invoker3.getUrl().getAddress());
Router router1 = new ConditionRouterFactory().getRouter(getRouteUrl(
-"host = " + NetUtils.getLocalHost() + " => " + " host =
10.20.3.3").addParameter(FORCE_KEY,
+"host = " + LOCAL_HOST + " => " + " host =
10.20.3.3").addParameter(FORCE_KEY,
String.valueOf(true)));
Router router2 = new ConditionRouterFactory().getRouter(getRouteUrl(
-"host = " + NetUtils.getLocalHost() + " => " + " host =
10.20.3.* & host != 10.20.3.3").addParameter(
+"host = " + LOCAL_HOST + " => " + " host = 10.20.3.* & host !=
10.20.3.3").addParameter(
FORCE_KEY, String.valueOf(true)));
Router router3 = new ConditionRouterFactory().getRouter(getRouteUrl(
-"host = " + NetUtils.getLocalHost() + " => " + " host =
10.20.3.3 & host != 10.20.3.3").addParameter(
+"host = " + LOCAL_HOST + " => " + " host = 10.20.3.3 & host
!= 10.20.3.3").addParameter(
FORCE_KEY, String.valueOf(true)));
Router router4 = new ConditionRouterFactory().getRouter(getRouteUrl(
-"host = " + NetUtils.getLocalHost() + " => " + " host =
10.20.3.2,10.20.3.3,10.20.3.4").addParameter(
+"host = " + LOCAL_HOST + " => " + " host =
10.20.3.2,10.20.3.3,10.20.3.4").addParameter(
FORCE_KEY, String.valueOf(true)));
Router router5 = new ConditionRouterFactory().getRouter(getRouteUrl(
-"host = " + NetUtils.getLocalHost() + " => " + " host !=
10.20.3.3").addParameter(FORCE_KEY,
+"host = " + LOCAL_HOST + " => " + " host !=
10.20.3.3").addParameter(FORCE_KEY,
String.valueOf(true)));
Router router6 = new ConditionRouterFactory().getRouter(getRouteUrl(
-"host = "
[dubbo] branch master updated: [CI] Add jenkinsfile for dubbo snapshot deployment (#4205)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 76d6562 [CI] Add jenkinsfile for dubbo snapshot deployment (#4205)
76d6562 is described below
commit 76d65620f1daca9526111dc106909baecbbff5a5
Author: Huang YunKun
AuthorDate: Thu Jun 6 22:57:24 2019 +0800
[CI] Add jenkinsfile for dubbo snapshot deployment (#4205)
---
Jenkinsfile | 138
pom.xml | 1 +
2 files changed, 139 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..ebf2d30
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,138 @@
+import groovy.json.JsonSlurper
+
+pipeline {
+agent {
+node {
+label 'ubuntu'
+}
+}
+
+options {
+buildDiscarder(logRotator(daysToKeepStr: '14', artifactNumToKeepStr:
'10'))
+}
+
+environment {
+JAVA_HOME = "${tool 'JDK 1.8 (latest)'}"
+}
+
+tools {
+maven 'Maven 3 (latest)'
+jdk 'JDK 1.8 (latest)'
+}
+
+triggers {
+cron '''TZ=Asia/Shanghai
+H 2,14 * * *'''
+pollSCM '''TZ=Asia/Shanghai
+H H/2 * * *'''
+}
+
+
+stages {
+stage('Clone') {
+steps {
+checkout([$class: 'GitSCM', branches: [[name: '*/master']],
doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption',
noTags: true, reference: '', shallow: true]], gitTool: 'Default', submoduleCfg:
[], userRemoteConfigs: [[url: 'https://github.com/apache/dubbo.git']]])
+}
+}
+
+stage('Duplicate deploy check') {
+steps {
+script {
+def deployedCommitId = sh(returnStdout: true, script:
"curl --silent
https://builds.apache.org/job/Apache%20Dubbo/job/${env.JOB_BASE_NAME}/lastSuccessfulBuild/artifact/DEPLOY_COMMIT_ID
|| true").trim()
+env.DEPLOYED_COMMIT_ID = deployedCommitId
+def commitId = sh(returnStdout: true, script: 'git
rev-parse HEAD').trim()
+env.COMMIT_ID = commitId
+
+if (commitId == deployedCommitId) {
+env.STATUS_CHECK = "false"
+println "Latest deployed commit id is
$deployedCommitId, Skip deployment this time"
+} else {
+env.STATUS_CHECK = "true"
+println "Current commit id hasn't been deployed,
continue"
+}
+}
+}
+}
+
+stage('Commit status check') {
+when {
+expression {
+return env.STATUS_CHECK == "true";
+}
+}
+steps {
+script {
+def commitId = env.COMMIT_ID
+println "Current commit id: $commitId"
+
+def commitStatusJson = sh(script: "curl --silent
https://api.github.com/repos/apache/dubbo/commits/$commitId/status;,
returnStdout: true).trim()
+println "Commit status: \r\n$commitStatusJson"
+
+def jsonSlurper = new JsonSlurper()
+def jsonObject = jsonSlurper.parseText(commitStatusJson)
+
+def status = jsonObject.state
+
+println "Current commit status is $status"
+
+if (status == "success") {
+env.STATUS_CHECK = "true"
+println "Continue to deploy snapshot"
+} else {
+env.STATUS_CHECK = "false"
+println "Current commit status not allow to deploy
snapshot"
+}
+}
+}
+}
+
+stage('Snapshot version check') {
+when {
+expression {
+return env.STATUS_CHECK == "true";
+}
+}
+steps {
+sh 'env'
+sh 'java -version'
+sh './mvnw clean install -pl "dubbo-dependencies-bom" &&
./mvnw clean install -DskipTests=true && ./mvnw clean validate
-Psnapshot-ci-deploy -pl "dubbo-all"'
+}
+}
+
+stage('Deploy snapshot') {
+when {
+expression {
+return env.STATUS_CHECK == "true";
+}
+}
+steps {
+timeout(35) {
+sh './mvnw --version'
+sh './mvnw clean package deploy -
[dubbo] branch master updated: [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) (#4364)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new fa619c9 [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) (#4364) fa619c9 is described below commit fa619c9842113ca320e0f72050987f77a6c7f92f Author: Huang YunKun AuthorDate: Fri Jun 21 08:43:27 2019 +0800 [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) (#4364) * include protobuf-json jar to dubbo --- dubbo-all/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml index d8c8949..eaa2dbc 100644 --- a/dubbo-all/pom.xml +++ b/dubbo-all/pom.xml @@ -622,7 +622,7 @@ org.apache.dubbo:dubbo-serialization-jdk org.apache.dubbo:dubbo-serialization-protostuff org.apache.dubbo:dubbo-serialization-gson - org.apache.dubbo:dubbo-serialization-googlePb + org.apache.dubbo:dubbo-serialization-protobuf-json org.apache.dubbo:dubbo-configcenter-api org.apache.dubbo:dubbo-configcenter-definition org.apache.dubbo:dubbo-configcenter-apollo
[incubator-dubbo] branch master updated: rm incubating word (#4110)
This is an automated email from the ASF dual-hosted git repository. wangxin 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 52cbfc9 rm incubating word (#4110) 52cbfc9 is described below commit 52cbfc9a677a8c17b986fc7e1d823ed0c63a6998 Author: huaifeng AuthorDate: Wed May 22 13:27:28 2019 +0800 rm incubating word (#4110) * rm incubating word * dubbo.incubator.apache.org to dubbo.apache.org --- README.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b7b9c8e..3010a78 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Apache Dubbo (incubating) Project +# Apache Dubbo Project [](https://travis-ci.org/apache/incubator-dubbo) [](https://codecov.io/gh/apache/incubator-dubbo) @@ -10,7 +10,7 @@ [](https://twitter.com/intent/follow?screen_name=ApacheDubbo) [](https://gitter.im/alibaba/dubbo?utm_source=badge_medium=badge_campaign=pr-badge) -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 is a high-performance, Java based open source RPC framework. Please visit [official site](http://dubbo.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 :) @@ -175,7 +175,7 @@ If you want to try out the cutting-edge features, you can built with the followi ## 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.apache.org), [unsubscribe](mailto:dev-unsubscr...@dubbo.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) @@ -199,7 +199,7 @@ See [CONTRIBUTING](https://github.com/apache/incubator-dubbo/blob/master/CONTRI * Improve the [dubbo-admin/dubbo-monitor](https://github.com/apache/incubator-dubbo-admin). * Contribute to the projects listed in [ecosystem](https://github.com/dubbo). * Any form of contribution that is not mentioned above. -* If you would like to contribute, please send an email to d...@dubbo.incubator.apache.org to let us know! +* If you would like to contribute, please send an email to d...@dubbo.apache.org to let us know! ## Reporting bugs @@ -207,13 +207,13 @@ Please follow the [template](https://github.com/apache/incubator-dubbo/issues/ne ## Reporting a security vulnerability -Please report security vulnerability to [us](mailto:secur...@dubbo.incubator.apache.org) privately. +Please report security vulnerability to [us](mailto:secur...@dubbo.apache.org) privately. ## Dubbo ecosystem * [Dubbo Ecosystem Entry](https://github.com/dubbo) - A GitHub group `dubbo` to gather all Dubbo relevant projects not appropriate in [apache](https://github.com/apache) group yet -* [Dubbo Website](https://github.com/apache/incubator-dubbo-website) - Apache Dubbo (incubating) official website -* [Dubbo Samples](https://github.com/apache/incubator-dubbo-samples) - samples for Apache Dubbo (incubating) +* [Dubbo Website](https://github.com/apache/incubator-dubbo-website) - Apache Dubbo official website +* [Dubbo Samples](https://github.com/apache/incubator-dubbo-samples) - samples for Apache Dubbo * [Dubbo Spring Boot](https://github.com/apache/incubator-dubbo-spring-boot-project) - Spring Boot Project for Dubbo * [Dubbo Admin](https://github.com/apache/incubator-dubbo-admin) - The reference implementation for Dubbo admin
[dubbo] branch master updated: Remove incubator (#4161)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new a8ca64c Remove incubator (#4161) a8ca64c is described below commit a8ca64c8aae3e4b1d26de833f59f61080b3276e4 Author: Xin Wang AuthorDate: Sat May 25 00:06:55 2019 +0800 Remove incubator (#4161) --- .../ISSUE_TEMPLATE/dubbo-issue-report-template.md | 4 +- CHANGES.md | 200 ++--- CONTRIBUTING.md| 18 +- NOTICE | 2 +- PULL_REQUEST_TEMPLATE.md | 6 +- README.md | 70 dubbo-bom/pom.xml | 10 +- .../dubbo/common/utils/CompatibleTypeUtils.java| 4 +- .../ReferenceAnnotationBeanPostProcessor.java | 4 +- .../ServiceAnnotationBeanPostProcessor.java| 2 +- .../DubboConfigConfigurationRegistrar.java | 2 +- .../config/spring/status/SpringStatusChecker.java | 2 +- dubbo-demo/README.md | 2 +- dubbo-dependencies-bom/pom.xml | 10 +- dubbo-distribution/pom.xml | 2 +- .../registry/zookeeper/ZookeeperRegistryTest.java | 2 +- .../dubbo/remoting/etcd/jetcd/JEtcdClient.java | 2 +- .../dubbo/rpc/protocol/http/HttpProtocol.java | 2 +- dubbo-rpc/dubbo-rpc-xml/pom.xml| 2 +- pom.xml| 10 +- 20 files changed, 178 insertions(+), 178 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md b/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md index 13587d0..ac82ec8 100644 --- a/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md +++ b/.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md @@ -4,8 +4,8 @@ about: If you would like to report a issue to Dubbo, please use this template. --- -- [ ] I have searched the [issues](https://github.com/apache/incubator-dubbo/issues) of this repository and believe that this is not a duplicate. -- [ ] I have checked the [FAQ](https://github.com/apache/incubator-dubbo/blob/master/FAQ.md) of this repository and believe that this is not a duplicate. +- [ ] I have searched the [issues](https://github.com/apache/dubbo/issues) of this repository and believe that this is not a duplicate. +- [ ] I have checked the [FAQ](https://github.com/apache/dubbo/blob/master/FAQ.md) of this repository and believe that this is not a duplicate. ### Environment diff --git a/CHANGES.md b/CHANGES.md index e49e666..6296565 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,84 +8,84 @@ ### New Features -- service register support on nacos [#3582](https://github.com/apache/incubator-dubbo/issues/3582) -- support consul as registry center, config center and metadata center [#983](https://github.com/apache/incubator-dubbo/issues/983) -- service registry support/config center support on etcd [#808](https://github.com/apache/incubator-dubbo/issues/808) -- metrics support in dubbo 2.7.1 [#3598](https://github.com/apache/incubator-dubbo/issues/3598) -- @Argument @Method support [#2405](https://github.com/apache/incubator-dubbo/issues/2045) +- service register support on nacos [#3582](https://github.com/apache/dubbo/issues/3582) +- support consul as registry center, config center and metadata center [#983](https://github.com/apache/dubbo/issues/983) +- service registry support/config center support on etcd [#808](https://github.com/apache/dubbo/issues/808) +- metrics support in dubbo 2.7.1 [#3598](https://github.com/apache/dubbo/issues/3598) +- @Argument @Method support [#2405](https://github.com/apache/dubbo/issues/2045) ### Enhancement -- [Enhancement] @EnableDubboConfigBinding annotates @Repeatable [#1770](https://github.com/apache/incubator-dubbo/issues/1770) -- [Enhancement] Change the default behavior of @EnableDubboConfig.multiple() [#3193](https://github.com/apache/incubator-dubbo/issues/3193) -- Should make annotation easier to use in multiple items circumstance [#3039](https://github.com/apache/incubator-dubbo/issues/3039) -- NoSuchMethodError are thrown when add custom Filter using dubbo2.6.5 and JDK1.6 and upgrade to dubbo2.7.0 [#3570](https://github.com/apache/incubator-dubbo/issues/3570) -- introduce dubbo-dependencies-zookeeper [#3607](https://github.com/apache/incubator-dubbo/pull/3607) -- Zookeeper ConfigCenter reuse the client abstraction and connection session [#3288](https://github.com/apache/incubator-dubbo/issues/3288) -- [Survey] Is it necessary to continue to maintain zkclient in dubbo project? [#3569](https://github.com/apache/incubator-dubbo/issues/3569) -- Start to use IdleStateHandler in Netty4 [#3341](https://github.com/apache
