This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit d11b8762ba3c99c42ffc863b8225a153595ec47f
Merge: e3916ef 21b4334
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Thu Nov 15 11:29:41 2018 +0800
Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo
into dev-metadata
.../java/org/apache/dubbo/common/Constants.java | 6 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 8 +-
.../dubbo/config/RegistryDataConfigTest.java | 87 ++++++++++++++++++++++
.../dubbo/config/AbstractInterfaceConfig.java | 5 +-
.../apache/dubbo/config/RegistryDataConfig.java | 2 +-
.../annotation/DubboConfigConfiguration.java | 6 +-
.../src/main/resources/META-INF/compat/dubbo.xsd | 20 ++---
.../src/main/resources/META-INF/dubbo.xsd | 20 ++---
.../META-INF/spring/dubbo-demo-provider.xml | 2 +-
.../registry/integration/RegistryProtocol.java | 25 ++-----
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 11 ---
.../registry/integration/RegistryProtocolTest.java | 23 ++++++
12 files changed, 156 insertions(+), 59 deletions(-)
diff --cc
dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
index 566a7c7,5f0d473..f1e28d2
---
a/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
+++
b/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
@@@ -25,10 -25,10 +25,10 @@@
<dubbo:application name="demo-provider"/>
<!--<dubbo:provider tag="tag3"/>-->
- <dubbo:registry group="dubboregistrygroup1"
address="zookeeper://127.0.0.1:2181" simple="false">
+ <dubbo:registry group="dubboregistrygroup1"
address="zookeeper://127.0.0.1:2181">
</dubbo:registry>
- <dubbo:configcenter type="zookeeper" address="127.0.0.1:2181"
namespace="dubboregistrygroup1"
+ <dubbo:configcenter
address="zookeeper://127.0.0.1:2181?backup=127.0.0.1:2182"
namespace="dubboregistrygroup1"
configfile="dubbo.properties"
appname="demo-provider"/>
<!-- use dubbo protocol to export service on port 20880 -->
