From 471c659ac01604be7d6613d0e5af12525384a8d4 Mon Sep 17 00:00:00 2001
From: Yiming Liu <liuyiming.vip@gmail.com>
Date: Thu, 28 Apr 2016 00:23:31 +0800
Subject: [PATCH] Update assembly descriptor to support share scripts

---
 .../src/assembly/assembly-descriptor.xml      | 59 +++++++++++--------
 .../src/main/scripts/common.sh                |  0
 .../src/assembly/assembly-descriptor.xml      | 59 +++++++++++--------
 .../src/main/scripts/common.sh                | 46 ---------------
 .../src/assembly/assembly-descriptor.xml      | 59 +++++++++++--------
 apollo-portal/src/main/scripts/common.sh      | 46 ---------------
 pom.xml                                       |  5 ++
 7 files changed, 113 insertions(+), 161 deletions(-)
 rename {apollo-adminservice => apollo-buildtools}/src/main/scripts/common.sh (100%)
 delete mode 100644 apollo-configservice/src/main/scripts/common.sh
 delete mode 100644 apollo-portal/src/main/scripts/common.sh

diff --git a/apollo-adminservice/src/assembly/assembly-descriptor.xml b/apollo-adminservice/src/assembly/assembly-descriptor.xml
index 992e364a1..34a9d9b97 100644
--- a/apollo-adminservice/src/assembly/assembly-descriptor.xml
+++ b/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>
\ No newline at end of file
diff --git a/apollo-adminservice/src/main/scripts/common.sh b/apollo-buildtools/src/main/scripts/common.sh
similarity index 100%
rename from apollo-adminservice/src/main/scripts/common.sh
rename to apollo-buildtools/src/main/scripts/common.sh
diff --git a/apollo-configservice/src/assembly/assembly-descriptor.xml b/apollo-configservice/src/assembly/assembly-descriptor.xml
index 992e364a1..a2aa7bcf5 100644
--- a/apollo-configservice/src/assembly/assembly-descriptor.xml
+++ b/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>
\ No newline at end of file
diff --git a/apollo-configservice/src/main/scripts/common.sh b/apollo-configservice/src/main/scripts/common.sh
deleted file mode 100644
index fbe419a1b..000000000
--- a/apollo-configservice/src/main/scripts/common.sh
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/apollo-portal/src/assembly/assembly-descriptor.xml b/apollo-portal/src/assembly/assembly-descriptor.xml
index 992e364a1..250336abe 100644
--- a/apollo-portal/src/assembly/assembly-descriptor.xml
+++ b/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>
\ No newline at end of file
diff --git a/apollo-portal/src/main/scripts/common.sh b/apollo-portal/src/main/scripts/common.sh
deleted file mode 100644
index fbe419a1b..000000000
--- a/apollo-portal/src/main/scripts/common.sh
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7d208303a..92249fbba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,6 +282,11 @@
 						</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>
-- 
GitLab