This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch dev-metadata in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 2f9dcf1eb5916c5ae569599df867fa08b04845be Merge: 413ed71 37c22c7 Author: ken.lj <[email protected]> AuthorDate: Wed Oct 24 10:00:02 2018 +0800 Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata dubbo-bom/pom.xml | 6 +- .../java/org/apache/dubbo/common/Constants.java | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- .../dubbo/config/AbstractInterfaceConfig.java | 10 +-- .../org/apache/dubbo/config/ReferenceConfig.java | 8 +- .../org/apache/dubbo/config/ServiceConfig.java | 8 +- .../apache/dubbo/config/spring/ReferenceBean.java | 2 +- .../apache/dubbo/config/spring/ServiceBean.java | 2 +- .../src/main/resources/META-INF/compat/dubbo.xsd | 2 +- .../src/main/resources/META-INF/dubbo.xsd | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- .../META-INF/spring/dubbo-demo-consumer.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 4 +- .../dubbo-metadata-report-api}/pom.xml | 8 +- .../integration/MetadataReportService.java | 37 +++++---- .../dubbo/metadata}/metadata/MethodDescriptor.java | 2 +- .../metadata}/metadata/ServiceDescriptor.java | 2 +- .../dubbo/metadata}/metadata/TypeDescriptor.java | 2 +- .../metadata/builder/ArrayTypeBuilder.java | 4 +- .../metadata/builder/CollectionTypeBuilder.java | 4 +- .../metadata/builder/DefaultTypeBuilder.java | 4 +- .../metadata/builder/EnumTypeBuilder.java | 4 +- .../metadata}/metadata/builder/MapTypeBuilder.java | 4 +- .../metadata/builder/ServiceDescriptorBuilder.java | 8 +- .../metadata}/metadata/builder/TypeBuilder.java | 4 +- .../metadata/builder/TypeDescriptorBuilder.java | 4 +- .../dubbo/metadata/store/MetadataReport.java | 4 +- .../metadata/store/MetadataReportFactory.java | 6 +- .../metadata/support/AbstractMetadataReport.java | 33 ++++++-- .../support/AbstractMetadataReportFactory.java | 36 ++++---- .../integration/InterfaceNameTestService.java | 2 +- .../integration/InterfaceNameTestService2.java | 2 +- .../integration/MetadataReportServiceTest.java | 96 +++++++++++----------- .../metadata/builder/ArrayTypeBuilderTest.java | 12 ++- .../builder/CollectionTypeBuilderTest.java | 11 ++- .../metadata}/metadata/builder/ComplexEnum.java | 2 +- .../metadata}/metadata/builder/ComplexObject.java | 2 +- .../metadata/builder/DefaultTypeBuilderTest.java | 6 +- .../metadata/builder/EnumTypeBuilderTest.java | 15 ++-- .../metadata/builder/MapTypeBuilderTest.java | 11 ++- .../builder/ServiceDescriptorBuilderTest.java | 4 +- .../metadata}/metadata/builder/SingleEnum.java | 2 +- .../metadata}/metadata/builder/TestService.java | 2 +- .../builder/TypeDescriptorBuilderTest.java | 8 +- .../store/test/JTestMetadataReport4Test.java | 14 ++-- .../test/JTestMetadataReportFactory4Test.java | 12 +-- .../support/AbstractMetadataReportFactoryTest.java | 36 ++++---- .../support/AbstractMetadataReportTest.java | 31 ++++--- ...che.dubbo.servicedata.store.ServiceStoreFactory | 1 + .../dubbo-metadata-report-redis}/pom.xml | 6 +- .../metadata/store/redis/RedisMetadataReport.java | 35 ++------ .../store/redis/RedisMetadataReportFactory.java | 12 +-- ...che.dubbo.servicedata.store.ServiceStoreFactory | 1 + .../store/redis/RedisMetadataReportTest.java | 33 +++----- .../dubbo-metadata-report-zookeeper}/pom.xml | 6 +- .../store/zookeeper/ZookeeperMetadataReport.java | 14 ++-- .../zookeeper/ZookeeperMetadataReportFactory.java | 12 +-- ...che.dubbo.servicedata.store.ServiceStoreFactory | 1 + .../zookeeper/ZookeeperMetadataReportTest.java | 45 +++++----- .../pom.xml | 8 +- ...che.dubbo.servicedata.store.ServiceStoreFactory | 1 - ...che.dubbo.servicedata.store.ServiceStoreFactory | 1 - ...che.dubbo.servicedata.store.ServiceStoreFactory | 1 - pom.xml | 2 +- 64 files changed, 331 insertions(+), 334 deletions(-) diff --cc dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml index 97a8031,578b324..167e0df --- a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml +++ b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml @@@ -30,10 -30,10 +30,10 @@@ </dubbo:application> <!-- use multicast registry center to discover service --> - <dubbo:registry address="zookeeper://127.0.0.1:2181" default="true"/> - <dubbo:registry address="zookeeper://127.0.0.1:2181"/> + <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181" default="true"/> + <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181"/> - <dubbo:servicestore address="zookeeper://127.0.0.1:2181"/> + <dubbo:servicestore address="redis://127.0.0.1:6379"/> <!-- generate proxy for the remote service, then demoService can be used in the same way as the local regular interface -->
