dubbo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject [dubbo-samples] branch master updated: integration test for dubbo-samples-merge
Date Wed, 26 Jun 2019 10:02:47 GMT
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 4f72d47  integration test for dubbo-samples-merge
4f72d47 is described below

commit 4f72d472b52b5aca396732c6b9c5b73b79c2af6a
Author: Ian Luo <ian.luo@gmail.com>
AuthorDate: Wed Jun 26 18:01:47 2019 +0800

    integration test for dubbo-samples-merge
---
 dubbo-samples-merge/README.md                      |   2 -
 .../dubbo-samples-merge-api/pom.xml                |  30 +++
 .../dubbo/samples/merge/api/MergeService.java      |   3 -
 .../dubbo-samples-merge-consumer/pom.xml           | 185 ++++++++++++++
 .../apache/dubbo/samples/merge/MergeConsumer.java} |  15 +-
 .../apache/dubbo/samples/merge/MergeConsumer2.java |  19 +-
 .../src/main/resources/log4j.properties            |   0
 .../src/main/resources/spring/merge-consumer.xml   |  33 +++
 .../src/main/resources/spring/merge-consumer2.xml  |  33 +++
 .../apache/dubbo/samples/merge/Consumer1IT.java    |  48 ++++
 .../apache/dubbo/samples/merge/Consumer2IT.java    |  44 ++++
 .../dubbo-samples-merge-provider1/pom.xml          | 116 +++++++++
 .../apache/dubbo/samples/merge/MergeProvider.java  |  34 +++
 .../dubbo/samples/merge/impl/MergeServiceImpl.java |   9 +-
 .../samples/merge/impl/MergeServiceImpl2.java      |   9 +-
 .../src/main/resources/log4j.properties            |   0
 .../src/main/resources/spring/merge-provider.xml   |  11 +-
 .../dubbo-samples-merge-provider2/pom.xml          | 116 +++++++++
 .../apache/dubbo/samples/merge/MergeProvider2.java |  12 +-
 .../samples/merge/impl/MergeServiceImpl3.java      |   9 +-
 .../src/main/resources/log4j.properties            |   0
 .../src/main/resources/spring/merge-provider2.xml  |  11 +-
 dubbo-samples-merge/pom.xml                        | 284 +--------------------
 .../dubbo/samples/merge/AnnotationConsumer.java    |  76 ------
 .../dubbo/samples/merge/EmbeddedZooKeeper.java     | 255 ------------------
 .../apache/dubbo/samples/merge/MergeConsumer.java  |  48 ----
 .../src/main/resources/spring/merge-consumer.xml   |  31 ---
 .../src/main/resources/spring/merge-consumer2.xml  |  32 ---
 28 files changed, 685 insertions(+), 780 deletions(-)

diff --git a/dubbo-samples-merge/README.md b/dubbo-samples-merge/README.md
deleted file mode 100644
index 389abf5..0000000
--- a/dubbo-samples-merge/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## 分组聚合
-按组合并返回结果,比如菜单服务,接口一样,但有多种实现,用group区分,现在消费方需从每种group中调用一次返回结果,合并结果返回,这样就可以实现聚合菜单项。
\ No newline at end of file
diff --git a/dubbo-samples-merge/dubbo-samples-merge-api/pom.xml b/dubbo-samples-merge/dubbo-samples-merge-api/pom.xml
new file mode 100644
index 0000000..db42323
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-api/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dubbo-samples-merge</artifactId>
+        <groupId>org.apache.dubbo</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dubbo-samples-merge-api</artifactId>
+</project>
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java b/dubbo-samples-merge/dubbo-samples-merge-api/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java
similarity index 97%
rename from dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java
rename to dubbo-samples-merge/dubbo-samples-merge-api/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java
index 8158eb9..a334559 100644
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-api/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java
@@ -21,9 +21,6 @@ package org.apache.dubbo.samples.merge.api;
 
 import java.util.List;
 
-/**
- * MergeService
- */
 public interface MergeService {
 
     List<String> mergeResult();
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/pom.xml b/dubbo-samples-merge/dubbo-samples-merge-consumer/pom.xml
new file mode 100644
index 0000000..46757a1
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/pom.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dubbo-samples-merge</artifactId>
+        <groupId>org.apache.dubbo</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dubbo-samples-merge-consumer</artifactId>
+
+    <properties>
+        <dubbo.version>2.7.2</dubbo.version>
+        <spring.version>4.3.16.RELEASE</spring.version>
+        <junit.version>4.12</junit.version>
+        <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
+        <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
+        <zookeeper.port>2181</zookeeper.port>
+        <provider1.image>dubbo-samples-merge-provider1:${dubbo.version}</provider1.image>
+        <provider1.port>20880</provider1.port>
+        <provider2.image>dubbo-samples-merge-provider2:${dubbo.version}</provider2.image>
+        <provider2.port>20881</provider2.port>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-samples-merge-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo</artifactId>
+            <version>${dubbo.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <version>${dubbo.version}</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>dubbo-integration-test</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.dubbo</groupId>
+                        <artifactId>dubbo-maven-address-plugin</artifactId>
+                        <version>1.0-SNAPSHOT</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>local-address</goal>
+                                </goals>
+                                <configuration>
+                                    <localAddress>dubbo-local-address</localAddress>
+                                </configuration>
+                                <phase>initialize</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>${docker-maven-plugin.version}</version>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>zookeeper:latest</name>
+                                    <run>
+                                        <ports>
+                                            <port>${zookeeper.port}:${zookeeper.port}</port>
+                                        </ports>
+                                    </run>
+                                </image>
+
+                                <image>
+                                    <name>${provider1.image}</name>
+                                    <run>
+                                        <ports>
+                                            <port>${provider1.port}:${provider1.port}</port>
+                                        </ports>
+                                        <wait>
+                                            <log>dubbo service started</log>
+                                        </wait>
+                                    </run>
+                                </image>
+
+                                <image>
+                                    <name>${provider2.image}</name>
+                                    <run>
+                                        <ports>
+                                            <port>${provider2.port}:${provider2.port}</port>
+                                        </ports>
+                                        <wait>
+                                            <log>dubbo service started</log>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${maven-failsafe-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <zookeeper.address>${dubbo-local-address}</zookeeper.address>
+                                    </systemPropertyVariables>
+                                    <includes>
+                                        <include>**/*IT.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java
similarity index 80%
rename from dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java
rename to dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java
index 4b2ca8f..639e42f 100644
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java
@@ -19,18 +19,17 @@
 
 package org.apache.dubbo.samples.merge;
 
+import org.apache.dubbo.samples.merge.api.MergeService;
+
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-/**
- * MergeProvider
- */
-public class MergeProvider {
+public class MergeConsumer {
 
     public static void main(String[] args) throws Exception {
-        new EmbeddedZooKeeper(2181, false).start();
-        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/merge-provider.xml"});
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/merge-consumer.xml");
         context.start();
-        System.in.read();
-    }
 
+        MergeService mergeService = (MergeService) context.getBean("mergeService");
+        System.out.println(mergeService.mergeResult());
+    }
 }
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java
similarity index 74%
rename from dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java
rename to dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java
index 006b173..0122673 100644
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java
@@ -23,26 +23,13 @@ import org.apache.dubbo.samples.merge.api.MergeService;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import java.util.List;
-
-/**
- * MergeConsumer2
- */
 public class MergeConsumer2 {
 
     public static void main(String[] args) throws Exception {
-        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/merge-consumer2.xml"});
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/merge-consumer2.xml");
         context.start();
+
         MergeService mergeService = (MergeService) context.getBean("mergeService");
-        for (int i = 0; i < Integer.MAX_VALUE; i++) {
-            try {
-                List<String> result = mergeService.mergeResult();
-                System.out.println("(" + i + ") " + result);
-                Thread.sleep(1000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+        System.out.println(mergeService.mergeResult());
     }
-
 }
diff --git a/dubbo-samples-merge/src/main/resources/log4j.properties b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/log4j.properties
similarity index 100%
copy from dubbo-samples-merge/src/main/resources/log4j.properties
copy to dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/log4j.properties
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/spring/merge-consumer.xml b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/spring/merge-consumer.xml
new file mode 100644
index 0000000..24f404d
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/spring/merge-consumer.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<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: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://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+    <context:property-placeholder/>
+
+    <dubbo:application name="merge-consumer"/>
+
+    <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
+
+    <dubbo:reference id="mergeService" interface="org.apache.dubbo.samples.merge.api.MergeService" group="*"
+                     merger="true"/>
+
+</beans>
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/spring/merge-consumer2.xml b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/spring/merge-consumer2.xml
new file mode 100644
index 0000000..b185b31
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/main/resources/spring/merge-consumer2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<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: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://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+    <context:property-placeholder/>
+
+    <dubbo:application name="merge-consumer"/>
+
+    <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
+
+    <dubbo:reference id="mergeService" interface="org.apache.dubbo.samples.merge.api.MergeService"
+                     group="merge2,merge3"/>
+
+</beans>
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
new file mode 100644
index 0000000..256a311
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.samples.merge;
+
+import org.apache.dubbo.samples.merge.api.MergeService;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:/spring/merge-consumer.xml"})
+public class Consumer1IT {
+    @Autowired
+    private MergeService mergeService;
+
+    @Test
+    public void test() throws Exception {
+        List<String> result = mergeService.mergeResult();
+        Assert.assertTrue(result.contains("group-2.1"));
+        Assert.assertTrue(result.contains("group-2.2"));
+        Assert.assertTrue(result.contains("group-1.1"));
+        Assert.assertTrue(result.contains("group-1.2"));
+        Assert.assertTrue(result.contains("group-3.1"));
+        Assert.assertTrue(result.contains("group-3.2"));
+        Assert.assertEquals(6, result.size());
+    }
+}
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer2IT.java b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer2IT.java
new file mode 100644
index 0000000..7299fab
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer2IT.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.samples.merge;
+
+import org.apache.dubbo.samples.merge.api.MergeService;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:/spring/merge-consumer2.xml"})
+public class Consumer2IT {
+    @Autowired
+    private MergeService mergeService;
+
+    @Test
+    public void test() throws Exception {
+        List<String> result = mergeService.mergeResult();
+        Assert.assertTrue(result.contains("group-2.1"));
+        Assert.assertTrue(result.contains("group-2.2"));
+        Assert.assertEquals(2, result.size());
+    }
+}
diff --git a/dubbo-samples-merge/dubbo-samples-merge-provider1/pom.xml b/dubbo-samples-merge/dubbo-samples-merge-provider1/pom.xml
new file mode 100644
index 0000000..b3de2ee
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider1/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dubbo-samples-merge</artifactId>
+        <groupId>org.apache.dubbo</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dubbo-samples-merge-provider1</artifactId>
+
+    <properties>
+        <dubbo.version>2.7.2</dubbo.version>
+        <jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
+        <image.name>${artifactId}:${dubbo.version}</image.name>
+        <dubbo.port>20880</dubbo.port>
+        <main-class>org.apache.dubbo.samples.merge.MergeProvider</main-class>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-samples-merge-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo</artifactId>
+            <version>${dubbo.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <version>${dubbo.version}</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>dubbo-integration-test</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.dubbo</groupId>
+                        <artifactId>dubbo-maven-address-plugin</artifactId>
+                        <version>1.0-SNAPSHOT</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>local-address</goal>
+                                </goals>
+                                <configuration>
+                                    <localAddress>dubbo-local-address</localAddress>
+                                </configuration>
+                                <phase>initialize</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
+                        <version>${jib-maven-plugin.version}</version>
+                        <configuration>
+                            <from>
+                                <image>openjdk:8</image>
+                            </from>
+                            <to>
+                                <image>${image.name}</image>
+                            </to>
+                            <container>
+                                <mainClass>${main-class}</mainClass>
+                                <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>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>dockerBuild</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java
new file mode 100644
index 0000000..dc7c5ab
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.samples.merge;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.util.concurrent.CountDownLatch;
+
+public class MergeProvider {
+
+    public static void main(String[] args) throws Exception {
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/merge-provider.xml");
+        context.start();
+
+        System.out.println("dubbo service started");
+        new CountDownLatch(1).await();
+    }
+
+}
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java
similarity index 93%
rename from dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java
rename to dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java
index 7c37b00..31fcc5c 100644
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java
@@ -19,19 +19,16 @@
 
 package org.apache.dubbo.samples.merge.impl;
 
+import org.apache.dubbo.samples.merge.api.MergeService;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.dubbo.samples.merge.api.MergeService;
-
-/**
- * MenuServiceImpl
- */
 public class MergeServiceImpl implements MergeService {
 
     @Override
     public List<String> mergeResult() {
-        List<String> menus = new ArrayList<String>();
+        List<String> menus = new ArrayList<>();
         menus.add("group-1.1");
         menus.add("group-1.2");
         return menus;
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java
similarity index 93%
rename from dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java
rename to dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java
index 8e411c1..f11a651 100644
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java
@@ -19,19 +19,16 @@
 
 package org.apache.dubbo.samples.merge.impl;
 
+import org.apache.dubbo.samples.merge.api.MergeService;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.dubbo.samples.merge.api.MergeService;
-
-/**
- * MenuServiceImpl
- */
 public class MergeServiceImpl2 implements MergeService {
 
     @Override
     public List<String> mergeResult() {
-        List<String> menus = new ArrayList<String>();
+        List<String> menus = new ArrayList<>();
         menus.add("group-2.1");
         menus.add("group-2.2");
         return menus;
diff --git a/dubbo-samples-merge/src/main/resources/log4j.properties b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/resources/log4j.properties
similarity index 100%
copy from dubbo-samples-merge/src/main/resources/log4j.properties
copy to dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/resources/log4j.properties
diff --git a/dubbo-samples-merge/src/main/resources/spring/merge-provider.xml b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/resources/spring/merge-provider.xml
similarity index 78%
rename from dubbo-samples-merge/src/main/resources/spring/merge-provider.xml
rename to dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/resources/spring/merge-provider.xml
index fda5bbd..5ff623c 100644
--- a/dubbo-samples-merge/src/main/resources/spring/merge-provider.xml
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider1/src/main/resources/spring/merge-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="merge-provider"/>
+    <dubbo:application name="merge-provider-1"/>
 
-    <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"/>
 
@@ -36,4 +37,4 @@
 
     <dubbo:service group="merge2" interface="org.apache.dubbo.samples.merge.api.MergeService" ref="mergeService2"/>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dubbo-samples-merge/dubbo-samples-merge-provider2/pom.xml b/dubbo-samples-merge/dubbo-samples-merge-provider2/pom.xml
new file mode 100644
index 0000000..5227535
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider2/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dubbo-samples-merge</artifactId>
+        <groupId>org.apache.dubbo</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dubbo-samples-merge-provider2</artifactId>
+
+    <properties>
+        <dubbo.version>2.7.2</dubbo.version>
+        <jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
+        <image.name>${artifactId}:${dubbo.version}</image.name>
+        <dubbo.port>20881</dubbo.port>
+        <main-class>org.apache.dubbo.samples.merge.MergeProvider2</main-class>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-samples-merge-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo</artifactId>
+            <version>${dubbo.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <version>${dubbo.version}</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>dubbo-integration-test</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.dubbo</groupId>
+                        <artifactId>dubbo-maven-address-plugin</artifactId>
+                        <version>1.0-SNAPSHOT</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>local-address</goal>
+                                </goals>
+                                <configuration>
+                                    <localAddress>dubbo-local-address</localAddress>
+                                </configuration>
+                                <phase>initialize</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
+                        <version>${jib-maven-plugin.version}</version>
+                        <configuration>
+                            <from>
+                                <image>openjdk:8</image>
+                            </from>
+                            <to>
+                                <image>${image.name}</image>
+                            </to>
+                            <container>
+                                <mainClass>${main-class}</mainClass>
+                                <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>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>dockerBuild</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java b/dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java
similarity index 85%
rename from dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java
rename to dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java
index ba8ae45..744bba5 100644
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java
@@ -21,16 +21,16 @@ package org.apache.dubbo.samples.merge;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-/**
- * MergeProvider2
- */
+import java.util.concurrent.CountDownLatch;
+
 public class MergeProvider2 {
 
     public static void main(String[] args) throws Exception {
-        new EmbeddedZooKeeper(2181, false).start();
-        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/merge-provider2.xml"});
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/merge-provider2.xml");
         context.start();
-        System.in.read();
+
+        System.out.println("dubbo service started");
+        new CountDownLatch(1).await();
     }
 
 }
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java b/dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java
similarity index 93%
rename from dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java
rename to dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java
index f43c357..2b9b0e6 100644
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java
@@ -19,19 +19,16 @@
 
 package org.apache.dubbo.samples.merge.impl;
 
+import org.apache.dubbo.samples.merge.api.MergeService;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.dubbo.samples.merge.api.MergeService;
-
-/**
- * MenuServiceImpl
- */
 public class MergeServiceImpl3 implements MergeService {
 
     @Override
     public List<String> mergeResult() {
-        List<String> menus = new ArrayList<String>();
+        List<String> menus = new ArrayList<>();
         menus.add("group-3.1");
         menus.add("group-3.2");
         return menus;
diff --git a/dubbo-samples-merge/src/main/resources/log4j.properties b/dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/resources/log4j.properties
similarity index 100%
rename from dubbo-samples-merge/src/main/resources/log4j.properties
rename to dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/resources/log4j.properties
diff --git a/dubbo-samples-merge/src/main/resources/spring/merge-provider2.xml b/dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/resources/spring/merge-provider2.xml
similarity index 76%
rename from dubbo-samples-merge/src/main/resources/spring/merge-provider2.xml
rename to dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/resources/spring/merge-provider2.xml
index 521ecab..3a3d31f 100644
--- a/dubbo-samples-merge/src/main/resources/spring/merge-provider2.xml
+++ b/dubbo-samples-merge/dubbo-samples-merge-provider2/src/main/resources/spring/merge-provider2.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="merge-provider2"/>
+    <dubbo:application name="merge-provider-2"/>
 
-    <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="20881"/>
 
@@ -32,4 +33,4 @@
 
     <dubbo:service group="merge3" interface="org.apache.dubbo.samples.merge.api.MergeService" ref="mergeService3"/>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dubbo-samples-merge/pom.xml b/dubbo-samples-merge/pom.xml
index 6f5f72f..9791e2e 100644
--- a/dubbo-samples-merge/pom.xml
+++ b/dubbo-samples-merge/pom.xml
@@ -20,7 +20,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>org.apache.dubbo</groupId>
+    <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
+    <modules>
+        <module>dubbo-samples-merge-api</module>
+        <module>dubbo-samples-merge-provider1</module>
+        <module>dubbo-samples-merge-provider2</module>
+        <module>dubbo-samples-merge-consumer</module>
+    </modules>
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,293 +35,20 @@
     <properties>
         <source.level>1.8</source.level>
         <target.level>1.8</target.level>
-        <spring.version>4.3.16.RELEASE</spring.version>
-        <dubbo.version>2.7.0</dubbo.version>
-        <dubbo.rpc.version>2.7.0</dubbo.rpc.version>
-        <zookeeper.version>3.4.13</zookeeper.version>
-        <curator.version>4.0.1</curator.version>
-        <validation-api.version>1.1.0.Final</validation-api.version>
-        <hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
-        <resteasy.version>3.0.19.Final</resteasy.version>
-        <curator-client.version>4.0.1</curator-client.version>
-        <swagger.version>1.5.19</swagger.version>
-        <tomcat.version>7.0.88</tomcat.version>
-        <servlet.version>3.0.1</servlet.version>
-        <maven_checkstyle_version>3.0.0</maven_checkstyle_version>
-        <apache-rat-plugin.version>0.12</apache-rat-plugin.version>
-        <spring-boot.version>1.5.13.RELEASE</spring-boot.version>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${spring.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <!-- Import dependency management from Spring Boot -->
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-all</artifactId>
-                <version>4.1.16.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-bom</artifactId>
-                <version>${dubbo.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo</artifactId>
-                <version>${dubbo.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.thrift</groupId>
-                        <artifactId>libthrift</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-rpc-rest</artifactId>
-                <version>${dubbo.rpc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.zookeeper</groupId>
-                <artifactId>zookeeper</artifactId>
-                <version>${zookeeper.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.curator</groupId>
-                <artifactId>curator-framework</artifactId>
-                <version>${curator.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>${validation-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>${hibernate-validator.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-jackson-provider</artifactId>
-                <version>${resteasy.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.curator</groupId>
-                <artifactId>curator-client</artifactId>
-                <version>${curator-client.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${servlet.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-core</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-logging-juli</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-            <!-- swagger -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-jaxrs</artifactId>
-                <version>${swagger.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-configcenter-zookeeper</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-    </dependencies>
-
-
-
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>${source.level}</source>
                     <target>${target.level}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <version>${apache-rat-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>verify.rat</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/*.versionsBackup</exclude>
-                                <exclude>**/.idea/</exclude>
-                                <exclude>**/*.iml</exclude>
-                                <exclude>**/*.txt</exclude>
-                                <exclude>**/*.load</exclude>
-                                <exclude>**/*.flex</exclude>
-                                <exclude>**/*.fc</exclude>
-                                <exclude>**/*.javascript</exclude>
-                                <exclude>**/*.properties</exclude>
-                                <exclude>**/*.thrift</exclude>
-                                <exclude>**/*.sh</exclude>
-                                <exclude>**/*.bat</exclude>
-                                <exclude>**/*.md</exclude>
-                                <exclude>.git/</exclude>
-                                <exclude>.gitignore</exclude>
-                                <!-- ASF jenkins box puts the Maven repo in our root directory. -->
-                                <exclude>.repository/</exclude>
-                                <exclude>**/.settings/*</exclude>
-                                <exclude>**/.classpath</exclude>
-                                <exclude>**/.project</exclude>
-                                <exclude>**/target/**</exclude>
-                                <exclude>**/*.log</exclude>
-                                <exclude>CODE_OF_CONDUCT.md</exclude>
-                                <exclude>.codecov.yml</exclude>
-                                <exclude>.travis.yml</exclude>
-                                <exclude>PULL_REQUEST_TEMPLATE.md</exclude>
-                                <exclude>CONTRIBUTING.md</exclude>
-                                <exclude>README.md</exclude>
-                                <exclude>**/codestyle/*</exclude>
-                                <exclude>**/resources/META-INF/**</exclude>
-                                <exclude>**/webapp/swagger/**</exclude>
-                                <exclude>**/org/apache/dubbo/samples/rpc/nativethrift/api/DemoService.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>checkstyle</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>${maven_checkstyle_version}</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.puppycrawl.tools</groupId>
-                                <artifactId>checkstyle</artifactId>
-                                <version>8.9</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>checkstyle-validation</id>
-                                <phase>validate</phase>
-                                <configuration>
-                                    <configLocation>../codestyle/checkstyle.xml</configLocation>
-                                    <suppressionsLocation>../codestyle/checkstyle-suppressions.xml</suppressionsLocation>
-                                    <encoding>UTF-8</encoding>
-                                    <consoleOutput>true</consoleOutput>
-                                    <failOnViolation>true</failOnViolation>
-                                </configuration>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/AnnotationConsumer.java b/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/AnnotationConsumer.java
deleted file mode 100644
index f28f6bc..0000000
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/AnnotationConsumer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.dubbo.samples.merge;
-
-//import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo;
-
-import org.apache.dubbo.common.Constants;
-import org.apache.dubbo.config.ApplicationConfig;
-import org.apache.dubbo.rpc.RpcContext;
-import org.apache.dubbo.samples.merge.api.MergeService;
-
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.alibaba.dubbo.common.Constants.TAG_KEY;
-
-/**
- * CallbackConsumer
- */
-public class AnnotationConsumer {
-
-    public static void main(String[] args) throws Exception {
-        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class);
-        context.start();
-        MergeService mergeService = (MergeService) context.getBean("mergeService");
-        for (int i = 0; i < Integer.MAX_VALUE; i++) {
-            try {
-                RpcContext.getContext().setAttachment(TAG_KEY, "vvvttt");
-                List<String> result = mergeService.mergeResult();
-                System.out.println("(" + i + ") " + result);
-                Thread.sleep(1000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @Configuration
-    @ImportResource("spring/merge-consumer2.xml")
-    static public class ConsumerConfiguration {
-        @Bean
-        public ApplicationConfig applicationConfig() {
-            ApplicationConfig applicationConfig = new ApplicationConfig();
-            applicationConfig.setName("consumer-book6");
-            applicationConfig.setQosEnable(false);
-            Map<String,String> parameters = new HashMap<>();
-            parameters.put(Constants.ROUTER_KEY, "tag");
-            applicationConfig.setParameters(parameters);
-            return applicationConfig;
-        }
-    }
-
-}
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/EmbeddedZooKeeper.java b/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/EmbeddedZooKeeper.java
deleted file mode 100644
index 30edfc0..0000000
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/EmbeddedZooKeeper.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dubbo.samples.merge;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.Properties;
-import java.util.UUID;
-
-import org.apache.zookeeper.server.ServerConfig;
-import org.apache.zookeeper.server.ZooKeeperServerMain;
-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.SmartLifecycle;
-import org.springframework.util.ErrorHandler;
-import org.springframework.util.SocketUtils;
-
-/**
- * from: https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java
- *
- * Helper class to start an embedded instance of standalone (non clustered) ZooKeeper.
- *
- * NOTE: at least an external standalone server (if not an ensemble) are recommended, even for
- * {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication}
- *
- * @author Patrick Peralta
- * @author Mark Fisher
- * @author David Turanski
- */
-public class EmbeddedZooKeeper implements SmartLifecycle {
-
-    /**
-     * Logger.
-     */
-    private static final Logger logger = LoggerFactory.getLogger(EmbeddedZooKeeper.class);
-
-    /**
-     * ZooKeeper client port. This will be determined dynamically upon startup.
-     */
-    private final int clientPort;
-
-    /**
-     * Whether to auto-start. Default is true.
-     */
-    private boolean autoStartup = true;
-
-    /**
-     * Lifecycle phase. Default is 0.
-     */
-    private int phase = 0;
-
-    /**
-     * Thread for running the ZooKeeper server.
-     */
-    private volatile Thread zkServerThread;
-
-    /**
-     * ZooKeeper server.
-     */
-    private volatile ZooKeeperServerMain zkServer;
-
-    /**
-     * {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread.
-     */
-    private ErrorHandler errorHandler;
-
-    private boolean daemon = true;
-
-    /**
-     * Construct an EmbeddedZooKeeper with a random port.
-     */
-    public EmbeddedZooKeeper() {
-        clientPort = SocketUtils.findAvailableTcpPort();
-    }
-
-    /**
-     * Construct an EmbeddedZooKeeper with the provided port.
-     *
-     * @param clientPort  port for ZooKeeper server to bind to
-     */
-    public EmbeddedZooKeeper(int clientPort, boolean daemon) {
-        this.clientPort = clientPort;
-        this.daemon = daemon;
-    }
-
-    /**
-     * Returns the port that clients should use to connect to this embedded server.
-     *
-     * @return dynamically determined client port
-     */
-    public int getClientPort() {
-        return this.clientPort;
-    }
-
-    /**
-     * Specify whether to start automatically. Default is true.
-     *
-     * @param autoStartup whether to start automatically
-     */
-    public void setAutoStartup(boolean autoStartup) {
-        this.autoStartup = autoStartup;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isAutoStartup() {
-        return this.autoStartup;
-    }
-
-    /**
-     * Specify the lifecycle phase for the embedded server.
-     *
-     * @param phase the lifecycle phase
-     */
-    public void setPhase(int phase) {
-        this.phase = phase;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getPhase() {
-        return this.phase;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isRunning() {
-        return (zkServerThread != null);
-    }
-
-    /**
-     * Start the ZooKeeper server in a background thread.
-     * <p>
-     * Register an error handler via {@link #setErrorHandler} in order to handle
-     * any exceptions thrown during startup or execution.
-     */
-    @Override
-    public synchronized void start() {
-        if (zkServerThread == null) {
-            zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper Server Starter");
-            zkServerThread.setDaemon(daemon);
-            zkServerThread.start();
-        }
-    }
-
-    /**
-     * Shutdown the ZooKeeper server.
-     */
-    @Override
-    public synchronized void stop() {
-        if (zkServerThread != null) {
-            // The shutdown method is protected...thus this hack to invoke it.
-            // This will log an exception on shutdown; see
-            // https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for details.
-            try {
-                Method shutdown = ZooKeeperServerMain.class.getDeclaredMethod("shutdown");
-                shutdown.setAccessible(true);
-                shutdown.invoke(zkServer);
-            }
-
-            catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-
-            // It is expected that the thread will exit after
-            // the server is shutdown; this will block until
-            // the shutdown is complete.
-            try {
-                zkServerThread.join(5000);
-                zkServerThread = null;
-            }
-            catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                logger.warn("Interrupted while waiting for embedded ZooKeeper to exit");
-                // abandoning zk thread
-                zkServerThread = null;
-            }
-        }
-    }
-
-    /**
-     * Stop the server if running and invoke the callback when complete.
-     */
-    @Override
-    public void stop(Runnable callback) {
-        stop();
-        callback.run();
-    }
-
-    /**
-     * Provide an {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. If none
-     * is provided, only error-level logging will occur.
-     *
-     * @param errorHandler the {@link ErrorHandler} to be invoked
-     */
-    public void setErrorHandler(ErrorHandler errorHandler) {
-        this.errorHandler = errorHandler;
-    }
-
-    /**
-     * Runnable implementation that starts the ZooKeeper server.
-     */
-    private class ServerRunnable implements Runnable {
-
-        @Override
-        public void run() {
-            try {
-                Properties properties = new Properties();
-                File file = new File(System.getProperty("java.io.tmpdir")
-                    + File.separator + UUID.randomUUID());
-                file.deleteOnExit();
-                properties.setProperty("dataDir", file.getAbsolutePath());
-                properties.setProperty("clientPort", String.valueOf(clientPort));
-
-                QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
-                quorumPeerConfig.parseProperties(properties);
-
-                zkServer = new ZooKeeperServerMain();
-                ServerConfig configuration = new ServerConfig();
-                configuration.readFrom(quorumPeerConfig);
-
-                zkServer.runFromConfig(configuration);
-            }
-            catch (Exception e) {
-                if (errorHandler != null) {
-                    errorHandler.handleError(e);
-                }
-                else {
-                    logger.error("Exception running embedded ZooKeeper", e);
-                }
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java b/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java
deleted file mode 100644
index ecb17d1..0000000
--- a/dubbo-samples-merge/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.dubbo.samples.merge;
-
-import java.util.List;
-
-import org.apache.dubbo.samples.merge.api.MergeService;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * MergeConsumer
- */
-public class MergeConsumer {
-
-    public static void main(String[] args) throws Exception {
-        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/merge-consumer.xml"});
-        context.start();
-        MergeService mergeService = (MergeService) context.getBean("mergeService");
-        for (int i = 0; i < Integer.MAX_VALUE; i++) {
-            try {
-                List<String> result = mergeService.mergeResult();
-                System.out.println("(" + i + ") " + result);
-                Thread.sleep(1000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-}
diff --git a/dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml b/dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml
deleted file mode 100644
index 21c1401..0000000
--- a/dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<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"
-       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">
-
-    <dubbo:application name="merge-consumer"/>
-
-    <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
-
-    <dubbo:reference id="mergeService" interface="org.apache.dubbo.samples.merge.api.MergeService" group="*" merger="true"/>
-
-</beans>
diff --git a/dubbo-samples-merge/src/main/resources/spring/merge-consumer2.xml b/dubbo-samples-merge/src/main/resources/spring/merge-consumer2.xml
deleted file mode 100644
index 5739ddf..0000000
--- a/dubbo-samples-merge/src/main/resources/spring/merge-consumer2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<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"
-       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">
-
-    <dubbo:application name="merge-consumer2"/>
-
-    <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
-
-    <dubbo:reference id="mergeService" interface="org.apache.dubbo.samples.merge.api.MergeService"
-                     group="merge2,merge3"/>
-
-</beans>
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org


Mime
View raw message