Merge pull request #3 from yiming187/base_code

apollo-server/pom.xml → apollo-configserver/pom.xml

@@ -8,8 +8,8 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>apollo-server</artifactId>
-	<name>Apollo Server</name>
+	<artifactId>apollo-configserver</artifactId>
+	<name>Apollo ConfigServer</name>
 	<dependencies>
 		<dependency>
 			<groupId>com.ctrip.apollo</groupId>
@@ -17,7 +17,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
+			<artifactId>spring-cloud-config-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

apollo-server/src/main/java/com/ctrip/apollo/ConfigServerApplication.java → apollo-configserver/src/main/java/com/ctrip/apollo/server/ConfigServerApplication.java

-package com.ctrip.apollo;
+package com.ctrip.apollo.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

apollo-metaserver/pom.xml

@@ -9,11 +9,28 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-metaserver</artifactId>
-	<name>Apollo Metaserver</name>
+	<name>Apollo MetaServer</name>
 	<dependencies>
 		<dependency>
 			<groupId>com.ctrip.apollo</groupId>
 			<artifactId>apollo-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/MetaServerApplication.java

+package com.ctrip.apollo.metaserver;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MetaServerApplication {
+  public static void main(String[] args) {
+    SpringApplication.run(MetaServerApplication.class, args);
+  }
+}

apollo-portal/pom.xml

@@ -15,5 +15,22 @@
 			<groupId>com.ctrip.apollo</groupId>
 			<artifactId>apollo-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

apollo-portal/src/main/java/com/ctrip/apollo/portal/PortalApplication.java

+package com.ctrip.apollo.portal;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PortalApplication {
+  public static void main(String[] args) throws Exception {
+    SpringApplication.run(PortalApplication.class, args);
+  }
+}

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/SampleController.java

+package com.ctrip.apollo.portal.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class SampleController {
+
+  @RequestMapping("/")
+  public String home() {
+    return "Hello World!";
+  }
+}

pom.xml

@@ -11,7 +11,7 @@
 		<module>apollo-core</module>
 		<module>apollo-metaserver</module>
 		<module>apollo-client</module>
-		<module>apollo-server</module>
+		<module>apollo-configserver</module>
 		<module>apollo-portal</module>
 		<module>apollo-assembly</module>
 	</modules>
@@ -34,7 +34,7 @@
 			</dependency>
 			<dependency>
 				<groupId>com.ctrip.apollo</groupId>
-				<artifactId>apollo-server</artifactId>
+				<artifactId>apollo-configserver</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>