diff --git a/apollo-dev/style/eclipse-java-google-style.xml b/apollo-dev/style/eclipse-java-google-style.xml
new file mode 100644
index 00000000000..b889c237f48
--- /dev/null
+++ b/apollo-dev/style/eclipse-java-google-style.xml
@@ -0,0 +1,291 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apollo-dev/style/intellij-java-google-style.xml b/apollo-dev/style/intellij-java-google-style.xml
new file mode 100644
index 00000000000..4ae482093df
--- /dev/null
+++ b/apollo-dev/style/intellij-java-google-style.xml
@@ -0,0 +1,475 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apollo-server/pom.xml b/apollo-server/pom.xml
index 3a523caeb1b..5f1a213b056 100644
--- a/apollo-server/pom.xml
+++ b/apollo-server/pom.xml
@@ -15,5 +15,22 @@
com.ctrip.apollo
apollo-core
+
+ org.springframework.cloud
+ spring-cloud-starter-config
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
diff --git a/apollo-server/src/main/java/com/ctrip/apollo/ConfigServerApplication.java b/apollo-server/src/main/java/com/ctrip/apollo/ConfigServerApplication.java
new file mode 100644
index 00000000000..760591f5b73
--- /dev/null
+++ b/apollo-server/src/main/java/com/ctrip/apollo/ConfigServerApplication.java
@@ -0,0 +1,15 @@
+package com.ctrip.apollo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+@SpringBootApplication
+@EnableConfigServer
+public class ConfigServerApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ConfigServerApplication.class, args);
+ }
+
+}
diff --git a/apollo-server/src/main/resources/application.yml b/apollo-server/src/main/resources/application.yml
new file mode 100644
index 00000000000..f25852273d5
--- /dev/null
+++ b/apollo-server/src/main/resources/application.yml
@@ -0,0 +1,10 @@
+server:
+ port: 8888
+
+logging:
+ level:
+ org.springframework.cloud: 'DEBUG'
+
+spring:
+ profiles:
+ active: native
diff --git a/apollo-server/src/main/resources/bootstrap.yml b/apollo-server/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000000..196faa13a5a
--- /dev/null
+++ b/apollo-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,3 @@
+spring:
+ application:
+ name: apollo-server
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6775feb6a2b..e23ebe81cbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,6 @@
0.0.1
Apollo
pom
-
apollo-core
apollo-metaserver
@@ -55,9 +54,11 @@
- org.springframework.boot
- spring-boot-starter
- 1.3.3.RELEASE
+ org.springframework.cloud
+ spring-cloud-starter-parent
+ Angel.SR6
+ pom
+ import
mysql
@@ -65,12 +66,6 @@
5.1.38
-
- org.springframework.boot
- spring-boot-starter-test
- 1.3.3.RELEASE
- test
-
com.h2database
h2
@@ -89,8 +84,19 @@
http://maven.dev.sh.ctripcorp.com:8081/nexus/content/repositories/fxsnapshot
+
+
+ spring-milestones
+ Spring Milestones
+ https://repo.spring.io/libs-milestone
+
+ false
+
+
+
utf-8
+ 1.8