You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/24 01:20:20 UTC
[incubator-servicecomb-java-chassis] branch master updated: SCB-208
transfer foundation-config-cc to root module dynamic-config
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 3c060ed SCB-208 transfer foundation-config-cc to root module dynamic-config
3c060ed is described below
commit 3c060ed38a4b05fca15382139fbb84cb0a0064cc
Author: lijasonvip <li...@huawei.com>
AuthorDate: Tue Jan 23 15:46:08 2018 +0800
SCB-208 transfer foundation-config-cc to root module dynamic-config
Signed-off-by: lijasonvip <li...@huawei.com>
---
.../config-cc}/pom.xml | 14 ++++++++------
.../sources/ConfigCenterConfigurationSourceImpl.java | 0
.../servicecomb/config/client/ConfigCenterClient.java | 0
.../servicecomb/config/client/ConfigCenterConfig.java | 0
.../apache/servicecomb/config/client/MemberDiscovery.java | 0
.../apache/servicecomb/config/client/ParseConfigUtils.java | 0
.../org/apache/servicecomb/config/client/URIConst.java | 0
....servicecomb.config.spi.ConfigCenterConfigurationSource | 0
.../sources/TestConfigCenterConfigurationSource.java | 0
.../servicecomb/config/client/TestConfigCenterClient.java | 0
.../servicecomb/config/client/TestConfigCenterConfig.java | 0
.../servicecomb/config/client/TestMemberDiscovery.java | 0
.../servicecomb/config/client/TestParseConfigUtils.java | 0
.../org/apache/servicecomb/config/client/TestURIConst.java | 0
.../config-cc}/src/test/resources/microservice.yaml | 0
dynamic-config/pom.xml | 1 +
foundations/pom.xml | 1 -
java-chassis-dependencies/pom.xml | 2 +-
.../spring-boot-starter-configuration/pom.xml | 2 +-
19 files changed, 11 insertions(+), 9 deletions(-)
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 79b7797..745aab5 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 e14b77b..d2b4d27 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 1cdc848..204306a 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 c66451c..7e8aae0 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 6065e33..a0235c4 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>
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.