You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by il...@apache.org on 2019/07/05 03:44:34 UTC
[dubbo-samples] branch master updated: clean up for
dubbo-samples-callback
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 4df17d7 clean up for dubbo-samples-callback
4df17d7 is described below
commit 4df17d7f2b67184b1b863c6180393003bd125e8a
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Fri Jul 5 11:43:04 2019 +0800
clean up for dubbo-samples-callback
---
dubbo-samples-callback/pom.xml | 10 ++++------
.../org/apache/dubbo/samples/callback/CallbackConsumer.java | 4 ++--
.../org/apache/dubbo/samples/callback/CallbackProvider.java | 7 +++++--
.../src/main/resources/spring/callback-consumer.xml | 7 ++++---
.../src/main/resources/spring/callback-provider.xml | 7 ++++---
5 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/dubbo-samples-callback/pom.xml b/dubbo-samples-callback/pom.xml
index 47b4fbb..a038aeb 100644
--- a/dubbo-samples-callback/pom.xml
+++ b/dubbo-samples-callback/pom.xml
@@ -30,14 +30,16 @@
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<junit.version>4.12</junit.version>
+ <spring-test.version>4.3.16.RELEASE</spring-test.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
<jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
<image.name>${artifactId}:${dubbo.version}</image.name>
+ <java-image.name>openjdk:8</java-image.name>
<dubbo.port>20880</dubbo.port>
+ <zookeeper.port>2181</zookeeper.port>
<main-class>org.apache.dubbo.samples.callback.CallbackProvider</main-class>
- <spring-test.version>4.3.16.RELEASE</spring-test.version>
</properties>
<dependencies>
@@ -104,10 +106,6 @@
</to>
<container>
<mainClass>${main-class}</mainClass>
- <ports>
- <port>${dubbo.port}</port>
- <port>2181</port>
- </ports>
<environment>
<DUBBO_IP_TO_REGISTRY>${dubbo-local-address}</DUBBO_IP_TO_REGISTRY>
</environment>
@@ -134,7 +132,7 @@
<run>
<ports>
<port>${dubbo.port}:${dubbo.port}</port>
- <port>2181:2181</port>
+ <port>${zookeeper.port}:${zookeeper.port}</port>
</ports>
<wait>
<log>dubbo service started</log>
diff --git a/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackConsumer.java b/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackConsumer.java
index 89a46d2..d9d4e00 100644
--- a/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackConsumer.java
+++ b/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackConsumer.java
@@ -28,9 +28,9 @@ public class CallbackConsumer {
public static void main(String[] args) throws Exception {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/callback-consumer.xml");
context.start();
- CallbackService callbackService = (CallbackService) context.getBean("callbackService");
+
+ CallbackService callbackService = context.getBean("callbackService", CallbackService.class);
callbackService.addListener("foo.bar", msg -> System.out.println("callback:" + msg));
- System.in.read();
}
}
diff --git a/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackProvider.java b/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackProvider.java
index 8405529..9462253 100644
--- a/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackProvider.java
+++ b/dubbo-samples-callback/src/main/java/org/apache/dubbo/samples/callback/CallbackProvider.java
@@ -21,14 +21,17 @@ package org.apache.dubbo.samples.callback;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import java.util.concurrent.CountDownLatch;
+
public class CallbackProvider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
+
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/callback-provider.xml");
context.start();
+
System.out.println("dubbo service started");
- System.in.read();
+ new CountDownLatch(1).await();
}
-
}
diff --git a/dubbo-samples-callback/src/main/resources/spring/callback-consumer.xml b/dubbo-samples-callback/src/main/resources/spring/callback-consumer.xml
index d491c36..ce74d30 100644
--- a/dubbo-samples-callback/src/main/resources/spring/callback-consumer.xml
+++ b/dubbo-samples-callback/src/main/resources/spring/callback-consumer.xml
@@ -18,13 +18,14 @@
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
- xmlns="http://www.springframework.org/schema/beans"
+ xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ <context:property-placeholder/>
<dubbo:application name="callback-consumer"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
<dubbo:reference id="callbackService" interface="org.apache.dubbo.samples.callback.api.CallbackService"/>
diff --git a/dubbo-samples-callback/src/main/resources/spring/callback-provider.xml b/dubbo-samples-callback/src/main/resources/spring/callback-provider.xml
index 35d2a3f..6dd7044 100644
--- a/dubbo-samples-callback/src/main/resources/spring/callback-provider.xml
+++ b/dubbo-samples-callback/src/main/resources/spring/callback-provider.xml
@@ -18,13 +18,14 @@
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
- xmlns="http://www.springframework.org/schema/beans"
+ xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ <context:property-placeholder/>
<dubbo:application name="callback-provider"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
<dubbo:protocol name="dubbo" port="20880"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org