This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit ec1cd87871478886799dd4368f82f4470218473f
Merge: d379ee1 219666d
Author: cvictory <shenglic...@gmail.com>
AuthorDate: Thu Aug 22 09:43:03 2019 +0800
Merge branch 'cloud-native' of github.com:apache/incubator-dubbo into
cloud-native
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 53 +++---------
.../bootstrap/DubboServiceConsumerBootstrap.java | 10 +--
.../bootstrap/DubboServiceProviderBootstrap.java | 2 +-
.../EtcdDubboServiceConsumerBootstrap.java | 2 -
.../EtcdDubboServiceProviderBootstrap.java | 3 +-
.../NacosDubboServiceConsumerBootstrap.java | 1 -
.../NacosDubboServiceProviderBootstrap.java | 1 -
.../DubboInterfaceConsumerBootstrap.java | 1 -
.../support/RegistryAwareClusterInvoker.java | 6 +-
.../dubbo/common/constants/CommonConstants.java | 2 +
.../dubbo/common/constants/RegistryConstants.java | 2 +
.../org/apache/dubbo/config/ApplicationConfig.java | 20 +++--
.../org/apache/dubbo/config/ReferenceConfig.java | 2 +-
.../org/apache/dubbo/config/RegistryConfig.java | 23 +++++
.../dubbo/config/builders/ApplicationBuilder.java | 2 +-
.../dubbo/config/builders/RegistryBuilder.java | 41 +++++++++
.../apache/dubbo/config/context/ConfigManager.java | 4 +
.../dubbo/config/spring/ApplicationBean.java | 89 -------------------
.../apache/dubbo/config/spring/ReferenceBean.java | 1 +
.../apache/dubbo/config/spring/ServiceBean.java | 22 +----
.../ConfigurableSourceBeanMetadataElement.java} | 35 ++++----
...ubboLifecycleComponentApplicationListener.java} | 2 +-
.../annotation/DubboConfigBindingRegistrar.java | 9 +-
....java => DubboLifecycleComponentRegistrar.java} | 29 +++----
.../context/annotation/EnableDubboLifecycle.java | 4 +-
.../spring/schema/DubboNamespaceHandler.java | 56 +++++++++++-
.../util/AnnotatedBeanDefinitionRegistryUtils.java | 11 ++-
.../src/main/resources/META-INF/compat/dubbo.xsd | 18 +++-
.../src/main/resources/META-INF/dubbo.xsd | 18 +++-
.../AnnotatedBeanDefinitionRegistryUtilsTest.java | 9 ++
.../org/apache/dubbo/demo/GreetingService.java | 24 +-----
dubbo-demo/dubbo-demo-servicediscovery-xml/pom.xml | 61 +++++++++++++
.../servicediscovery-consumer/pom.xml | 84 ++++++++++++++++++
.../apache/dubbo/demo/consumer/Application.java | 33 +++-----
.../src/main/resources/dubbo.properties | 1 +
.../src/main/resources/log4j.properties | 7 ++
.../src/main/resources/spring/dubbo-consumer.xml | 30 +++++++
.../servicediscovery-provider/pom.xml | 99 ++++++++++++++++++++++
.../apache/dubbo/demo/provider/Application.java | 31 ++-----
.../dubbo/demo/provider/DemoServiceImpl.java | 34 +++-----
.../src/main/resources/dubbo.properties | 1 +
.../src/main/resources/log4j.properties | 7 ++
.../src/main/resources/spring/dubbo-provider.xml | 34 ++++++++
dubbo-demo/pom.xml | 4 +
.../dubbo/demo/provider/GreetingServiceImpl.java | 29 ++-----
.../servicediscovery-consumer/pom.xml | 84 ++++++++++++++++++
.../apache/dubbo/demo/consumer/Application.java | 33 +++-----
.../src/main/resources/dubbo.properties | 1 +
.../src/main/resources/log4j.properties | 7 ++
.../src/main/resources/spring/dubbo-consumer.xml | 30 +++++++
dubbo-dependencies-bom/pom.xml | 14 +++
.../dubbo/metadata/WritableMetadataService.java | 14 ---
.../metadata/ServiceInstanceMetadataUtils.java | 6 +-
.../registry/integration/RegistryDirectory.java | 6 +-
.../dubbo/registry/support/AbstractRegistry.java | 14 +++
.../dubbo/registry/support/FailbackRegistry.java | 4 +
dubbo-registry/dubbo-registry-eureka/pom.xml | 45 ++++++++++
dubbo-registry/pom.xml | 1 +
58 files changed, 847 insertions(+), 369 deletions(-)
diff --cc
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceConsumerBootstrap.java
index 410e3d4,b1cc6d3..e9c9dd2
---
a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceConsumerBootstrap.java
+++
b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceConsumerBootstrap.java
@@@ -32,10 -32,9 +32,9 @@@ public class EtcdDubboServiceConsumerBo
new DubboBootstrap()
.application("dubbo-consumer-demo")
- .defaultMetadataStorageType(true)
// Zookeeper
.protocol(builder -> builder.port(20887).name("dubbo"))
- .registry("zookeeper", builder ->
builder.address("etcd3://127.0.0.1:2379?registry.type=service&subscribed.services=dubbo-provider-demo"))
+ .registry("etcd3", builder ->
builder.address("etcd3://127.0.0.1:2379?registry.type=service&subscribed.services=dubbo-provider-demo"))
.metadataReport(new
MetadataReportConfig("etcd://127.0.0.1:2379"))
// Nacos
// .registry("consul", builder ->
builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))
