diff --git a/apollo-adminservice/src/assembly/assembly-descriptor.xml b/apollo-adminservice/src/assembly/assembly-descriptor.xml
index 992e364a19e808ea99441c4726eaf1d3aceb8a9a..34a9d9b97874c0ada4db86645c17d9a7c59b593e 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">
+ apollo-adminservice
zip
false
-
-
-
- src/main/scripts
- bin
+
+
+ true
- *.sh
+ *:apollo-buildtools:*
+ *:apollo-adminervice:*
- 0755
- unix
-
-
- src/main/config
- config
-
-
-
- target
- /
-
- ${project.artifactId}-*.jar
-
- 0444
-
-
+
+ false
+
+
+
+ src/main/scripts
+ bin
+
+ *.sh
+
+ 0755
+ unix
+
+
+ src/main/config
+ config
+
+
+
+ target
+ /
+
+ ${project.artifactId}-*.jar
+
+ 0444
+
+
+
+
+
\ 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 992e364a19e808ea99441c4726eaf1d3aceb8a9a..a2aa7bcf5bd8f5f2dab4707a46e2248532c3aec6 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">
+ apollo-configservice
zip
false
-
-
-
- src/main/scripts
- bin
+
+
+ true
- *.sh
+ *:apollo-buildtools:*
+ *:apollo-configservice:*
- 0755
- unix
-
-
- src/main/config
- config
-
-
-
- target
- /
-
- ${project.artifactId}-*.jar
-
- 0444
-
-
+
+ false
+
+
+
+ src/main/scripts
+ bin
+
+ *.sh
+
+ 0755
+ unix
+
+
+ src/main/config
+ config
+
+
+
+ target
+ /
+
+ ${project.artifactId}-*.jar
+
+ 0444
+
+
+
+
+
\ 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 fbe419a1bce0fba3c6d877ed2715ffc2e13a9939..0000000000000000000000000000000000000000
--- 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 992e364a19e808ea99441c4726eaf1d3aceb8a9a..250336abe317f6704e9ff9e62312ed7a137e0ef9 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">
+ apollo-portal
zip
false
-
-
-
- src/main/scripts
- bin
+
+
+ true
- *.sh
+ *:apollo-buildtools:*
+ *:apollo-portal:*
- 0755
- unix
-
-
- src/main/config
- config
-
-
-
- target
- /
-
- ${project.artifactId}-*.jar
-
- 0444
-
-
+
+ false
+
+
+
+ src/main/scripts
+ bin
+
+ *.sh
+
+ 0755
+ unix
+
+
+ src/main/config
+ config
+
+
+
+ target
+ /
+
+ ${project.artifactId}-*.jar
+
+ 0444
+
+
+
+
+
\ 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 fbe419a1bce0fba3c6d877ed2715ffc2e13a9939..0000000000000000000000000000000000000000
--- 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 7d208303a3b37a7d802f5b68d74eb3e04d85fbe6..92249fbba6d22d6dbc7a80f8907217a185e34509 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,6 +282,11 @@
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 2.6
+
org.apache.maven.plugins
maven-release-plugin