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 a3215cba294e9d81b6670bb642caad352859dbbf Author: ken.lj <[email protected]> AuthorDate: Sat Nov 17 12:31:31 2018 +0800 refactor governance to configcenter --- dubbo-all/pom.xml | 14 +++++++------- dubbo-bom/pom.xml | 6 +++--- dubbo-cluster/pom.xml | 2 +- .../java/org/apache/dubbo/rpc/cluster/RouterChain.java | 2 +- .../java/org/apache/dubbo/rpc/cluster/RouterFactory.java | 2 +- .../router/condition/config/ConfigConditionRouter.java | 8 ++++---- .../condition/config/ConfigConditionRouterFactory.java | 2 +- .../dubbo/rpc/cluster/router/mock/MockRouterFactory.java | 2 +- .../apache/dubbo/rpc/cluster/router/tag/TagRouter.java | 8 ++++---- .../dubbo/rpc/cluster/router/tag/TagRouterFactory.java | 2 +- .../java/org/apache/dubbo/config/ConfigCenterConfig.java | 2 +- .../java/org/apache/dubbo/config/context/Environment.java | 2 +- .../AbstractDynamicConfiguration.java | 2 +- .../{governance => configcenter}/ConfigChangeEvent.java | 2 +- .../{governance => configcenter}/ConfigChangeType.java | 2 +- .../dubbo/{governance => configcenter}/ConfigType.java | 2 +- .../ConfigurationListener.java | 2 +- .../DynamicConfiguration.java | 2 +- .../support/nop/NopDynamicConfiguration.java | 9 +++++---- ...rg.apache.dubbo.governance.DynamicConfigurationFactory | 1 - .../org.apache.dubbo.configcenter.DynamicConfiguration | 1 + .../support/apollo/ApolloDynamicConfiguration.java | 14 +++++++------- .../org.apache.dubbo.configcenter.DynamicConfiguration | 1 + .../org.apache.dubbo.governance.DynamicConfiguration | 1 - ...rg.apache.dubbo.governance.DynamicConfigurationFactory | 1 - .../support/archaius/ArchaiusDynamicConfiguration.java | 15 ++++++++------- .../archaius/sources/ZooKeeperConfigurationSource.java | 2 +- .../org.apache.dubbo.configcenter.DynamicConfiguration | 2 ++ .../org.apache.dubbo.governance.DynamicConfiguration | 2 -- ...rg.apache.dubbo.governance.DynamicConfigurationFactory | 2 -- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- .../dubbo/registry/integration/RegistryDirectory.java | 8 ++++---- .../dubbo/registry/integration/RegistryProtocol.java | 8 ++++---- 35 files changed, 68 insertions(+), 69 deletions(-) diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml index 620348d..0d3b2c9 100644 --- a/dubbo-all/pom.xml +++ b/dubbo-all/pom.xml @@ -327,21 +327,21 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-api</artifactId> + <artifactId>dubbo-configcenter-api</artifactId> <version>${project.version}</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-zookeeper</artifactId> + <artifactId>dubbo-configcenter-zookeeper</artifactId> <version>${project.version}</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-apollo</artifactId> + <artifactId>dubbo-configcenter-apollo</artifactId> <version>${project.version}</version> <scope>compile</scope> <optional>true</optional> @@ -453,9 +453,9 @@ <include>org.apache.dubbo:dubbo-serialization-kryo</include> <include>org.apache.dubbo:dubbo-serialization-jdk</include> <include>org.apache.dubbo:dubbo-serialization-protostuff</include> - <include>org.apache.dubbo:dubbo-governance-api</include> - <include>org.apache.dubbo:dubbo-governance-apollo</include> - <include>org.apache.dubbo:dubbo-governance-zookeeper</include> + <include>org.apache.dubbo:dubbo-configcenter-api</include> + <include>org.apache.dubbo:dubbo-configcenter-apollo</include> + <include>org.apache.dubbo:dubbo-configcenter-zookeeper</include> </includes> </artifactSet> <transformers> @@ -575,7 +575,7 @@ </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfiguration + <resource>META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfiguration </resource> </transformer> </transformers> diff --git a/dubbo-bom/pom.xml b/dubbo-bom/pom.xml index 7a4a1c5..dd87f68 100644 --- a/dubbo-bom/pom.xml +++ b/dubbo-bom/pom.xml @@ -305,17 +305,17 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-api</artifactId> + <artifactId>dubbo-configcenter-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-zookeeper</artifactId> + <artifactId>dubbo-configcenter-zookeeper</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-apollo</artifactId> + <artifactId>dubbo-configcenter-apollo</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 864cbb4..20fb083 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-api</artifactId> + <artifactId>dubbo-configcenter-api</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java index 0826ad9..32457e9 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java @@ -19,7 +19,7 @@ package org.apache.dubbo.rpc.cluster; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.ExtensionLoader; import org.apache.dubbo.common.utils.CollectionUtils; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcInvocation; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java index 47b30a0..16467b0 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java @@ -19,7 +19,7 @@ package org.apache.dubbo.rpc.cluster; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Adaptive; import org.apache.dubbo.common.extension.SPI; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.DynamicConfiguration; /** * RouterFactory. (SPI, Singleton, ThreadSafe) diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java index 6a4af0f..3d994c7 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java @@ -22,10 +22,10 @@ import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.governance.ConfigChangeEvent; -import org.apache.dubbo.governance.ConfigChangeType; -import org.apache.dubbo.governance.ConfigurationListener; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.ConfigChangeEvent; +import org.apache.dubbo.configcenter.ConfigChangeType; +import org.apache.dubbo.configcenter.ConfigurationListener; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcException; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouterFactory.java index c69cb94..7861227 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouterFactory.java @@ -18,7 +18,7 @@ package org.apache.dubbo.rpc.cluster.router.condition.config; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Activate; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.rpc.cluster.Router; import org.apache.dubbo.rpc.cluster.RouterFactory; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mock/MockRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mock/MockRouterFactory.java index b1b9bb5..967bc2f 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mock/MockRouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mock/MockRouterFactory.java @@ -18,7 +18,7 @@ package org.apache.dubbo.rpc.cluster.router.mock; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Activate; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.rpc.cluster.Router; import org.apache.dubbo.rpc.cluster.RouterFactory; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java index 462b8d9..8ffd0fb 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java @@ -23,10 +23,10 @@ import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.governance.ConfigChangeEvent; -import org.apache.dubbo.governance.ConfigChangeType; -import org.apache.dubbo.governance.ConfigurationListener; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.ConfigChangeEvent; +import org.apache.dubbo.configcenter.ConfigChangeType; +import org.apache.dubbo.configcenter.ConfigurationListener; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcException; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouterFactory.java index 2a7cf38..208829a 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouterFactory.java @@ -18,7 +18,7 @@ package org.apache.dubbo.rpc.cluster.router.tag; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Activate; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.rpc.cluster.Router; import org.apache.dubbo.rpc.cluster.RouterFactory; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java index 523d2e0..f753126 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java @@ -24,7 +24,7 @@ import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.common.utils.UrlUtils; import org.apache.dubbo.config.context.Environment; import org.apache.dubbo.config.support.Parameter; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.DynamicConfiguration; import java.io.IOException; import java.io.StringReader; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/Environment.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/Environment.java index d98b33f..870304e 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/Environment.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/Environment.java @@ -27,7 +27,7 @@ import org.apache.dubbo.common.extension.ExtensionLoader; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.config.ConfigCenterConfig; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.DynamicConfiguration; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/AbstractDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/AbstractDynamicConfiguration.java similarity index 98% rename from dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/AbstractDynamicConfiguration.java rename to dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/AbstractDynamicConfiguration.java index e3c7077..3411032 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/AbstractDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/AbstractDynamicConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance; +package org.apache.dubbo.configcenter; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.config.AbstractConfiguration; diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigChangeEvent.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigChangeEvent.java similarity index 98% rename from dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigChangeEvent.java rename to dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigChangeEvent.java index bc8504b..d99d400 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigChangeEvent.java +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigChangeEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance; +package org.apache.dubbo.configcenter; /** * diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigChangeType.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigChangeType.java similarity index 95% rename from dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigChangeType.java rename to dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigChangeType.java index 81b59e8..00f56f3 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigChangeType.java +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigChangeType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance; +package org.apache.dubbo.configcenter; /** * diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigType.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigType.java similarity index 95% rename from dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigType.java rename to dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigType.java index f084372..e5ec836 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigType.java +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance; +package org.apache.dubbo.configcenter; /** * diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigurationListener.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigurationListener.java similarity index 96% rename from dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigurationListener.java rename to dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigurationListener.java index 128d4a1..50b2f42 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/ConfigurationListener.java +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigurationListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance; +package org.apache.dubbo.configcenter; import org.apache.dubbo.common.URL; diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/DynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/DynamicConfiguration.java similarity index 97% rename from dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/DynamicConfiguration.java rename to dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/DynamicConfiguration.java index 924367f..caf9fd9 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/DynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/DynamicConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance; +package org.apache.dubbo.configcenter; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.config.Configuration; diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/support/nop/NopDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/support/nop/NopDynamicConfiguration.java similarity index 83% rename from dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/support/nop/NopDynamicConfiguration.java rename to dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/support/nop/NopDynamicConfiguration.java index 3f49e68..f506935 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/governance/support/nop/NopDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/support/nop/NopDynamicConfiguration.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance.support.nop; +package org.apache.dubbo.configcenter.support.nop; -import org.apache.dubbo.governance.AbstractDynamicConfiguration; -import org.apache.dubbo.governance.ConfigurationListener; +import org.apache.dubbo.configcenter.AbstractDynamicConfiguration; +import org.apache.dubbo.configcenter.ConfigurationListener; +import org.apache.dubbo.configcenter.DynamicConfiguration; /** - * The default extension of {@link org.apache.dubbo.governance.DynamicConfiguration}. + * The default extension of {@link DynamicConfiguration}. * If user does not specify a config centre, or specifies one that is not a valid extension, it will default to this one. */ public class NopDynamicConfiguration extends AbstractDynamicConfiguration { diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory b/dubbo-configcenter/dubbo-configcenter-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory deleted file mode 100644 index 9a769be..0000000 --- a/dubbo-configcenter/dubbo-configcenter-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory +++ /dev/null @@ -1 +0,0 @@ -nop=org.apache.dubbo.governance.support.nop.NopDynamicConfigurationFactory \ No newline at end of file diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/resources/META-INF/dubbo/org.apache.dubbo.configcenter.DynamicConfiguration b/dubbo-configcenter/dubbo-configcenter-api/src/main/resources/META-INF/dubbo/org.apache.dubbo.configcenter.DynamicConfiguration new file mode 100644 index 0000000..6d8fab4 --- /dev/null +++ b/dubbo-configcenter/dubbo-configcenter-api/src/main/resources/META-INF/dubbo/org.apache.dubbo.configcenter.DynamicConfiguration @@ -0,0 +1 @@ +nop=org.apache.dubbo.configcenter.support.nop.NopDynamicConfiguration \ No newline at end of file diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java similarity index 91% rename from dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfiguration.java rename to dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java index f74ec14..ad16d50 100644 --- a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance.support.apollo; +package org.apache.dubbo.configcenter.support.apollo; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigChangeListener; @@ -28,10 +28,10 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.governance.AbstractDynamicConfiguration; -import org.apache.dubbo.governance.ConfigChangeType; -import org.apache.dubbo.governance.ConfigType; -import org.apache.dubbo.governance.ConfigurationListener; +import org.apache.dubbo.configcenter.AbstractDynamicConfiguration; +import org.apache.dubbo.configcenter.ConfigChangeType; +import org.apache.dubbo.configcenter.ConfigType; +import org.apache.dubbo.configcenter.ConfigurationListener; import java.util.HashSet; import java.util.Set; @@ -158,9 +158,9 @@ public class ApolloDynamicConfiguration extends AbstractDynamicConfiguration<Con ConfigChange change = changeEvent.getChange(key); // TODO Maybe we no longer need to identify the type of change. Because there's no scenario that a callback will subscribe for both configurators and routers if (change.getPropertyName().endsWith(Constants.CONFIGURATORS_SUFFIX)) { - listener.process(new org.apache.dubbo.governance.ConfigChangeEvent(key, change.getNewValue(), ConfigType.CONFIGURATORS, getChangeType(change))); + listener.process(new org.apache.dubbo.configcenter.ConfigChangeEvent(key, change.getNewValue(), ConfigType.CONFIGURATORS, getChangeType(change))); } else { - listener.process(new org.apache.dubbo.governance.ConfigChangeEvent(key, change.getNewValue(), ConfigType.ROUTERS, getChangeType(change))); + listener.process(new org.apache.dubbo.configcenter.ConfigChangeEvent(key, change.getNewValue(), ConfigType.ROUTERS, getChangeType(change))); } } } diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfiguration b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfiguration new file mode 100644 index 0000000..4d60639 --- /dev/null +++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfiguration @@ -0,0 +1 @@ +apollo=org.apache.dubbo.configcenter.support.apollo.ApolloDynamicConfiguration \ No newline at end of file diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfiguration b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfiguration deleted file mode 100644 index 5a5af4f..0000000 --- a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfiguration +++ /dev/null @@ -1 +0,0 @@ -apollo=org.apache.dubbo.governance.support.apollo.ApolloDynamicConfiguration \ No newline at end of file diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory deleted file mode 100644 index 3a89f53..0000000 --- a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory +++ /dev/null @@ -1 +0,0 @@ -apollo=org.apache.dubbo.governance.support.apollo.ApolloDynamicConfigurationFactory \ No newline at end of file diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/ArchaiusDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/archaius/ArchaiusDynamicConfiguration.java similarity index 93% rename from dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/ArchaiusDynamicConfiguration.java rename to dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/archaius/ArchaiusDynamicConfiguration.java index 15e24bd..883339f 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/ArchaiusDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/archaius/ArchaiusDynamicConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance.support.archaius; +package org.apache.dubbo.configcenter.support.archaius; import com.netflix.config.ConfigurationManager; import com.netflix.config.DynamicPropertyFactory; @@ -23,12 +23,12 @@ import com.netflix.config.DynamicWatchedConfiguration; import org.apache.dubbo.common.Constants; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.governance.AbstractDynamicConfiguration; -import org.apache.dubbo.governance.ConfigChangeEvent; -import org.apache.dubbo.governance.ConfigChangeType; -import org.apache.dubbo.governance.ConfigType; -import org.apache.dubbo.governance.ConfigurationListener; -import org.apache.dubbo.governance.support.archaius.sources.ZooKeeperConfigurationSource; +import org.apache.dubbo.configcenter.AbstractDynamicConfiguration; +import org.apache.dubbo.configcenter.ConfigChangeEvent; +import org.apache.dubbo.configcenter.ConfigChangeType; +import org.apache.dubbo.configcenter.ConfigType; +import org.apache.dubbo.configcenter.ConfigurationListener; +import org.apache.dubbo.configcenter.support.archaius.sources.ZooKeeperConfigurationSource; /** * Archaius supports various sources and it's extensiable: JDBC, ZK, Properties, ..., so should we make it extensiable? @@ -90,6 +90,7 @@ public class ArchaiusDynamicConfiguration extends AbstractDynamicConfiguration<R /** * First, get app level configuration * If there's no value in app level, try to get global dubbo level. + * * @param key * @return */ diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/archaius/sources/ZooKeeperConfigurationSource.java similarity index 99% rename from dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java rename to dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/archaius/sources/ZooKeeperConfigurationSource.java index 2e810d4..647dcf6 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/archaius/sources/ZooKeeperConfigurationSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.governance.support.archaius.sources; +package org.apache.dubbo.configcenter.support.archaius.sources; import com.google.common.io.Closeables; import com.netflix.config.WatchedConfigurationSource; diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfiguration b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfiguration new file mode 100644 index 0000000..b948be5 --- /dev/null +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfiguration @@ -0,0 +1,2 @@ +archaius=org.apache.dubbo.configcenter.support.archaius.ArchaiusDynamicConfiguration +zookeeper=org.apache.dubbo.configcenter.support.archaius.ArchaiusDynamicConfiguration \ No newline at end of file diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfiguration b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfiguration deleted file mode 100644 index 2918cd7..0000000 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfiguration +++ /dev/null @@ -1,2 +0,0 @@ -archaius=org.apache.dubbo.governance.support.archaius.ArchaiusDynamicConfiguration -zookeeper=org.apache.dubbo.governance.support.archaius.ArchaiusDynamicConfiguration \ No newline at end of file diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory deleted file mode 100644 index d2acc22..0000000 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.governance.DynamicConfigurationFactory +++ /dev/null @@ -1,2 +0,0 @@ -zookeeper=org.apache.dubbo.governance.support.archaius.ArchaiusDynamicConfigurationFactory -archaius=org.apache.dubbo.governance.support.archaius.ArchaiusDynamicConfigurationFactory \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml index 2f78b94..00d1a18 100644 --- a/dubbo-demo/dubbo-demo-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-consumer/pom.xml @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-zookeeper</artifactId> + <artifactId>dubbo-configcenter-zookeeper</artifactId> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml index 10445ee..3ce3320 100644 --- a/dubbo-demo/dubbo-demo-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-provider/pom.xml @@ -61,7 +61,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-zookeeper</artifactId> + <artifactId>dubbo-configcenter-zookeeper</artifactId> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index e403d03..6782dc7 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-api</artifactId> + <artifactId>dubbo-configcenter-api</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java index 9ab35e6..2a5e318 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java @@ -25,10 +25,10 @@ import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.NetUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.governance.ConfigChangeEvent; -import org.apache.dubbo.governance.ConfigChangeType; -import org.apache.dubbo.governance.ConfigurationListener; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.ConfigChangeEvent; +import org.apache.dubbo.configcenter.ConfigChangeType; +import org.apache.dubbo.configcenter.ConfigurationListener; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.registry.NotifyListener; import org.apache.dubbo.registry.Registry; import org.apache.dubbo.registry.integration.parser.ConfigParser; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java index acf6b17..e0e0e48 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java @@ -26,10 +26,10 @@ import org.apache.dubbo.common.utils.ConfigUtils; import org.apache.dubbo.common.utils.NamedThreadFactory; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.common.utils.UrlUtils; -import org.apache.dubbo.governance.ConfigChangeEvent; -import org.apache.dubbo.governance.ConfigChangeType; -import org.apache.dubbo.governance.ConfigurationListener; -import org.apache.dubbo.governance.DynamicConfiguration; +import org.apache.dubbo.configcenter.ConfigChangeEvent; +import org.apache.dubbo.configcenter.ConfigChangeType; +import org.apache.dubbo.configcenter.ConfigurationListener; +import org.apache.dubbo.configcenter.DynamicConfiguration; import org.apache.dubbo.registry.NotifyListener; import org.apache.dubbo.registry.Registry; import org.apache.dubbo.registry.RegistryFactory;
