You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@servicecomb.apache.org by GitBox <gi...@apache.org> on 2018/01/24 01:20:21 UTC
[GitHub] WillemJiang closed pull request #526: SCB-208 transfer foundation-config-cc to root module dynamic-config
WillemJiang closed pull request #526: SCB-208 transfer foundation-config-cc to root module dynamic-config
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/526
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/foundations/foundation-config-cc/pom.xml b/dynamic-config/config-cc/pom.xml
similarity index 86%
rename from foundations/foundation-config-cc/pom.xml
rename to dynamic-config/config-cc/pom.xml
index 79b7797ab..745aab59a 100644
--- a/foundations/foundation-config-cc/pom.xml
+++ b/dynamic-config/config-cc/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
@@ -14,17 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>foundations</artifactId>
+ <artifactId>dynamic-config</artifactId>
<groupId>org.apache.servicecomb</groupId>
<version>0.6.0-SNAPSHOT</version>
</parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>foundation-config-cc</artifactId>
+ <artifactId>config-cc</artifactId>
<name>Java Chassis::Foundations::Config CC</name>
<dependencies>
@@ -42,4 +43,5 @@
<artifactId>foundation-vertx</artifactId>
</dependency>
</dependencies>
-</project>
+
+</project>
\ No newline at end of file
diff --git a/foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigCenterConfigurationSourceImpl.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigCenterConfigurationSourceImpl.java
similarity index 100%
rename from foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigCenterConfigurationSourceImpl.java
rename to dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigCenterConfigurationSourceImpl.java
diff --git a/foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java
similarity index 100%
rename from foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java
rename to dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java
diff --git a/foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
similarity index 100%
rename from foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
rename to dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
diff --git a/foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java
similarity index 100%
rename from foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java
rename to dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java
diff --git a/foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java
similarity index 100%
rename from foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java
rename to dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java
diff --git a/foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/URIConst.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/URIConst.java
similarity index 100%
rename from foundations/foundation-config-cc/src/main/java/org/apache/servicecomb/config/client/URIConst.java
rename to dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/URIConst.java
diff --git a/foundations/foundation-config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.config.spi.ConfigCenterConfigurationSource b/dynamic-config/config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.config.spi.ConfigCenterConfigurationSource
similarity index 100%
rename from foundations/foundation-config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.config.spi.ConfigCenterConfigurationSource
rename to dynamic-config/config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.config.spi.ConfigCenterConfigurationSource
diff --git a/foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/archaius/sources/TestConfigCenterConfigurationSource.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/archaius/sources/TestConfigCenterConfigurationSource.java
similarity index 100%
rename from foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/archaius/sources/TestConfigCenterConfigurationSource.java
rename to dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/archaius/sources/TestConfigCenterConfigurationSource.java
diff --git a/foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java
similarity index 100%
rename from foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java
rename to dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java
diff --git a/foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
similarity index 100%
rename from foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
rename to dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
diff --git a/foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestMemberDiscovery.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestMemberDiscovery.java
similarity index 100%
rename from foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestMemberDiscovery.java
rename to dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestMemberDiscovery.java
diff --git a/foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestParseConfigUtils.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestParseConfigUtils.java
similarity index 100%
rename from foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestParseConfigUtils.java
rename to dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestParseConfigUtils.java
diff --git a/foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestURIConst.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestURIConst.java
similarity index 100%
rename from foundations/foundation-config-cc/src/test/java/org/apache/servicecomb/config/client/TestURIConst.java
rename to dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestURIConst.java
diff --git a/foundations/foundation-config-cc/src/test/resources/microservice.yaml b/dynamic-config/config-cc/src/test/resources/microservice.yaml
similarity index 100%
rename from foundations/foundation-config-cc/src/test/resources/microservice.yaml
rename to dynamic-config/config-cc/src/test/resources/microservice.yaml
diff --git a/dynamic-config/pom.xml b/dynamic-config/pom.xml
index e14b77bde..d2b4d275c 100644
--- a/dynamic-config/pom.xml
+++ b/dynamic-config/pom.xml
@@ -33,6 +33,7 @@
<packaging>pom</packaging>
<modules>
<module>config-apollo</module>
+ <module>config-cc</module>
</modules>
</project>
diff --git a/foundations/pom.xml b/foundations/pom.xml
index 1cdc84875..204306a08 100644
--- a/foundations/pom.xml
+++ b/foundations/pom.xml
@@ -30,7 +30,6 @@
<module>foundation-vertx</module>
<module>foundation-common</module>
<module>foundation-config</module>
- <module>foundation-config-cc</module>
<module>foundation-metrics</module>
<module>foundation-ssl</module>
<module>foundation-test-scaffolding</module>
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index c66451c68..7e8aae035 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -745,7 +745,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-config-cc</artifactId>
+ <artifactId>config-cc</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/spring-boot-starter/spring-boot-starter-configuration/pom.xml b/spring-boot-starter/spring-boot-starter-configuration/pom.xml
index 6065e33f5..a0235c4d6 100644
--- a/spring-boot-starter/spring-boot-starter-configuration/pom.xml
+++ b/spring-boot-starter/spring-boot-starter-configuration/pom.xml
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-config-cc</artifactId>
+ <artifactId>config-cc</artifactId>
</dependency>
</dependencies>
</project>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services