diff --git a/internal-dubbo/dubbo-all/pom.xml b/internal-dubbo/dubbo-all/pom.xml index cceac62cc824e533679370bb3619aefb1ac71484..ffd5a82d765f4ceba55eb59994056a7528394b8a 100644 --- a/internal-dubbo/dubbo-all/pom.xml +++ b/internal-dubbo/dubbo-all/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/internal-dubbo/dubbo-bom/pom.xml b/internal-dubbo/dubbo-bom/pom.xml index 2a6ef723e0d4cc0c3b354ca971ea3c00793d481c..2074afcdd8f0f4121054c14bba1f08341132e754 100644 --- a/internal-dubbo/dubbo-bom/pom.xml +++ b/internal-dubbo/dubbo-bom/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> diff --git a/internal-dubbo/dubbo-cluster/pom.xml b/internal-dubbo/dubbo-cluster/pom.xml index ff59682d84759cc7aec38fee70bd826f3edfbdb7..cd73e8994974e8c07344b68161fe9dfabee3a019 100644 --- a/internal-dubbo/dubbo-cluster/pom.xml +++ b/internal-dubbo/dubbo-cluster/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-cluster</artifactId> diff --git a/internal-dubbo/dubbo-common/pom.xml b/internal-dubbo/dubbo-common/pom.xml index 98ecc9b87b264228f77b6473880ca9e241f040ba..a43316c7f17cebc9c5c758b293ffccffacf9207f 100644 --- a/internal-dubbo/dubbo-common/pom.xml +++ b/internal-dubbo/dubbo-common/pom.xml @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-common</artifactId> diff --git a/internal-dubbo/dubbo-compatible/pom.xml b/internal-dubbo/dubbo-compatible/pom.xml index 3826189591a32d85ea79197d61951089e2c1ab42..3cd0d10a7655be60911ba83248d3fdb4c24bce54 100644 --- a/internal-dubbo/dubbo-compatible/pom.xml +++ b/internal-dubbo/dubbo-compatible/pom.xml @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-compatible</artifactId> diff --git a/internal-dubbo/dubbo-config/pom.xml b/internal-dubbo/dubbo-config/pom.xml index bb8518fea9560026633c041c5a267a789acb7818..202d5c4019d66b9c758bc6fe362a373cd1d1035e 100644 --- a/internal-dubbo/dubbo-config/pom.xml +++ b/internal-dubbo/dubbo-config/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-config</artifactId> diff --git a/internal-dubbo/dubbo-configcenter/pom.xml b/internal-dubbo/dubbo-configcenter/pom.xml index c6fb983bb72a3a84e4b8296657d9373a6e22372a..ca0cbe1b4d88211e128c616a9e930ab41f069f6e 100644 --- a/internal-dubbo/dubbo-configcenter/pom.xml +++ b/internal-dubbo/dubbo-configcenter/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-configcenter</artifactId> diff --git a/internal-dubbo/dubbo-container/pom.xml b/internal-dubbo/dubbo-container/pom.xml index b61d3cf1b9096bbf8ba17f6f62f02fc99030a17f..daaa911d65cd0402dc976148ae005b5915d66b22 100644 --- a/internal-dubbo/dubbo-container/pom.xml +++ b/internal-dubbo/dubbo-container/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-container</artifactId> diff --git a/internal-dubbo/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java b/internal-dubbo/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java index 3f020b45c6d6cb63041618ffe7200058cd4c7293..b91f73e3338aee1aa1b8b4b7ad5b5a6318224caa 100644 --- a/internal-dubbo/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java +++ b/internal-dubbo/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java @@ -28,13 +28,21 @@ public class Application { * In order to make sure multicast registry works, need to specify '-Djava.net.preferIPv4Stack=true' before * launch the application */ - public static void main(String[] args) { + public static void main(String[] args) throws InterruptedException { ReferenceConfig<DemoService> reference = new ReferenceConfig<>(); reference.setApplication(new ApplicationConfig("dubbo-demo-api-consumer")); reference.setRegistry(new RegistryConfig("zookeeper://127.0.0.1:2181")); reference.setInterface(DemoService.class); DemoService service = reference.get(); - String message = service.sayHello("dubbo"); - System.out.println(message); + for (; ; ) { + try { + Thread.sleep(1000); + String message = service.sayHello("dubbo"); + System.out.println(message); + } catch (Exception e) { + e.printStackTrace(); + } + } + } } diff --git a/internal-dubbo/dubbo-demo/pom.xml b/internal-dubbo/dubbo-demo/pom.xml index d46e2d99df944c68e59fd3687f587f8760abbd7f..acee439c06191313ebe0eef4c8db21ee43b4266b 100644 --- a/internal-dubbo/dubbo-demo/pom.xml +++ b/internal-dubbo/dubbo-demo/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-demo</artifactId> diff --git a/internal-dubbo/dubbo-dependencies/pom.xml b/internal-dubbo/dubbo-dependencies/pom.xml index 27cea95f42eb152e70904ef4a148b1b3a3400b10..6134ab32722bd30b9771d55227f84ef8a0037d2d 100644 --- a/internal-dubbo/dubbo-dependencies/pom.xml +++ b/internal-dubbo/dubbo-dependencies/pom.xml @@ -17,7 +17,7 @@ <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-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <groupId>org.apache.dubbo</groupId> <version>${revision}</version> </parent> diff --git a/internal-dubbo/dubbo-distribution/pom.xml b/internal-dubbo/dubbo-distribution/pom.xml index f830aa4379cb10b3d9033e4f339afb33455c54f6..399d40607f1c6c008ac29b28ccda5905fb680770 100644 --- a/internal-dubbo/dubbo-distribution/pom.xml +++ b/internal-dubbo/dubbo-distribution/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-distribution</artifactId> diff --git a/internal-dubbo/dubbo-filter/pom.xml b/internal-dubbo/dubbo-filter/pom.xml index efb95ab8cb0efc790110612ce3ae85964f1dff78..36e75b0ea9f1581c98133a9e30e7170f4bdd7598 100644 --- a/internal-dubbo/dubbo-filter/pom.xml +++ b/internal-dubbo/dubbo-filter/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-filter</artifactId> diff --git a/internal-dubbo/dubbo-metadata-report/pom.xml b/internal-dubbo/dubbo-metadata-report/pom.xml index 3cb254afb961dd65b543e13655107493cbfb55de..4aca2fb0d7ee009834e2767f4ac0cd99f0f14e42 100644 --- a/internal-dubbo/dubbo-metadata-report/pom.xml +++ b/internal-dubbo/dubbo-metadata-report/pom.xml @@ -16,7 +16,7 @@ --> <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-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <groupId>org.apache.dubbo</groupId> <version>${revision}</version> </parent> diff --git a/internal-dubbo/dubbo-monitor/pom.xml b/internal-dubbo/dubbo-monitor/pom.xml index a6d21a0a55647a61982a5592b14b1c149ab384c3..13c44b01ba06462c01f2959ab829b2f9d1114d34 100644 --- a/internal-dubbo/dubbo-monitor/pom.xml +++ b/internal-dubbo/dubbo-monitor/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-monitor</artifactId> diff --git a/internal-dubbo/dubbo-plugin/pom.xml b/internal-dubbo/dubbo-plugin/pom.xml index 44b6fe0dafe8274584b46a1ab34d8cfbd6e81456..f140f0166bca9987111311bb997e3e73b6641888 100644 --- a/internal-dubbo/dubbo-plugin/pom.xml +++ b/internal-dubbo/dubbo-plugin/pom.xml @@ -16,7 +16,7 @@ --> <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-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <groupId>org.apache.dubbo</groupId> <version>${revision}</version> </parent> diff --git a/internal-dubbo/dubbo-registry/pom.xml b/internal-dubbo/dubbo-registry/pom.xml index 962148b354a9c6d6982aeea8000387e7893d2f56..a62b5abeef3b94c84cb91199466541e2dd3cb2e8 100644 --- a/internal-dubbo/dubbo-registry/pom.xml +++ b/internal-dubbo/dubbo-registry/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-registry</artifactId> diff --git a/internal-dubbo/dubbo-remoting/pom.xml b/internal-dubbo/dubbo-remoting/pom.xml index c95fbfad2e65702b4d6a97205d77d726ba6c08b5..9513dafc9ef1369ef9a9b42cd05ea3c0ed5cdafa 100644 --- a/internal-dubbo/dubbo-remoting/pom.xml +++ b/internal-dubbo/dubbo-remoting/pom.xml @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-remoting</artifactId> diff --git a/internal-dubbo/dubbo-rpc/pom.xml b/internal-dubbo/dubbo-rpc/pom.xml index 20e8e8d13216cb8b1cec5d34572b3b2954c9b366..52e607bf5bad7377d074cb15d321394d251de432 100644 --- a/internal-dubbo/dubbo-rpc/pom.xml +++ b/internal-dubbo/dubbo-rpc/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-rpc</artifactId> diff --git a/internal-dubbo/dubbo-serialization/pom.xml b/internal-dubbo/dubbo-serialization/pom.xml index 97b986d1b85e9189c1a5ffe7944e1baab1fac44b..a7332ab84c0d4b549f9d8733ae35d4f759846559 100644 --- a/internal-dubbo/dubbo-serialization/pom.xml +++ b/internal-dubbo/dubbo-serialization/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> </parent> <artifactId>dubbo-serialization</artifactId> diff --git a/internal-dubbo/pom.xml b/internal-dubbo/pom.xml index adf2a3d3000079c145c6ae48591c968490cbd2b2..c519ab9e76779c926cef486d6a1a0f1b2a5cf909 100644 --- a/internal-dubbo/pom.xml +++ b/internal-dubbo/pom.xml @@ -31,7 +31,7 @@ </parent> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>internal-dubbo</artifactId> <version>${revision}</version> <packaging>pom</packaging> diff --git a/internal-gateway/pom.xml b/internal-gateway/pom.xml index dfdbf980700f7d5a644f6c22eff5a922d3d48d3d..bb98b5d664b02d54d5df6d1b7323d48d359a0e3d 100644 --- a/internal-gateway/pom.xml +++ b/internal-gateway/pom.xml @@ -13,7 +13,7 @@ <dependencies> <dependency> - <groupId>com.aliware.tianchi</groupId> + <groupId>org.apache.dubbo</groupId> <artifactId>internal-dubbo</artifactId> </dependency> </dependencies> diff --git a/internal-service/pom.xml b/internal-service/pom.xml index 851b0068e6fb533589424f0a8fe83c21ace88823..11eb2dff1b01b03668634bdcb39055f159a88607 100644 --- a/internal-service/pom.xml +++ b/internal-service/pom.xml @@ -19,9 +19,8 @@ <dependencies> <dependency> - <groupId>com.aliware.tianchi</groupId> + <groupId>org.apache.dubbo</groupId> <artifactId>internal-dubbo</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>com.aliware.tianchi</groupId> diff --git a/internal-service/service-consumer/src/main/java/com/aliware/tianchi/MyDirectServiceConsumer.java b/internal-service/service-consumer/src/main/java/com/aliware/tianchi/MyDirectServiceConsumer.java new file mode 100644 index 0000000000000000000000000000000000000000..82826cb6eba319c728f5fea7bba41be001b45889 --- /dev/null +++ b/internal-service/service-consumer/src/main/java/com/aliware/tianchi/MyDirectServiceConsumer.java @@ -0,0 +1,12 @@ +package com.aliware.tianchi; + +import java.io.IOException; + +/** + * @author daofeng.xjf + */ +public class MyDirectServiceConsumer { + public static void main(String[] args) throws IOException { + + } +} diff --git a/internal-service/service-consumer/src/main/resources/dubbo-direct-service-consumer.xml b/internal-service/service-consumer/src/main/resources/dubbo-direct-service-consumer.xml new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pom.xml b/pom.xml index 4811bf91a5448d23ae53aa15eb85cba56dd13812..33f6073bd1cef1d0a8fb03691b433b74c2a12196 100644 --- a/pom.xml +++ b/pom.xml @@ -13,9 +13,9 @@ <dependencies> <!--internal start--> <dependency> - <groupId>com.aliware.tianchi</groupId> + <groupId>org.apache.dubbo</groupId> <artifactId>internal-dubbo</artifactId> - <version>${project.version}</version> + <version>2.7.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.aliware.tianchi</groupId> @@ -71,8 +71,7 @@ </plugins> </build> <modules> - <!--<module>internal-dubbo</module>--> - <module>dubbo-parent</module> + <module>internal-dubbo</module> <module>internal-gateway</module> <module>internal-service</module> <module>bootstrap</module>