Skip to content

Commit

Permalink
unify metadata and configcenter implementations (#4360)
Browse files Browse the repository at this point in the history 
* Polish apache/incubator-dubbo/#4096 : To add new module for Dubbo Event

* Polish #3942 : Dubbo Cloud Native: To Add Service registration and discovery abstract

* Polish #3946 : Dubbo Cloud Native : To Add Dubbo metadata service

* Polish #4093 : To add exported and unexported events for ServiceConfig

* Polish #3984 : Add Service registration and discovery implementation for Zookeeper

* Polish #4104 : To add initialized and destroyed events for ReferenceConfig

* Polish #3946 : Refactor Dubbo metadata service

* Polish #3946 : To Add MetadataServiceExporter into dubbo-config-api

* Update ${project.parent.version}

* Polish #3946 : Refactor Dubbo metadata service

* Polish apache/incubator-dubbo/#4096 : Remove the duplicated word

* Polish #4119 : DynamicConfiguration adds the publish and multiple get configuration methods

* Polish #4120 : To add DynamicConfiguration implementation for Zookeeper

* Polish #4121 : Add the mapping from service metadata to service name

* Polish apache/incubator-dubbo/#3790 : Dependencies with no license

* Polish #4071 : @reference can't match the local @service beans

* Update version to be 2.7.3

* Polish #3946 : Add thread-safe and performance optimization

* Polish #3946 : Add thread-safe and performance optimization

* Polish #3946 : Add thread-safe and performance optimization

* Update 2.7.3

* Polish #4104 : To add more events for dubbo-config-api

* Polish #3942 : Dubbo Cloud Native: To Add Service registration and discovery abstract

* Polish #3984 : Add Service registration and discovery implementation for Zookeeper

* Add Bootstrap

* Polish GA

* Polish #4050 : Dubbo Cloud Native : Add a mechanism to upgrade Dubbo services smoothly

* Polish #4093 : To add DubboServiceDestroyedEvent

* Polish #4050 : Dubbo Cloud Native : Reactor

* Polish #3946 : Remove SPI

* Polish #4265 : [Feature] Dubbo Cloud Native - Add Bootstrap

* Polish #4265 : [Feature] Dubbo Cloud Native - Add Bootstrap

* Polish #4265 : Add test dependencies

* Polish /#3942 : Refactor implementation

* Polish #3984 : Refactor

* Add Nacos implementation

* Polish #3984 : Add Nacos implementation

* Polish #4268 : Dubbo Event - To support Generic event type handle

* Polish #4268 : Update JavaDoc

* Polish #4268 : Add GenericEventListener implementation

* add cache for MetadataServiceProxy

* support multiple metadata and configcenter

* unify metadata implementation

* add missed files

* remove duplicated files

* add new SPIs and modules to dubbo-all pom.
  • Loading branch information
@chickenlj @mercyblitz
chickenlj authored and mercyblitz committed Jun 26, 2019
1 parent 5fb8dc0 commit 5008e0f
Show file tree
Hide file tree
Showing 218 changed files with 1,845 additions and 1,367 deletions.
42 changes: 17 additions & 25 deletions dubbo-all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,6 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
Expand Down Expand Up @@ -466,7 +459,7 @@
<!-- metadata -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-api</artifactId>
<artifactId>dubbo-metadata-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
Expand Down Expand Up @@ -516,14 +509,6 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>

<!-- Transitive dependencies -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -640,26 +625,21 @@
<include>org.apache.dubbo:dubbo-serialization-protostuff</include>
<include>org.apache.dubbo:dubbo-serialization-gson</include>
<include>org.apache.dubbo:dubbo-serialization-googlePb</include>
<include>org.apache.dubbo:dubbo-configcenter-api</include>
<include>org.apache.dubbo:dubbo-configcenter-definition</include>
<include>org.apache.dubbo:dubbo-configcenter-apollo</include>
<include>org.apache.dubbo:dubbo-configcenter-zookeeper</include>
<include>org.apache.dubbo:dubbo-configcenter-consul</include>
<include>org.apache.dubbo:dubbo-configcenter-etcd</include>
<include>org.apache.dubbo:dubbo-configcenter-nacos</include>
<include>org.apache.dubbo:dubbo-metadata-report-api</include>
<include>org.apache.dubbo:dubbo-metadata-definition</include>
<include>org.apache.dubbo:dubbo-metadata-api</include>
<include>org.apache.dubbo:dubbo-metadata-report-redis</include>
<include>org.apache.dubbo:dubbo-metadata-report-zookeeper</include>
<include>org.apache.dubbo:dubbo-metadata-report-consul</include>
<include>org.apache.dubbo:dubbo-metadata-report-etcd</include>
<include>org.apache.dubbo:dubbo-metadata-report-nacos</include>
<include>org.apache.dubbo:dubbo-serialization-native-hession</include>
<include>org.apache.dubbo:dubbo-rpc-native-thrift</include>

<!-- 2.7.3 new modules -->
<include>org.apache.dubbo:dubbo-event</include>
<include>org.apache.dubbo:dubbo-metadata</include>
</includes>
</artifactSet>
<transformers>
Expand Down Expand Up @@ -778,11 +758,11 @@
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfigurationFactory
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.config.configcenter.DynamicConfigurationFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.store.MetadataReportFactory
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
</resource>
</transformer>
<!-- @since 2.7.3 -->
Expand All @@ -795,7 +775,19 @@
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.LocalMetadataService
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.WritableMetadataService
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.ServiceNameMapping
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.registry.client.metadata.MetadataServiceProxyFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
</resource>
</transformer>
</transformers>
Expand Down
23 changes: 13 additions & 10 deletions dubbo-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,22 @@
<artifactId>dubbo-compatible</artifactId>
<version>${project.version}</version>
</dependency>
<!-- metadata -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-definition</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
Expand All @@ -392,11 +403,8 @@
<artifactId>dubbo-metadata-report-nacos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-api</artifactId>
<version>${project.version}</version>
</dependency>

<!-- config-center -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
Expand All @@ -422,11 +430,6 @@
<artifactId>dubbo-configcenter-nacos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-definition</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
13 changes: 7 additions & 6 deletions dubbo-bootstrap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
Expand Down Expand Up @@ -83,12 +90,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

</project>
Loading

0 comments on commit 5008e0f

Please sign in to comment.