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 09:09:37 UTC
[dubbo-samples] branch master updated: clean up for
dubbo-samples-compatible
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 04125fc clean up for dubbo-samples-compatible
04125fc is described below
commit 04125fc70b83c4d8d529a5ce554648d5fa41d862
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Fri Jul 5 17:08:13 2019 +0800
clean up for dubbo-samples-compatible
---
dubbo-samples-compatible/pom.xml | 14 +++++++++-----
.../java/org/apache/dubbo/samples/compat/Provider.java | 6 +++++-
.../src/main/resources/spring/dubbo-compat-consumer.xml | 9 ++++++---
.../src/main/resources/spring/dubbo-compat-provider.xml | 12 +++++++++---
4 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/dubbo-samples-compatible/pom.xml b/dubbo-samples-compatible/pom.xml
index 4c701c1..9f1c2c9 100644
--- a/dubbo-samples-compatible/pom.xml
+++ b/dubbo-samples-compatible/pom.xml
@@ -39,7 +39,9 @@
<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>20890</dubbo.port>
+ <zookeeper.port>2181</zookeeper.port>
<main-class>org.apache.dubbo.samples.compat.Provider</main-class>
</properties>
@@ -107,13 +109,12 @@
</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>
+ <jvmFlags>
+ <jvmFlag>-Dzookeeper.address=${dubbo-local-address}</jvmFlag>
+ </jvmFlags>
</container>
</configuration>
<executions>
@@ -137,7 +138,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>
@@ -175,6 +176,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-compatible/src/main/java/org/apache/dubbo/samples/compat/Provider.java b/dubbo-samples-compatible/src/main/java/org/apache/dubbo/samples/compat/Provider.java
index 49c517a..9fb0806 100644
--- a/dubbo-samples-compatible/src/main/java/org/apache/dubbo/samples/compat/Provider.java
+++ b/dubbo-samples-compatible/src/main/java/org/apache/dubbo/samples/compat/Provider.java
@@ -21,14 +21,18 @@ package org.apache.dubbo.samples.compat;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import java.util.concurrent.CountDownLatch;
+
public class Provider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
+
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-compat-provider.xml");
context.start();
+
System.out.println("dubbo service started");
- System.in.read();
+ new CountDownLatch(1).await();
}
}
diff --git a/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-consumer.xml b/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-consumer.xml
index 4c2e677..13b9a11 100644
--- a/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-consumer.xml
+++ b/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-consumer.xml
@@ -20,11 +20,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="compat-consumer"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
+
<dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.basic.api.DemoService"/>
</beans>
diff --git a/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-provider.xml b/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-provider.xml
index 44c5191..64634a9 100644
--- a/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-provider.xml
+++ b/dubbo-samples-compatible/src/main/resources/spring/dubbo-compat-provider.xml
@@ -20,12 +20,18 @@
<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="compat-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="20890"/>
+
<bean id="demoService" class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/>
+
<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