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 02:49:40 UTC
[dubbo-samples] 01/02: clean up dubbo-samples-annotation
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
commit fdf68832dbe797f25eb68509efbf17e0db9ee18b
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Fri Jul 5 10:17:51 2019 +0800
clean up dubbo-samples-annotation
---
dubbo-samples-annotation/pom.xml | 14 +++++++-------
.../samples/annotation/AnnotationProviderBootstrap.java | 5 ++++-
.../src/main/resources/spring/dubbo-consumer.properties | 2 +-
.../src/main/resources/spring/dubbo-provider.properties | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/dubbo-samples-annotation/pom.xml b/dubbo-samples-annotation/pom.xml
index 80c4799..2560789 100644
--- a/dubbo-samples-annotation/pom.xml
+++ b/dubbo-samples-annotation/pom.xml
@@ -32,6 +32,7 @@
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
+ <spring-test.version>4.3.16.RELEASE</spring-test.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
<jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
@@ -39,8 +40,8 @@
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
<image.name>${artifactId}:${dubbo.version}</image.name>
<dubbo.port>20880</dubbo.port>
+ <zookeeper.port>2181</zookeeper.port>
<main-class>org.apache.dubbo.samples.annotation.AnnotationProviderBootstrap</main-class>
- <spring-test.version>4.3.16.RELEASE</spring-test.version>
</properties>
<dependencies>
@@ -100,20 +101,19 @@
<version>${jib-maven-plugin.version}</version>
<configuration>
<from>
- <image>${java-image.name}</image>
+ <image>openjdk:8</image>
</from>
<to>
<image>${image.name}</image>
</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 +137,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-annotation/src/main/java/org/apache/dubbo/samples/annotation/AnnotationProviderBootstrap.java b/dubbo-samples-annotation/src/main/java/org/apache/dubbo/samples/annotation/AnnotationProviderBootstrap.java
index 6239b6c..5bce155 100644
--- a/dubbo-samples-annotation/src/main/java/org/apache/dubbo/samples/annotation/AnnotationProviderBootstrap.java
+++ b/dubbo-samples-annotation/src/main/java/org/apache/dubbo/samples/annotation/AnnotationProviderBootstrap.java
@@ -28,6 +28,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
+import java.util.concurrent.CountDownLatch;
+
public class AnnotationProviderBootstrap {
public static void main(String[] args) throws Exception {
@@ -36,8 +38,9 @@ public class AnnotationProviderBootstrap {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ProviderConfiguration.class);
context.start();
+
System.out.println("dubbo service started.");
- System.in.read();
+ new CountDownLatch(1).await();
}
@Configuration
diff --git a/dubbo-samples-annotation/src/main/resources/spring/dubbo-consumer.properties b/dubbo-samples-annotation/src/main/resources/spring/dubbo-consumer.properties
index 40ad921..ea1d2c0 100644
--- a/dubbo-samples-annotation/src/main/resources/spring/dubbo-consumer.properties
+++ b/dubbo-samples-annotation/src/main/resources/spring/dubbo-consumer.properties
@@ -18,5 +18,5 @@
#
dubbo.application.name=samples-annotation-consumer
-dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.registry.address=zookeeper://${zookeeper.address:127.0.0.1}:2181
dubbo.consumer.timeout=3000
diff --git a/dubbo-samples-annotation/src/main/resources/spring/dubbo-provider.properties b/dubbo-samples-annotation/src/main/resources/spring/dubbo-provider.properties
index be30389..ba0566f 100644
--- a/dubbo-samples-annotation/src/main/resources/spring/dubbo-provider.properties
+++ b/dubbo-samples-annotation/src/main/resources/spring/dubbo-provider.properties
@@ -18,6 +18,6 @@
#
dubbo.application.name=samples-annotation-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
dubbo.protocol.port=20880
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org