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/15 09:03:20 UTC
[incubator-dubbo] branch dev-metadata updated: Add pom dependency
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 dc23a34 Add pom dependency
dc23a34 is described below
commit dc23a343688adb1948503738b5d253678f5d59dd
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Nov 15 17:02:52 2018 +0800
Add pom dependency
---
dubbo-config/dubbo-config-api/pom.xml | 65 +++++++++++++++++++++-
.../apache/dubbo/config/ConfigCenterConfig.java | 1 +
.../META-INF/spring/dubbo-demo-consumer.xml | 6 +-
.../META-INF/spring/dubbo-demo-provider.xml | 2 +-
.../java/org/apache/dubbo/registry/ZKTools.java | 2 +-
5 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml
index 15868b0..f5587de 100644
--- a/dubbo-config/dubbo-config-api/pom.xml
+++ b/dubbo-config/dubbo-config-api/pom.xml
@@ -64,5 +64,68 @@
<artifactId>dubbo-filter-cache</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-default</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-monitor-default</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-rpc-dubbo</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-rpc-rmi</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-remoting-netty4</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-multicast</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-hessian2</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-jdk</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
index fdca12c..ad63468 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
@@ -89,6 +89,7 @@ public class ConfigCenterConfig extends AbstractConfig {
private DynamicConfiguration startDynamicConfiguration() {
// give jvm properties the chance to override local configs, e.g., -Ddubbo.configcenter.config.priority
+
refresh();
// checkConfigCenter();
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 dc303db..60810c3 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
@@ -25,14 +25,14 @@
<!-- use multicast registry center to discover service -->
- <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181"/>
+ <!--<dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181"/>-->
- <dubbo:configcenter protocol="zookeeper" address="127.0.0.1:2181" namespace="dubboregistrygroup1"
+ <dubbo:configcenter address="zookeeper://127.0.0.1:2181" namespace="dubboregistrygroup1"
configfile="dubbo.properties"/>
<!-- generate proxy for the remote service, then demoService can be used in the same way as the
local regular interface -->
- <dubbo:reference url="dubbo://127.0.0.1:20880/org.apache.dubbo.demo.DemoService" id="demoService" check="false"
+ <dubbo:reference id="demoService" check="false"
interface="org.apache.dubbo.demo.DemoService" version="1.0.4" group="dd-test"/>
</beans>
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 f1e28d2..87c6786 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,7 +25,7 @@
<dubbo:application name="demo-provider"/>
<!--<dubbo:provider tag="tag3"/>-->
- <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181">
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2182">
</dubbo:registry>
<dubbo:configcenter address="zookeeper://127.0.0.1:2181?backup=127.0.0.1:2182" namespace="dubboregistrygroup1"
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 d0a569f..ab0894d 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
@@ -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);
}