Merge pull request #152 from yiming187/update

update assembly

apollo-adminservice/src/assembly/assembly-descriptor.xml

@@ -2,33 +2,46 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<id>apollo-adminservice</id>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<!--scripts -->
-		<fileSet>
-			<directory>src/main/scripts</directory>
-			<outputDirectory>bin</outputDirectory>
+	<moduleSets>
+		<moduleSet>
+			<useAllReactorProjects>true</useAllReactorProjects>
 			<includes>
-				<include>*.sh</include>
+				<include>*:apollo-buildtools:*</include>
+				<include>*:apollo-adminervice:*</include>
 			</includes>
-			<fileMode>0755</fileMode>
-			<lineEnding>unix</lineEnding>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/config</directory>
-			<outputDirectory>config</outputDirectory>
-		</fileSet>
-		<!--artifact -->
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>${project.artifactId}-*.jar</include>
-			</includes>
-			<fileMode>0444</fileMode>
-		</fileSet>
-	</fileSets>
+			<sources>
+				<includeModuleDirectory>false</includeModuleDirectory>
+				<fileSets>
+					<!--scripts -->
+					<fileSet>
+						<directory>src/main/scripts</directory>
+						<outputDirectory>bin</outputDirectory>
+						<includes>
+							<include>*.sh</include>
+						</includes>
+						<fileMode>0755</fileMode>
+						<lineEnding>unix</lineEnding>
+					</fileSet>
+					<fileSet>
+						<directory>src/main/config</directory>
+						<outputDirectory>config</outputDirectory>
+					</fileSet>
+					<!--artifact -->
+					<fileSet>
+						<directory>target</directory>
+						<outputDirectory>/</outputDirectory>
+						<includes>
+							<include>${project.artifactId}-*.jar</include>
+						</includes>
+						<fileMode>0444</fileMode>
+					</fileSet>
+				</fileSets>
+			</sources>
+		</moduleSet>
+	</moduleSets>
 </assembly>

apollo-common/src/main/java/com/ctrip/apollo/common/controller/ApolloInfoController.java

@@ -0,0 +1,37 @@
+package com.ctrip.apollo.common.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ctrip.apollo.Apollo;
+import com.ctrip.framework.foundation.Foundation;
+
+@RestController
+@RequestMapping(path = "/apollo")
+public class ApolloInfoController {
+
+  @RequestMapping("app")
+  public String getApp() {
+    return Foundation.app().toString();
+  }
+
+  @RequestMapping("web")
+  public String getEnv() {
+    return Foundation.web().toString();
+  }
+
+  @RequestMapping("net")
+  public String getNet() {
+    return Foundation.net().toString();
+  }
+
+  @RequestMapping("server")
+  public String getServer() {
+    return Foundation.server().toString();
+  }
+
+  @RequestMapping("version")
+  public String getVersion() {
+    return Apollo.VERSION;
+  }
+}

apollo-configservice/src/assembly/assembly-descriptor.xml

@@ -2,33 +2,46 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<id>apollo-configservice</id>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<!--scripts -->
-		<fileSet>
-			<directory>src/main/scripts</directory>
-			<outputDirectory>bin</outputDirectory>
+	<moduleSets>
+		<moduleSet>
+			<useAllReactorProjects>true</useAllReactorProjects>
 			<includes>
-				<include>*.sh</include>
+				<include>*:apollo-buildtools:*</include>
+				<include>*:apollo-configservice:*</include>
 			</includes>
-			<fileMode>0755</fileMode>
-			<lineEnding>unix</lineEnding>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/config</directory>
-			<outputDirectory>config</outputDirectory>
-		</fileSet>
-		<!--artifact -->
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>${project.artifactId}-*.jar</include>
-			</includes>
-			<fileMode>0444</fileMode>
-		</fileSet>
-	</fileSets>
+			<sources>
+				<includeModuleDirectory>false</includeModuleDirectory>
+				<fileSets>
+					<!--scripts -->
+					<fileSet>
+						<directory>src/main/scripts</directory>
+						<outputDirectory>bin</outputDirectory>
+						<includes>
+							<include>*.sh</include>
+						</includes>
+						<fileMode>0755</fileMode>
+						<lineEnding>unix</lineEnding>
+					</fileSet>
+					<fileSet>
+						<directory>src/main/config</directory>
+						<outputDirectory>config</outputDirectory>
+					</fileSet>
+					<!--artifact -->
+					<fileSet>
+						<directory>target</directory>
+						<outputDirectory>/</outputDirectory>
+						<includes>
+							<include>${project.artifactId}-*.jar</include>
+						</includes>
+						<fileMode>0444</fileMode>
+					</fileSet>
+				</fileSets>
+			</sources>
+		</moduleSet>
+	</moduleSets>
 </assembly>

apollo-configservice/src/main/scripts/common.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# directories
-SYSOUT_LOG=$LOG_PATH/sysout.log
-mkdir -p $LOG_PATH
-PID_PATH_NAME=$SERVICE_NAME".pid"
-
-case $1 in
-    start)
-        echo "Starting $SERVICE_NAME ..."
-        if [ ! -f $PID_PATH_NAME ]; then
-            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
-                        echo $! > $PID_PATH_NAME
-            echo "$SERVICE_NAME started ..."
-        else
-            echo "$SERVICE_NAME is already running ..."
-        fi
-    ;;
-    stop)
-        if [ -f $PID_PATH_NAME ]; then
-            PID=$(cat $PID_PATH_NAME);
-            echo "$SERVICE_NAME stopping ..."
-            kill $PID;
-            echo "$SERVICE_NAME stopped ..."
-            rm $PID_PATH_NAME
-        else
-            echo "$SERVICE_NAME is not running ..."
-        fi
-    ;;
-    restart)
-        if [ -f $PID_PATH_NAME ]; then
-            PID=$(cat $PID_PATH_NAME);
-            echo "$SERVICE_NAME stopping ...";
-            kill $PID;
-            echo "$SERVICE_NAME stopped ...";
-            rm $PID_PATH_NAME
-            echo "$SERVICE_NAME starting ..."
-            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
-                        echo $! > $PID_PATH_NAME
-            echo "$SERVICE_NAME started ..."
-        else
-            echo "$SERVICE_NAME is not running ..."
-        fi
-    ;;
-esac
-exit 0

apollo-core/src/main/java/com/ctrip/apollo/Apollo.java

@@ -4,5 +4,6 @@ package com.ctrip.apollo;
  * @author Jason Song(song_s@ctrip.com)
  */
 public class Apollo {
-  public final static String VERSION = "java-0.0.1-SNAPSHOT";
+  public final static String VERSION =
+      "java-" + Apollo.class.getPackage().getImplementationVersion();
 }

apollo-portal/src/assembly/assembly-descriptor.xml

@@ -2,33 +2,46 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<id>apollo-portal</id>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<!--scripts -->
-		<fileSet>
-			<directory>src/main/scripts</directory>
-			<outputDirectory>bin</outputDirectory>
+	<moduleSets>
+		<moduleSet>
+			<useAllReactorProjects>true</useAllReactorProjects>
 			<includes>
-				<include>*.sh</include>
+				<include>*:apollo-buildtools:*</include>
+				<include>*:apollo-portal:*</include>
 			</includes>
-			<fileMode>0755</fileMode>
-			<lineEnding>unix</lineEnding>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/config</directory>
-			<outputDirectory>config</outputDirectory>
-		</fileSet>
-		<!--artifact -->
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>${project.artifactId}-*.jar</include>
-			</includes>
-			<fileMode>0444</fileMode>
-		</fileSet>
-	</fileSets>
+			<sources>
+				<includeModuleDirectory>false</includeModuleDirectory>
+				<fileSets>
+					<!--scripts -->
+					<fileSet>
+						<directory>src/main/scripts</directory>
+						<outputDirectory>bin</outputDirectory>
+						<includes>
+							<include>*.sh</include>
+						</includes>
+						<fileMode>0755</fileMode>
+						<lineEnding>unix</lineEnding>
+					</fileSet>
+					<fileSet>
+						<directory>src/main/config</directory>
+						<outputDirectory>config</outputDirectory>
+					</fileSet>
+					<!--artifact -->
+					<fileSet>
+						<directory>target</directory>
+						<outputDirectory>/</outputDirectory>
+						<includes>
+							<include>${project.artifactId}-*.jar</include>
+						</includes>
+						<fileMode>0444</fileMode>
+					</fileSet>
+				</fileSets>
+			</sources>
+		</moduleSet>
+	</moduleSets>
 </assembly>

apollo-portal/src/main/scripts/common.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# directories
-SYSOUT_LOG=$LOG_PATH/sysout.log
-mkdir -p $LOG_PATH
-PID_PATH_NAME=$SERVICE_NAME".pid"
-
-case $1 in
-    start)
-        echo "Starting $SERVICE_NAME ..."
-        if [ ! -f $PID_PATH_NAME ]; then
-            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
-                        echo $! > $PID_PATH_NAME
-            echo "$SERVICE_NAME started ..."
-        else
-            echo "$SERVICE_NAME is already running ..."
-        fi
-    ;;
-    stop)
-        if [ -f $PID_PATH_NAME ]; then
-            PID=$(cat $PID_PATH_NAME);
-            echo "$SERVICE_NAME stopping ..."
-            kill $PID;
-            echo "$SERVICE_NAME stopped ..."
-            rm $PID_PATH_NAME
-        else
-            echo "$SERVICE_NAME is not running ..."
-        fi
-    ;;
-    restart)
-        if [ -f $PID_PATH_NAME ]; then
-            PID=$(cat $PID_PATH_NAME);
-            echo "$SERVICE_NAME stopping ...";
-            kill $PID;
-            echo "$SERVICE_NAME stopped ...";
-            rm $PID_PATH_NAME
-            echo "$SERVICE_NAME starting ..."
-            nohup java -jar $PATH_TO_JAR /tmp 2>> $SYSOUT_LOG >> $SYSOUT_LOG &
-                        echo $! > $PID_PATH_NAME
-            echo "$SERVICE_NAME started ..."
-        else
-            echo "$SERVICE_NAME is not running ..."
-        fi
-    ;;
-esac
-exit 0

pom.xml

@@ -84,7 +84,6 @@
 		<jetty.version>9.2.15.v20160210</jetty.version>
 		<github.global.server>github</github.global.server>
 		<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
-		<github.path></github.path>
 	</properties>
 
 	<modules>
@@ -250,7 +249,7 @@
 						<dependency>
 							<groupId>com.ctrip.apollo</groupId>
 							<artifactId>apollo-buildtools</artifactId>
-							<version>0.0.1-SNAPSHOT</version>
+							<version>${project.version}</version>
 						</dependency>
 					</dependencies>
 					<configuration>
@@ -283,6 +282,16 @@
 						</dependency>
 					</dependencies>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>2.6</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.5.3</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -294,6 +303,22 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>