Merge MetaServer into ConfigServer

apollo-assembly/pom.xml

-<?xml version="1.0"  encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>com.ctrip.apollo</groupId>
-		<artifactId>apollo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>apollo-assembly</artifactId>
-	<name>Apollo Assembly</name>
-</project>

apollo-metaserver/pom.xml → apollo-configadmin/pom.xml

@@ -8,17 +8,53 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>apollo-metaserver</artifactId>
-	<name>Apollo MetaServer</name>
+	<artifactId>apollo-configadmin</artifactId>
+	<name>Apollo ConfigAdmin</name>
 	<dependencies>
+        <!-- apollo -->
 		<dependency>
 			<groupId>com.ctrip.apollo</groupId>
-			<artifactId>apollo-core</artifactId>
+			<artifactId>apollo-biz</artifactId>
 		</dependency>
+        <!-- end of apollo -->
+        <!-- web -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- end of web -->
+        <!-- redis -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+        <!-- end of redis -->
+        <!-- eureka -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-eureka</artifactId>
 		</dependency>
+        <!-- end of eureka -->
+        <!-- jsp -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- end of jsp -->
 	</dependencies>
 	<build>
 		<plugins>

apollo-metaserver/src/main/java/com/ctrip/apollo/metaserver/MetaServerApplication.java → apollo-configadmin/src/main/java/com/ctrip/apollo/configadmin/AdminServiceApplication.java

-package com.ctrip.apollo.metaserver;
+package com.ctrip.apollo.configadmin;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+
 
 @SpringBootApplication
-@EnableEurekaServer
 @EnableEurekaClient
-public class MetaServerApplication {
-
-  public static void main(String[] args) {
-    new SpringApplicationBuilder(MetaServerApplication.class).web(true).run(args);
-  }
+public class AdminServiceApplication {
+    public static void main(String[] args) {
+      new SpringApplicationBuilder(AdminServiceApplication.class).web(true).run(args);
+    }
 }

apollo-configadmin/src/main/resources/application.yml

+spring:
+  application:
+    name: apollo-configadmin
+    
+server:
+  port: 9080
+  
+logging:
+  level:
+    org.springframework.cloud: 'DEBUG'
+  file: /opt/logs/apollo-configadmin.log
+

apollo-metaserver/src/main/resources/bootstrap.yml → apollo-configadmin/src/main/resources/bootstrap.yml

-server:
-  port: 8761
-  
 eureka:
   instance:
     hostname: localhost
@@ -8,4 +5,4 @@ eureka:
     serviceUrl:
       defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
     healthcheck:
-      enabled: true
+      enabled: true
\ No newline at end of file

apollo-configserver/pom.xml

@@ -42,7 +42,7 @@
         <!-- eureka -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-eureka-server</artifactId>
 		</dependency>
         <!-- end of eureka -->
         <!-- jsp -->

apollo-configserver/src/main/java/com/ctrip/apollo/ServerApplication.java

 package com.ctrip.apollo;
 
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
 /**
  * Spring boot application entry point
  * @author Jason Song(song_s@ctrip.com)
  */
 @SpringBootApplication
-@EnableDiscoveryClient
+@EnableEurekaServer
+@EnableEurekaClient
 public class ServerApplication {
     public static void main(String[] args) {
-        SpringApplication.run(ServerApplication.class, args);
+      new SpringApplicationBuilder(ServerApplication.class).web(true).run(args);
     }
 }

apollo-configserver/src/main/resources/application.yml

+spring:
+  application:
+    name: apollo-configserver
+    
 server:
-  port: 8888
+  port: 80
   
 logging:
   level:

apollo-configserver/src/main/resources/bootstrap.yml

-spring:
-  application:
-    name: apollo-configserver
 eureka:
   instance:
     hostname: localhost
   client:
     serviceUrl:
-      defaultZone: http://${eureka.instance.hostname}:8761/eureka/
+      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+    healthcheck:
+      enabled: true
\ No newline at end of file

apollo-metaserver/src/main/resources/application.yml

-spring:
-  application:
-    name: apollo-metaserver
-  profiles:
-    active: native
-    
-logging:
-  level:
-
-
-      
\ No newline at end of file

apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/AbstractMetaServerTest.java

-package com.ctrip.apollo.metaserver;
-
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = MetaServerApplication.class)
-public abstract class AbstractMetaServerTest {
-
-}

apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/AllTests.java

-package com.ctrip.apollo.metaserver;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({
-
-})
-public class AllTests {
-
-}

apollo-metaserver/src/test/java/com/ctrip/apollo/metaserver/controller/DiscoveryControllerTest.java

-package com.ctrip.apollo.metaserver.controller;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.boot.test.WebIntegrationTest;
-import org.springframework.web.client.RestTemplate;
-
-import com.ctrip.apollo.core.ServiceIdConsts;
-import com.ctrip.apollo.metaserver.AbstractMetaServerTest;
-import com.netflix.appinfo.InstanceInfo;
-
-
-@WebIntegrationTest
-public class DiscoveryControllerTest extends AbstractMetaServerTest {
-
-  RestTemplate restTemplate = new TestRestTemplate();
-
-  @Value("${local.server.port}")
-  String serverPort;
-
-  @Test
-  public void testGetMetaServerServices() throws InterruptedException, URISyntaxException {
-    // Wait Eureka Client to fresh meta
-    Thread.sleep(5000);
-
-    URI uri = new URI("http://localhost:" + serverPort + "/services/meta");
-    InstanceInfo[] serviceInstances = restTemplate.getForObject(uri, InstanceInfo[].class);
-    Assert.assertEquals(1, serviceInstances.length);
-    Assert.assertEquals(ServiceIdConsts.APOLLO_METASERVER,
-        serviceInstances[0].getAppName().toLowerCase());
-  }
-}

apollo-metaserver/src/test/resources/application.yml

-spring:
-  application:
-    name: apollo-metaserver
-  profiles:
-    active: native

apollo-metaserver/src/test/resources/bootstrap.yml

-server:
-  port: 8761
-  
-eureka:
-  instance:
-    hostname: localhost
-    leaseRenewalIntervalInSeconds: 1
-  client:
-   # initialInstanceInfoReplicationIntervalSeconds: 1
-    registryFetchIntervalSeconds: 2
-    serviceUrl:
-      defaultZone: http://${eureka.instance.hostname}:${server.port:8761}/eureka/
-    healthcheck:
-      enabled: true
\ No newline at end of file

pom.xml

@@ -65,13 +65,12 @@
 	</properties>
 	<modules>
 		<module>apollo-core</module>
-		<module>apollo-metaserver</module>
 		<module>apollo-client</module>
+		<module>apollo-biz</module>
 		<module>apollo-configserver</module>
+		<module>apollo-configadmin</module>
 		<module>apollo-portal</module>
-		<module>apollo-assembly</module>
 		<module>apollo-demo</module>
-		<module>apollo-biz</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>