You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/11/05 07:55:54 UTC
[incubator-dubbo] branch dev-metadata updated: Demo changes.
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
The following commit(s) were added to refs/heads/dev-metadata by this push:
new 4b68368 Demo changes.
4b68368 is described below
commit 4b68368c6e21cc4585439642e1abed6e39090f48
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Nov 5 15:55:39 2018 +0800
Demo changes.
---
.../src/main/resources/META-INF/spring/dubbo-demo-consumer.xml | 3 +--
.../src/main/resources/META-INF/spring/dubbo-demo-provider.xml | 5 +++--
.../src/test/java/org/apache/dubbo/registry/ZKTools.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
index a8d25a8..4f2f7cc 100644
--- a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
+++ b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
@@ -24,8 +24,7 @@
<dubbo:application name="demo-consumer"/>
<!-- use multicast registry center to discover service -->
- <!-- <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181" default="true"/>
- <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181"/>-->
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181"/>
<dubbo:configcenter type="zookeeper" address="127.0.0.1:2181" namespace="dubboregistrygroup1"
configfile="dubbo.properties"/>
diff --git 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
index 1ac3128..89d24b0 100644
--- 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,8 +25,9 @@
<dubbo:application name="demo-provider"/>
<!--<dubbo:provider tag="tag3"/>-->
- <!--<dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181" simple="false">
- </dubbo:registry>-->
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181" simple="false">
+ </dubbo:registry>
+
<dubbo:configcenter type="zookeeper" address="127.0.0.1:2181" namespace="dubboregistrygroup1"
configfile="dubbo.properties" appname="demo-provider"/>
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/ZKTools.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/ZKTools.java
index 930a286..9425222 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/ZKTools.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/ZKTools.java
@@ -52,7 +52,7 @@ public class ZKTools {
}
public static void testStartupConfig() {
- String str = "dubbo.registry.address=zookeeper://127.0.0.1:2182\n" +
+ String str = "dubbo.registry.address=zookeeper://127.0.0.1:2181\n" +
"dubbo.registry.group=dubboregistrygroup1\n" +
"dubbo.servicestore.address=zookeeper://127.0.0.1:2181\n" +
"dubbo.protocol.port=20990\n" +
@@ -61,7 +61,7 @@ public class ZKTools {
System.out.println(str);
try {
- String path = "/dubboregistrygroup1/config/demo-provider/dubbo.properties";
+ String path = "/dubboregistrygroup1/config/dubbo/dubbo.properties";
if (client.checkExists().forPath(path) == null) {
client.create().creatingParentsIfNeeded().forPath(path);
}