From 922feab7ffa1571a9c6cc23496ecb624a1dd5ed3 Mon Sep 17 00:00:00 2001
From: xujingfeng <jingfeng.xjf@alibaba-inc.com>
Date: Mon, 6 May 2019 17:33:42 +0800
Subject: [PATCH] 1. rename dubbo moudle; 2. fix the dependency
---
internal-dubbo/dubbo-all/pom.xml | 2 +-
internal-dubbo/dubbo-bom/pom.xml | 2 +-
internal-dubbo/dubbo-cluster/pom.xml | 2 +-
internal-dubbo/dubbo-common/pom.xml | 2 +-
internal-dubbo/dubbo-compatible/pom.xml | 2 +-
internal-dubbo/dubbo-config/pom.xml | 2 +-
internal-dubbo/dubbo-configcenter/pom.xml | 2 +-
internal-dubbo/dubbo-container/pom.xml | 2 +-
.../apache/dubbo/demo/consumer/Application.java | 14 +++++++++++---
internal-dubbo/dubbo-demo/pom.xml | 2 +-
internal-dubbo/dubbo-dependencies/pom.xml | 2 +-
internal-dubbo/dubbo-distribution/pom.xml | 2 +-
internal-dubbo/dubbo-filter/pom.xml | 2 +-
internal-dubbo/dubbo-metadata-report/pom.xml | 2 +-
internal-dubbo/dubbo-monitor/pom.xml | 2 +-
internal-dubbo/dubbo-plugin/pom.xml | 2 +-
internal-dubbo/dubbo-registry/pom.xml | 2 +-
internal-dubbo/dubbo-remoting/pom.xml | 2 +-
internal-dubbo/dubbo-rpc/pom.xml | 2 +-
internal-dubbo/dubbo-serialization/pom.xml | 2 +-
internal-dubbo/pom.xml | 2 +-
internal-gateway/pom.xml | 2 +-
internal-service/pom.xml | 3 +--
.../aliware/tianchi/MyDirectServiceConsumer.java | 12 ++++++++++++
.../resources/dubbo-direct-service-consumer.xml | 0
pom.xml | 7 +++----
26 files changed, 48 insertions(+), 30 deletions(-)
create mode 100644 internal-service/service-consumer/src/main/java/com/aliware/tianchi/MyDirectServiceConsumer.java
create mode 100644 internal-service/service-consumer/src/main/resources/dubbo-direct-service-consumer.xml
diff --git a/internal-dubbo/dubbo-all/pom.xml b/internal-dubbo/dubbo-all/pom.xml
index cceac62..ffd5a82 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 2a6ef72..2074afc 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 ff59682..cd73e89 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 98ecc9b..a43316c 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 3826189..3cd0d10 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 bb8518f..202d5c4 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 c6fb983..ca0cbe1 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 b61d3cf..daaa911 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 3f020b4..b91f73e 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 d46e2d9..acee439 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 27cea95..6134ab3 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 f830aa4..399d406 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 efb95ab..36e75b0 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 3cb254a..4aca2fb 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 a6d21a0..13c44b0 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 44b6fe0..f140f01 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 962148b..a62b5ab 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 c95fbfa..9513daf 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 20e8e8d..52e607b 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 97b986d..a7332ab 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 adf2a3d..c519ab9 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 dfdbf98..bb98b5d 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 851b006..11eb2df 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 0000000..82826cb
--- /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 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index 4811bf9..33f6073 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>
--
GitLab