version upgrade to 0.0.6 and refactor apollo-demo

apolloconfig · Jul 25, 2016 · 344595a · 344595a
1 parent 4c29c11
commit 344595a
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 66 deletions.
diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-assembly/pom.xml b/apollo-assembly/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>apollo</artifactId>
 		<groupId>com.ctrip.framework.apollo</groupId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-biz</artifactId>

diff --git a/apollo-buildtools/pom.xml b/apollo-buildtools/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-client/README.md b/apollo-client/README.md
@@ -88,7 +88,7 @@ If you need this functionality, you could specify the cluster as follows:
 		<dependency>
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-client</artifactId>
-			<version>0.0.5</version>
+			<version>0.0.6</version>
 		</dependency>
 
 ## III. Client Usage

diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-core/pom.xml b/apollo-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-demo/pom.xml b/apollo-demo/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>apollo</artifactId>
 		<groupId>com.ctrip.framework.apollo</groupId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-demo</artifactId>

diff --git a/apollo-demo/src/main/java/ApolloConfigDemo.java b/apollo-demo/src/main/java/ApolloConfigDemo.java
@@ -1,6 +1,8 @@
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.ConfigChangeListener;
+import com.ctrip.framework.apollo.ConfigFile;
 import com.ctrip.framework.apollo.ConfigService;
+import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
 import com.ctrip.framework.apollo.model.ConfigChange;
 import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 
@@ -19,6 +21,8 @@ public class ApolloConfigDemo {
   private String DEFAULT_VALUE = "undefined";
   private Config config;
   private Config publicConfig;
+  private ConfigFile applicationConfigFile;
+  private ConfigFile xmlConfigFile;
 
   public ApolloConfigDemo() {
     ConfigChangeListener changeListener = new ConfigChangeListener() {
@@ -37,6 +41,8 @@ public void onChange(ConfigChangeEvent changeEvent) {
     config.addChangeListener(changeListener);
     publicConfig = ConfigService.getConfig("FX.apollo");
     publicConfig.addChangeListener(changeListener);
+    applicationConfigFile = ConfigService.getConfigFile("application", ConfigFileFormat.Properties);
+    xmlConfigFile = ConfigService.getConfigFile("datasources", ConfigFileFormat.XML);
   }
 
   private String getConfig(String key) {
@@ -48,6 +54,26 @@ private String getConfig(String key) {
     return result;
   }
 
+  private void print(String namespace) {
+    switch (namespace) {
+      case "application":
+        print(applicationConfigFile);
+        return;
+      case "xml":
+        print(xmlConfigFile);
+        return;
+    }
+  }
+
+  private void print(ConfigFile configFile) {
+    if (!configFile.hasContent()) {
+      System.out.println("No config file content found for " + configFile.getNamespace());
+      return;
+    }
+    System.out.println("=== Config File Content for " + configFile.getNamespace() + " is as follows: ");
+    System.out.println(configFile.getContent());
+  }
+
   public static void main(String[] args) throws IOException {
     ApolloConfigDemo apolloConfigDemo = new ApolloConfigDemo();
     System.out.println(
@@ -59,6 +85,14 @@ public static void main(String[] args) throws IOException {
         continue;
       }
       input = input.trim();
+      if (input.equalsIgnoreCase("application")) {
+        apolloConfigDemo.print("application");
+        continue;
+      }
+      if (input.equalsIgnoreCase("xml")) {
+        apolloConfigDemo.print("xml");
+        continue;
+      }
       if (input.equalsIgnoreCase("quit")) {
         System.exit(0);
       }

diff --git a/apollo-demo/src/main/java/ApolloConfigFileDemo.java b/apollo-demo/src/main/java/ApolloConfigFileDemo.java
diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.0.6-SNAPSHOT</version>
+		<version>0.0.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ctrip.framework.apollo</groupId>
 	<artifactId>apollo</artifactId>
-	<version>0.0.6-SNAPSHOT</version>
+	<version>0.0.6</version>
 	<name>Apollo</name>
 	<packaging>pom</packaging>
 	<description>Ctrip Configuration Center</description>