This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from 1ab215e add dubbo specification version into registry for ops
new c880720 if the registry type is zookeeper, use the address as default
configcenter address.
new 51146f7 Split the Environment into two parts: Environment in Common
and ConfigurationUtils in ConfigCenter
new 912498a empty rule protection: "" should not be treated as delete.
new 701cf26 Merge branch 'dev-metadata' of
https://github.com/apache/incubator-dubbo into dev-metadata
The 4 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:
.../condition/config/ConfigConditionRouter.java | 8 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 6 ++
.../apache/dubbo/common/config}/Environment.java | 64 +-----------
.../org/apache/dubbo/common/utils/ConfigUtils.java | 25 -----
.../apache/dubbo/common/utils/ConfigUtilsTest.java | 27 -----
.../org/apache/dubbo/config/AbstractConfig.java | 2 +-
.../dubbo/config/AbstractInterfaceConfig.java | 22 +++-
.../apache/dubbo/config/ConfigCenterConfig.java | 36 ++++++-
.../org/apache/dubbo/config/RegistryConfig.java | 20 ++++
.../org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../dubbo/config/spring/ConfigCenterBean.java | 27 ++++-
.../dubbo/configcenter/ConfigurationUtils.java | 112 +++++++++++++++++++++
.../dubbo/configcenter}/ConfigurationWrapper.java | 2 +-
.../dubbo/configcenter/DynamicConfiguration.java | 2 +-
.../support/apollo/ApolloDynamicConfiguration.java | 6 +-
.../archaius/ArchaiusDynamicConfiguration.java | 9 +-
dubbo-container/dubbo-container-log4j/pom.xml | 5 +
.../dubbo/container/log4j/Log4jContainer.java | 9 +-
.../META-INF/spring/dubbo-demo-consumer.xml | 6 +-
.../META-INF/spring/dubbo-demo-provider.xml | 6 +-
.../registry/integration/RegistryDirectory.java | 2 +-
.../registry/integration/RegistryProtocol.java | 6 +-
.../java/org/apache/dubbo/registry/ZKTools.java | 32 +++---
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 5 +
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 8 +-
.../protocol/dubbo/DubboInvokerAvilableTest.java | 4 +-
.../dubbo/rpc/protocol/thrift/ThriftProtocol.java | 4 +-
28 files changed, 289 insertions(+), 172 deletions(-)
rename
{dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context =>
dubbo-common/src/main/java/org/apache/dubbo/common/config}/Environment.java
(65%)
create mode 100644
dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigurationUtils.java
rename
{dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context =>
dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter}/ConfigurationWrapper.java
(97%)
