This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 733473f Merge branch 'cloud-native' of
github.com:apache/incubator-dubbo into cloud-native
new a12a539 add rest demo
new e9a9e47 exclude injvm and registry protocol
new 2eaa132 consul complement
new 0c33f39 Merge branch 'cloud-native' of
https://github.com/apache/dubbo into cloud-native
new 705ee97 consul service discovery complement
new eb62f48 Merge remote-tracking branch 'origin/cloud-native' into
cloud-native
new 591e45a support old registry model and new registry model
new a80f6fc change demo
new 9fdbad3 Merge branch 'cloud-native' of
https://github.com/apache/dubbo into cloud-native
new fd89c83 enhance supporting of multiple registries
new 96786d8 demos
new c8ca5b6 demos
new 36e1a1c Merge remote-tracking branch 'origin/cloud-native' into
cloud-native
The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dubbo-bootstrap/pom.xml | 13 +-
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 9 +-
.../bootstrap/DubboServiceConsumerBootstrap.java | 12 +-
.../bootstrap/DubboServiceProvider2Bootstrap.java | 6 +-
.../bootstrap/DubboServiceProviderBootstrap.java | 62 ++++++++--
.../DubboInterfaceConsumerBootstrap.java} | 27 +++--
.../java/org/apache/dubbo/bootstrap/rest/User.java | 77 ++++++++++++
.../apache/dubbo/bootstrap/rest/UserService.java | 45 +++++++
.../dubbo/bootstrap/rest/UserServiceImpl.java | 32 +++++
.../rpc/cluster/directory/AbstractDirectory.java | 6 +-
.../dubbo/common/constants/RegistryConstants.java | 6 +-
.../org/apache/dubbo/common/utils/UrlUtils.java | 5 +
.../dubbo/config/AbstractInterfaceConfig.java | 17 ++-
.../org/apache/dubbo/config/ReferenceConfig.java | 6 +-
.../dubbo/config/DubboConsumerBootstrap.java | 2 +-
.../dubbo/config/DubboProviderBootstrap.java | 2 +-
dubbo-demo/dubbo-call-sc&dubbo/README.md | 7 ++
.../consumer}/pom.xml | 27 ++---
.../samples/microservices/sc/Application.java | 56 +++++++++
.../dubbo/samples/microservices/sc/rest/User.java | 77 ++++++++++++
.../samples/microservices/sc/rest/UserService.java | 45 +++++++
.../microservices/sc/rest/UserServiceImpl.java | 32 +++++
.../consumer/src/main}/resources/log4j.properties | 0
.../pom.xml | 6 +-
dubbo-demo/dubbo-call-sc&dubbo/provider/pom.xml | 83 +++++++++++++
.../samples/microservices/sc/Application.java | 15 +++
.../configuration/RestTemplateConfiguration.java | 16 +++
.../microservices/sc/controller/MeController.java | 23 ++++
.../sc/controller/PropertyController.java | 45 +++++++
.../sc/controller/TestController.java | 46 +++++++
.../samples/microservices/sc/feign/TestFeign.java | 13 ++
.../provider/src/main/resources/application.yml | 6 +
.../provider/src/main/resources/bootstrap.yml | 24 ++++
dubbo-demo/dubbo-call-sc/README.md | 7 ++
.../consumer}/pom.xml | 27 ++---
.../samples/microservices/sc/Application.java | 55 +++++++++
.../dubbo/samples/microservices/sc/rest/User.java | 77 ++++++++++++
.../samples/microservices/sc/rest/UserService.java | 45 +++++++
.../microservices/sc/rest/UserServiceImpl.java | 32 +++++
.../consumer/src/main}/resources/log4j.properties | 0
.../{dubbo-demo-api => dubbo-call-sc}/pom.xml | 6 +-
dubbo-demo/dubbo-call-sc/provider/pom.xml | 83 +++++++++++++
.../samples/microservices/sc/Application.java | 15 +++
.../configuration/RestTemplateConfiguration.java | 16 +++
.../microservices/sc/controller/MeController.java | 23 ++++
.../sc/controller/PropertyController.java | 45 +++++++
.../sc/controller/TestController.java | 54 +++++++++
.../samples/microservices/sc/controller/User.java | 60 +++++++++
.../samples/microservices/sc/feign/TestFeign.java | 13 ++
.../provider/src/main/resources/application.yml | 6 +
.../provider/src/main/resources/bootstrap.yml | 24 ++++
dubbo-demo/pom.xml | 1 +
dubbo-demo/sc-call-dubbo/consumer/pom.xml | 84 +++++++++++++
.../com/bettercloud/spring/cloud/Application.java | 15 +++
.../configuration/RestTemplateConfiguration.java | 17 +++
.../spring/cloud/controller/ClientController.java | 29 +++++
.../bettercloud/spring/cloud/feign/TestFeign.java | 12 ++
.../src/main/resources/application-holding.yml | 3 +
.../consumer/src/main/resources/application.yml | 7 ++
.../consumer/src/main/resources/bootstrap.yml | 26 ++++
.../{dubbo-demo-api => sc-call-dubbo}/pom.xml | 6 +-
.../provider}/pom.xml | 32 +----
.../apache/dubbo/demo/provider/Application.java | 0
.../dubbo/demo/provider/DemoServiceImpl.java | 0
.../provider/src/main}/resources/log4j.properties | 0
.../dubbo/qos/protocol/QosProtocolWrapper.java | 6 +-
.../registry/integration/RegistryProtocol.java | 32 ++---
.../ServiceOrientedRegistry.java | 9 +-
.../service/ServiceOrientedRegistryFactory.java} | 18 +--
.../service/ServiceOrientedRegistryProtocol.java | 39 +++---
.../registry/support/AbstractRegistryFactory.java | 9 +-
.../org.apache.dubbo.registry.RegistryFactory | 1 +
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 3 +-
.../support/ServiceOrientedRegistryTest.java | 1 +
.../registry/consul/ConsulServiceDiscovery.java | 134 +++++++++++++++++++--
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 19 +--
.../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 6 +-
.../rpc/protocol/ProtocolListenerWrapper.java | 6 +-
79 files changed, 1753 insertions(+), 199 deletions(-)
copy
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/{DubboServiceConsumerBootstrap.java
=> compatible/DubboInterfaceConsumerBootstrap.java} (58%)
create mode 100644
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/User.java
create mode 100644
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserService.java
create mode 100644
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserServiceImpl.java
create mode 100644 dubbo-demo/dubbo-call-sc&dubbo/README.md
copy dubbo-demo/{dubbo-demo-api/dubbo-demo-api-provider =>
dubbo-call-sc&dubbo/consumer}/pom.xml (81%)
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/Application.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/User.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserService.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserServiceImpl.java
copy {dubbo-registry/dubbo-registry-sofa/src/test =>
dubbo-demo/dubbo-call-sc&dubbo/consumer/src/main}/resources/log4j.properties
(100%)
copy dubbo-demo/{dubbo-demo-api => dubbo-call-sc&dubbo}/pom.xml (93%)
create mode 100644 dubbo-demo/dubbo-call-sc&dubbo/provider/pom.xml
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/Application.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/configuration/RestTemplateConfiguration.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/MeController.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/PropertyController.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/TestController.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/feign/TestFeign.java
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/resources/application.yml
create mode 100644
dubbo-demo/dubbo-call-sc&dubbo/provider/src/main/resources/bootstrap.yml
create mode 100644 dubbo-demo/dubbo-call-sc/README.md
copy dubbo-demo/{dubbo-demo-api/dubbo-demo-api-provider =>
dubbo-call-sc/consumer}/pom.xml (81%)
create mode 100644
dubbo-demo/dubbo-call-sc/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/Application.java
create mode 100644
dubbo-demo/dubbo-call-sc/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/User.java
create mode 100644
dubbo-demo/dubbo-call-sc/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserService.java
create mode 100644
dubbo-demo/dubbo-call-sc/consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserServiceImpl.java
copy {dubbo-registry/dubbo-registry-sofa/src/test =>
dubbo-demo/dubbo-call-sc/consumer/src/main}/resources/log4j.properties (100%)
copy dubbo-demo/{dubbo-demo-api => dubbo-call-sc}/pom.xml (93%)
create mode 100644 dubbo-demo/dubbo-call-sc/provider/pom.xml
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/Application.java
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/configuration/RestTemplateConfiguration.java
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/MeController.java
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/PropertyController.java
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/TestController.java
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/User.java
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/java/org/apache/dubbo/samples/microservices/sc/feign/TestFeign.java
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/resources/application.yml
create mode 100644
dubbo-demo/dubbo-call-sc/provider/src/main/resources/bootstrap.yml
create mode 100644 dubbo-demo/sc-call-dubbo/consumer/pom.xml
create mode 100644
dubbo-demo/sc-call-dubbo/consumer/src/main/java/com/bettercloud/spring/cloud/Application.java
create mode 100644
dubbo-demo/sc-call-dubbo/consumer/src/main/java/com/bettercloud/spring/cloud/configuration/RestTemplateConfiguration.java
create mode 100644
dubbo-demo/sc-call-dubbo/consumer/src/main/java/com/bettercloud/spring/cloud/controller/ClientController.java
create mode 100644
dubbo-demo/sc-call-dubbo/consumer/src/main/java/com/bettercloud/spring/cloud/feign/TestFeign.java
create mode 100644
dubbo-demo/sc-call-dubbo/consumer/src/main/resources/application-holding.yml
create mode 100644
dubbo-demo/sc-call-dubbo/consumer/src/main/resources/application.yml
create mode 100644
dubbo-demo/sc-call-dubbo/consumer/src/main/resources/bootstrap.yml
copy dubbo-demo/{dubbo-demo-api => sc-call-dubbo}/pom.xml (93%)
copy dubbo-demo/{dubbo-demo-api => sc-call-dubbo/provider}/pom.xml (57%)
copy dubbo-demo/{dubbo-demo-api/dubbo-demo-api-provider =>
sc-call-dubbo/provider}/src/main/java/org/apache/dubbo/demo/provider/Application.java
(100%)
copy dubbo-demo/{dubbo-demo-api/dubbo-demo-api-provider =>
sc-call-dubbo/provider}/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
(100%)
copy {dubbo-registry/dubbo-registry-sofa/src/test =>
dubbo-demo/sc-call-dubbo/provider/src/main}/resources/log4j.properties (100%)
rename
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/{support
=> service}/ServiceOrientedRegistry.java (98%)
copy
dubbo-registry/{dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdRegistryFactory.java
=>
dubbo-registry-api/src/main/java/org/apache/dubbo/registry/service/ServiceOrientedRegistryFactory.java}
(61%)
copy
dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/NewRouter.java =>
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/service/ServiceOrientedRegistryProtocol.java
(53%)
create mode 100644
dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
create mode 100644
dubbo-registry/dubbo-registry-consul/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
