[incubator-dubbo] 03/03: Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata

2018-11-14 Thread liujun 
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 d11b8762ba3c99c42ffc863b8225a153595ec47f
Merge: e3916ef 21b4334
Author: ken.lj 
AuthorDate: Thu Nov 15 11:29:41 2018 +0800

Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo 
into dev-metadata

 .../java/org/apache/dubbo/common/Constants.java|  6 +-
 .../src/main/java/org/apache/dubbo/common/URL.java |  8 +-
 .../dubbo/config/RegistryDataConfigTest.java   | 87 ++
 .../dubbo/config/AbstractInterfaceConfig.java  |  5 +-
 .../apache/dubbo/config/RegistryDataConfig.java|  2 +-
 .../annotation/DubboConfigConfiguration.java   |  6 +-
 .../src/main/resources/META-INF/compat/dubbo.xsd   | 20 ++---
 .../src/main/resources/META-INF/dubbo.xsd  | 20 ++---
 .../META-INF/spring/dubbo-demo-provider.xml|  2 +-
 .../registry/integration/RegistryProtocol.java | 25 ++-
 .../dubbo/registry/dubbo/RegistryProtocolTest.java | 11 ---
 .../registry/integration/RegistryProtocolTest.java | 23 ++
 12 files changed, 156 insertions(+), 59 deletions(-)

diff --cc 
dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
index 566a7c7,5f0d473..f1e28d2
--- 
a/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
+++ 
b/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
@@@ -25,10 -25,10 +25,10 @@@
  
  
  
- 
+ 
  
  
 -

[incubator-dubbo] 03/03: Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata

2018-11-06 Thread liujun 
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 d85550a5fdba7c75e666e5395454d93a0c82335e
Merge: 22599b9 072b51e
Author: ken.lj 
AuthorDate: Wed Nov 7 10:05:13 2018 +0800

Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo 
into dev-metadata

 dubbo-compatible/pom.xml   |   7 +-
 .../apache/dubbo/generic/GenericServiceTest.java   | 181 -
 .../org/apache/dubbo/service/ComplexObject.java| 282 +
 .../java/org/apache/dubbo/service/DemoService.java |   8 +-
 .../org/apache/dubbo/service/DemoServiceImpl.java  |  15 +-
 .../dubbo/config/AbstractInterfaceConfig.java  |   2 +-
 .../META-INF/spring/dubbo-demo-consumer.xml|   3 +-
 .../META-INF/spring/dubbo-demo-provider.xml|   2 +-
 .../definition/builder/CollectionTypeBuilder.java  |   3 +-
 .../definition/model/FullServiceDefinition.java|   8 +
 .../definition/model/MethodDefinition.java |  18 ++
 .../definition/model/ServiceDefinition.java|  16 ++
 .../metadata/definition/model/TypeDefinition.java  |  18 ++
 .../dubbo/metadata/definition/util/ClassUtils.java |   4 +-
 .../definition/ServiceDefinitionBuildderTest.java  |  81 ++
 .../common/ResultWithRawCollections.java   |   2 +-
 .../metadata/definition/service/ComplexObject.java | 280 
 .../metadata/definition/service/DemoService.java}  |  18 +-
 .../dubbo-metadata-report-api/pom.xml  |   9 +-
 .../identifier/ConsumerMetadataIdentifier.java |   4 +-
 .../metadata/identifier/MetadataIdentifier.java|   5 +-
 .../identifier/ProviderMetadataIdentifier.java |   2 +-
 .../integration/MetadataReportService.java |   1 +
 .../dubbo/metadata/metadata/MethodDescriptor.java  |  54 
 .../dubbo/metadata/metadata/ServiceDescriptor.java |  55 
 .../dubbo/metadata/metadata/TypeDescriptor.java|  65 -
 .../metadata/builder/ArrayTypeBuilder.java |  36 ---
 .../metadata/builder/CollectionTypeBuilder.java|  59 -
 .../metadata/builder/DefaultTypeBuilder.java   | 113 -
 .../metadata/metadata/builder/EnumTypeBuilder.java |  45 
 .../metadata/metadata/builder/MapTypeBuilder.java  |  60 -
 .../metadata/builder/ServiceDescriptorBuilder.java |  71 --
 .../metadata/metadata/builder/TypeBuilder.java |  23 --
 .../metadata/builder/TypeDescriptorBuilder.java|  63 -
 .../metadata/support/AbstractMetadataReport.java   |  13 +-
 .../metadata/integration/RetryTestService.java |   2 +-
 .../metadata/builder/ArrayTypeBuilderTest.java |  89 ---
 .../builder/CollectionTypeBuilderTest.java |  90 ---
 .../metadata/metadata/builder/ComplexEnum.java |  16 --
 .../metadata/metadata/builder/ComplexObject.java   |  37 ---
 .../metadata/builder/DefaultTypeBuilderTest.java   |  64 -
 .../metadata/builder/EnumTypeBuilderTest.java  |  84 --
 .../metadata/builder/MapTypeBuilderTest.java   |  89 ---
 .../builder/ServiceDescriptorBuilderTest.java  |  25 --
 .../metadata/metadata/builder/SingleEnum.java  |   8 -
 .../metadata/metadata/builder/TestService.java |  45 
 .../builder/TypeDescriptorBuilderTest.java | 101 
 .../store/test/JTestMetadataReport4Test.java   |   3 +-
 .../support/AbstractMetadataReportFactoryTest.java |   1 -
 .../support/AbstractMetadataReportTest.java|  11 +-
 .../store/zookeeper/ZookeeperMetadataReport.java   |  10 +-
 .../zookeeper/ZookeeperMetadataReportTest.java |  32 +--
 .../java/org/apache/dubbo/registry/ZKTools.java|   4 +-
 .../dubbo/remoting/zookeeper/ZookeeperClient.java  |   4 +
 .../zookeeper/curator/CuratorZookeeperClient.java  |  40 +++
 .../zookeeper/support/AbstractZookeeperClient.java |  28 ++
 .../zookeeper/zkclient/ZkClientWrapper.java|  15 ++
 .../zkclient/ZkclientZookeeperClient.java  |  25 ++
 .../curator/CuratorZookeeperClientTest.java|  30 ++-
 .../zkclient/ZkclientZookeeperClientTest.java  |  30 ++-
 .../webservice/WebserviceProtocolTest.java |   4 +-
 61 files changed, 1144 insertions(+), 1369 deletions(-)

[incubator-dubbo] 03/03: Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata

2018-10-17 Thread liujun 
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 ab2b7361df36b20647460b1e4865f076de8c4bb7
Merge: 44fb07f 59dd98a
Author: ken.lj 
AuthorDate: Wed Oct 17 14:07:30 2018 +0800

Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo 
into dev-metadata

 .../java/org/apache/dubbo/common/Constants.java|   2 +
 .../src/main/java/org/apache/dubbo/common/URL.java |  10 +-
 .../dubbo/config/AbstractInterfaceConfig.java  |   3 +-
 dubbo-servicedata/dubbo-servicedata-api/pom.xml|  17 +-
 .../integration/ServiceStoreService.java   |  85 --
 .../servicedata/metadata/MethodDescriptor.java |  54 ++
 .../servicedata/metadata/ServiceDescriptor.java|  55 +++
 .../dubbo/servicedata/metadata/TypeDescriptor.java |  65 
 .../metadata/builder/ArrayTypeBuilder.java |  36 
 .../metadata/builder/CollectionTypeBuilder.java|  59 +++
 .../metadata/builder/DefaultTypeBuilder.java   | 113 +
 .../metadata/builder/EnumTypeBuilder.java  |  45 +
 .../metadata/builder/MapTypeBuilder.java   |  60 +++
 .../metadata/builder/ServiceDescriptorBuilder.java |  71 
 .../servicedata/metadata/builder/TypeBuilder.java  |  23 +++
 .../metadata/builder/TypeDescriptorBuilder.java|  63 +++
 .../servicedata/{ => store}/ServiceStore.java  |   2 +-
 .../{ => store}/ServiceStoreFactory.java   |   2 +-
 .../servicedata/support/AbstractServiceStore.java  |   4 +-
 .../support/AbstractServiceStoreFactory.java   |   4 +-
 .../integration/InterfaceNameTestService.java  |   9 +
 .../integration/InterfaceNameTestService2.java |   9 +
 .../integration/ServiceStoreServiceTest.java   | 179 +++-
 .../metadata/builder/ArrayTypeBuilderTest.java |  91 ++
 .../builder/CollectionTypeBuilderTest.java |  91 ++
 .../servicedata/metadata/builder/ComplexEnum.java  |  16 ++
 .../metadata/builder/ComplexObject.java|  37 +
 .../metadata/builder/DefaultTypeBuilderTest.java   |  64 +++
 .../metadata/builder/EnumTypeBuilderTest.java  |  85 ++
 .../metadata/builder/MapTypeBuilderTest.java   |  90 ++
 .../builder/ServiceDescriptorBuilderTest.java  |  25 +++
 .../servicedata/metadata/builder/SingleEnum.java   |   8 +
 .../servicedata/metadata/builder/TestService.java  |  45 +
 .../builder/TypeDescriptorBuilderTest.java | 101 
 .../store/test/JTestServiceStore4Test.java}|  42 ++---
 .../store/test/JTestServiceStoreFactory4Test.java} |   8 +-
 .../support/AbstractServiceStoreFactoryTest.java   |   4 +-
 .../support/AbstractServiceStoreTest.java  |   8 +-
 ...che.dubbo.servicedata.store.ServiceStoreFactory |   1 +
 dubbo-servicedata/dubbo-servicedata-redis/pom.xml  |  22 ++-
 .../{ => store}/redis/RedisServiceStore.java   |  20 ++-
 .../redis/RedisServiceStoreFactory.java|   5 +-
 ...rg.apache.dubbo.servicedata.ServiceStoreFactory |   1 -
 ...che.dubbo.servicedata.store.ServiceStoreFactory |   1 +
 .../store/redis/RedisServiceStoreTest.java | 101 
 .../dubbo-servicedata-zookeeper/pom.xml|  17 +-
 .../zookeeper/ZookeeperServiceStore.java   |  21 ++-
 .../zookeeper/ZookeeperServiceStoreFactory.java|   4 +-
 ...rg.apache.dubbo.servicedata.ServiceStoreFactory |   1 -
 ...che.dubbo.servicedata.store.ServiceStoreFactory |   1 +
 .../store/zookeeper/ZookeeperServiceStoreTest.java | 183 +
 dubbo-servicedata/pom.xml  |  17 +-
 52 files changed, 1991 insertions(+), 89 deletions(-)