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:22:22 UTC
[dubbo-samples] branch master updated: clean up for
dubbo-samples-basic
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 b42a624 clean up for dubbo-samples-basic
b42a624 is described below
commit b42a624921e57be2d9a2fdd4c37b50b52ed7a79c
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Fri Jul 5 11:21:01 2019 +0800
clean up for dubbo-samples-basic
---
dubbo-samples-basic/pom.xml | 13 +++++++------
.../java/org/apache/dubbo/samples/basic/BasicProvider.java | 7 +++++--
.../src/main/resources/spring/dubbo-demo-consumer.xml | 12 ++++--------
.../src/main/resources/spring/dubbo-demo-provider.xml | 10 ++++------
4 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/dubbo-samples-basic/pom.xml b/dubbo-samples-basic/pom.xml
index cc5d7be..2a85133 100644
--- a/dubbo-samples-basic/pom.xml
+++ b/dubbo-samples-basic/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.basic.BasicProvider</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>
@@ -172,6 +170,9 @@
<goal>verify</goal>
</goals>
<configuration>
+ <systemPropertyVariables>
+ <zookeeper.address>${dubbo-local-address}</zookeeper.address>
+ </systemPropertyVariables>
<includes>
<include>**/*IT.java</include>
</includes>
diff --git a/dubbo-samples-basic/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java b/dubbo-samples-basic/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java
index 283a1d2..f51aa2e 100644
--- a/dubbo-samples-basic/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java
+++ b/dubbo-samples-basic/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java
@@ -21,16 +21,19 @@ package org.apache.dubbo.samples.basic;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import java.util.concurrent.CountDownLatch;
+
public class BasicProvider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
// wait for embedded zookeeper start completely.
Thread.sleep(1000);
+
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-demo-provider.xml");
context.start();
+
System.out.println("dubbo service started");
- System.in.read();
+ new CountDownLatch(1).await();
}
-
}
diff --git a/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-consumer.xml b/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-consumer.xml
index 86f34b4..2fed926 100644
--- a/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-consumer.xml
+++ b/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -18,19 +18,15 @@
<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/>
- <!-- consumer's application name, used for tracing dependency relationship (not a matching criterion),
- don't set it same as provider -->
<dubbo:application name="demo-consumer"/>
- <!-- use multicast registry center to discover service -->
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
- <!-- generate proxy for the remote service, then demoService can be used in the same way as the
- local regular interface -->
<dubbo:reference id="demoService" check="true" interface="org.apache.dubbo.samples.basic.api.DemoService"/>
</beans>
diff --git a/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-provider.xml b/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-provider.xml
index 9e13902..21e25c2 100644
--- a/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-provider.xml
+++ b/dubbo-samples-basic/src/main/resources/spring/dubbo-demo-provider.xml
@@ -18,19 +18,17 @@
<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/>
- <!-- provider's application name, used for tracing dependency relationship -->
<dubbo:application name="demo-provider"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
- <!-- service implementation, as same as regular local bean -->
<bean id="demoService" class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/>
- <!-- declare the service interface to be exported -->
<dubbo:service interface="org.apache.dubbo.samples.basic.api.DemoService" ref="demoService"/>
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org