You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by hu...@apache.org on 2018/05/17 08:20:31 UTC
[incubator-dubbo] branch master updated (a45206c -> b48e8ba)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from a45206c Merge pull request #1811, fix unstable hessian protocol unit test by adding overload.
add be92745 Add a construtor to accept address and protocol for RegistryConfig.
add c1b6865 Remove unused code.
add 9dd6c6f Ensure Dubbo can shutdown correctly when running both under tomcat and programmably.
add a20eb73 Add comments.
add 4a6c38d Add dependency.
add bc543c1 Using ExecutorUtil#gracefulShutdown instead of create a new method.
add 0d00ef2 Correct pom version.
add e201004 Fix UT failure.
new 48f34fe Merge branch 'graceful-shutdown-in-tomcat' of https://github.com/ralf0131/dubbo into ralf0131-graceful-shutdown-in-tomcat
new b48e8ba Merge branch 'ralf0131-graceful-shutdown-in-tomcat'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
all/pom.xml | 8 ++
.../dubbo-rpc-api => dubbo-bootstrap}/pom.xml | 89 +++++++-------
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 133 +++++++++++++++++++++
.../alibaba/dubbo/common/utils/ExecutorUtil.java | 10 +-
.../com/alibaba/dubbo/config/AbstractConfig.java | 12 --
.../com/alibaba/dubbo/config/ProtocolConfig.java | 25 ----
.../com/alibaba/dubbo/config/RegistryConfig.java | 11 +-
.../alibaba/dubbo/config/ProtocolConfigTest.java | 10 --
...onfigTest.java => ProtocolConfigTest.java.orig} | 12 +-
dubbo-config/dubbo-config-spring/pom.xml | 14 +++
.../initializer/DubboApplicationListener.java | 45 +++++++
.../DubboWebApplicationInitializer.java | 40 +++++++
.../dubbo/registry/support/FailbackRegistry.java | 9 +-
.../dubbo/registry/dubbo/DubboRegistry.java | 13 +-
.../registry/multicast/MulticastRegistry.java | 2 +
.../dubbo/registry/redis/RedisRegistry.java | 2 +
pom.xml | 1 +
17 files changed, 324 insertions(+), 112 deletions(-)
copy {dubbo-rpc/dubbo-rpc-api => dubbo-bootstrap}/pom.xml (70%)
create mode 100644 dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
copy dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/{ProtocolConfigTest.java => ProtocolConfigTest.java.orig} (95%)
create mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/initializer/DubboApplicationListener.java
create mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/initializer/DubboWebApplicationInitializer.java
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 01/02: Merge branch 'graceful-shutdown-in-tomcat'
of https://github.com/ralf0131/dubbo into
ralf0131-graceful-shutdown-in-tomcat
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 48f34fe96883b43c185948080177d514460c70ae
Merge: a45206c e201004
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Thu May 17 16:16:20 2018 +0800
Merge branch 'graceful-shutdown-in-tomcat' of https://github.com/ralf0131/dubbo into ralf0131-graceful-shutdown-in-tomcat
all/pom.xml | 8 ++
dubbo-bootstrap/pom.xml | 47 ++++++++
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 133 +++++++++++++++++++++
.../alibaba/dubbo/common/utils/ExecutorUtil.java | 10 +-
.../com/alibaba/dubbo/config/AbstractConfig.java | 12 --
.../com/alibaba/dubbo/config/ProtocolConfig.java | 25 ----
.../com/alibaba/dubbo/config/RegistryConfig.java | 11 +-
.../alibaba/dubbo/config/ProtocolConfigTest.java | 10 --
...onfigTest.java => ProtocolConfigTest.java.orig} | 12 +-
dubbo-config/dubbo-config-spring/pom.xml | 14 +++
.../initializer/DubboApplicationListener.java | 45 +++++++
.../DubboWebApplicationInitializer.java | 40 +++++++
.../dubbo/registry/support/FailbackRegistry.java | 9 +-
.../dubbo/registry/dubbo/DubboRegistry.java | 13 +-
.../registry/multicast/MulticastRegistry.java | 2 +
.../dubbo/registry/redis/RedisRegistry.java | 2 +
pom.xml | 1 +
17 files changed, 325 insertions(+), 69 deletions(-)
diff --cc dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
index c9d9046,fb105dd..4d10c72
--- 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
@@@ -17,8 -17,6 +17,7 @@@
package com.alibaba.dubbo.config;
- import com.alibaba.dubbo.common.extension.ExtensionLoader;
+import com.alibaba.dubbo.config.mock.MockProtocol2;
import com.alibaba.dubbo.rpc.Protocol;
import org.junit.Test;
import org.mockito.Mockito;
diff --cc dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig
index c9d9046,fb105dd..c22910b
--- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig
+++ b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig
@@@ -17,8 -17,6 +17,11 @@@
package com.alibaba.dubbo.config;
++<<<<<<< HEAD
+import com.alibaba.dubbo.common.extension.ExtensionLoader;
+import com.alibaba.dubbo.config.mock.MockProtocol2;
++=======
++>>>>>>> e201004e985f3ae43ee8c65baa16bcc0aecc0000
import com.alibaba.dubbo.rpc.Protocol;
import org.junit.Test;
import org.mockito.Mockito;
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 02/02: Merge branch
'ralf0131-graceful-shutdown-in-tomcat'
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit b48e8bac049e41e43e982b115e91c4f0c5a6775c
Merge: a45206c 48f34fe
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Thu May 17 16:19:17 2018 +0800
Merge branch 'ralf0131-graceful-shutdown-in-tomcat'
all/pom.xml | 8 ++
dubbo-bootstrap/pom.xml | 47 ++++++++
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 133 +++++++++++++++++++++
.../alibaba/dubbo/common/utils/ExecutorUtil.java | 10 +-
.../com/alibaba/dubbo/config/AbstractConfig.java | 12 --
.../com/alibaba/dubbo/config/ProtocolConfig.java | 25 ----
.../com/alibaba/dubbo/config/RegistryConfig.java | 11 +-
.../alibaba/dubbo/config/ProtocolConfigTest.java | 10 --
...onfigTest.java => ProtocolConfigTest.java.orig} | 12 +-
dubbo-config/dubbo-config-spring/pom.xml | 14 +++
.../initializer/DubboApplicationListener.java | 45 +++++++
.../DubboWebApplicationInitializer.java | 40 +++++++
.../dubbo/registry/support/FailbackRegistry.java | 9 +-
.../dubbo/registry/dubbo/DubboRegistry.java | 13 +-
.../registry/multicast/MulticastRegistry.java | 2 +
.../dubbo/registry/redis/RedisRegistry.java | 2 +
pom.xml | 1 +
17 files changed, 325 insertions(+), 69 deletions(-)
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.