Skip to content

A
apollo
Commit 471c659a by Yiming Liu
Options

Update assembly descriptor to support share scripts

parent b825d963
Showing with 116 additions and 163 deletions
apollo-adminservice/src/assembly/assembly-descriptor.xml
...@@ -2,33 +2,46 @@ ...@@ -2,33 +2,46 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<fileSets> <moduleSets>
<!--scripts --> <moduleSet>
<fileSet> <useAllReactorProjects>true</useAllReactorProjects>
<directory>src/main/scripts</directory>
<outputDirectory>bin</outputDirectory>
<includes> <includes>
<include>*.sh</include> <include>*:apollo-buildtools:*</include>
<include>*:apollo-adminervice:*</include>
</includes> </includes>
<fileMode>0755</fileMode> <sources>
<lineEnding>unix</lineEnding> <includeModuleDirectory>false</includeModuleDirectory>
</fileSet> <fileSets>
<fileSet> <!--scripts -->
<directory>src/main/config</directory> <fileSet>
<outputDirectory>config</outputDirectory> <directory>src/main/scripts</directory>
</fileSet> <outputDirectory>bin</outputDirectory>
<!--artifact --> <includes>
<fileSet> <include>*.sh</include>
<directory>target</directory> </includes>
<outputDirectory>/</outputDirectory> <fileMode>0755</fileMode>
<includes> <lineEnding>unix</lineEnding>
<include>${project.artifactId}-*.jar</include> </fileSet>
</includes> <fileSet>
<fileMode>0444</fileMode> <directory>src/main/config</directory>
</fileSet> <outputDirectory>config</outputDirectory>
</fileSets> </fileSet>
<!--artifact -->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.artifactId}-*.jar</include>
</includes>
<fileMode>0444</fileMode>
</fileSet>
</fileSets>
</sources>
</moduleSet>
</moduleSets>
</assembly> </assembly>
\ No newline at end of file
apollo-configservice/src/assembly/assembly-descriptor.xml
...@@ -2,33 +2,46 @@ ...@@ -2,33 +2,46 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<fileSets> <moduleSets>
<!--scripts --> <moduleSet>
<fileSet> <useAllReactorProjects>true</useAllReactorProjects>
<directory>src/main/scripts</directory>
<outputDirectory>bin</outputDirectory>
<includes> <includes>
<include>*.sh</include> <include>*:apollo-buildtools:*</include>
<include>*:apollo-configservice:*</include>
</includes> </includes>
<fileMode>0755</fileMode> <sources>
<lineEnding>unix</lineEnding> <includeModuleDirectory>false</includeModuleDirectory>
</fileSet> <fileSets>
<fileSet> <!--scripts -->
<directory>src/main/config</directory> <fileSet>
<outputDirectory>config</outputDirectory> <directory>src/main/scripts</directory>
</fileSet> <outputDirectory>bin</outputDirectory>
<!--artifact --> <includes>
<fileSet> <include>*.sh</include>
<directory>target</directory> </includes>
<outputDirectory>/</outputDirectory> <fileMode>0755</fileMode>
<includes> <lineEnding>unix</lineEnding>
<include>${project.artifactId}-*.jar</include> </fileSet>
</includes> <fileSet>
<fileMode>0444</fileMode> <directory>src/main/config</directory>
</fileSet> <outputDirectory>config</outputDirectory>
</fileSets> </fileSet>
<!--artifact -->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.artifactId}-*.jar</include>
</includes>
<fileMode>0444</fileMode>
</fileSet>
</fileSets>
</sources>
</moduleSet>
</moduleSets>
</assembly> </assembly>
\ No newline at end of file
apollo-configservice/src/main/scripts/common.sh deleted 100644 → 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
apollo-portal/src/assembly/assembly-descriptor.xml
...@@ -2,33 +2,46 @@ ...@@ -2,33 +2,46 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<fileSets> <moduleSets>
<!--scripts --> <moduleSet>
<fileSet> <useAllReactorProjects>true</useAllReactorProjects>
<directory>src/main/scripts</directory>
<outputDirectory>bin</outputDirectory>
<includes> <includes>
<include>*.sh</include> <include>*:apollo-buildtools:*</include>
<include>*:apollo-portal:*</include>
</includes> </includes>
<fileMode>0755</fileMode> <sources>
<lineEnding>unix</lineEnding> <includeModuleDirectory>false</includeModuleDirectory>
</fileSet> <fileSets>
<fileSet> <!--scripts -->
<directory>src/main/config</directory> <fileSet>
<outputDirectory>config</outputDirectory> <directory>src/main/scripts</directory>
</fileSet> <outputDirectory>bin</outputDirectory>
<!--artifact --> <includes>
<fileSet> <include>*.sh</include>
<directory>target</directory> </includes>
<outputDirectory>/</outputDirectory> <fileMode>0755</fileMode>
<includes> <lineEnding>unix</lineEnding>
<include>${project.artifactId}-*.jar</include> </fileSet>
</includes> <fileSet>
<fileMode>0444</fileMode> <directory>src/main/config</directory>
</fileSet> <outputDirectory>config</outputDirectory>
</fileSets> </fileSet>
<!--artifact -->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.artifactId}-*.jar</include>
</includes>
<fileMode>0444</fileMode>
</fileSet>
</fileSets>
</sources>
</moduleSet>
</moduleSets>
</assembly> </assembly>
\ No newline at end of file
apollo-portal/src/main/scripts/common.sh deleted 100644 → 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
pom.xml
...@@ -284,6 +284,11 @@ ...@@ -284,6 +284,11 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <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> <artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version> <version>2.5.3</version>
</plugin> </plugin>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment