diff options
Diffstat (limited to 'msb-core/distributions')
5 files changed, 119 insertions, 0 deletions
diff --git a/msb-core/distributions/standalone/pom.xml b/msb-core/distributions/standalone/pom.xml index ee17e28..b502b36 100644 --- a/msb-core/distributions/standalone/pom.xml +++ b/msb-core/distributions/standalone/pom.xml @@ -96,6 +96,13 @@ <version>${project.version}</version> <optional>true</optional> </dependency> + <dependency> + <groupId>org.openo.common-services.microservice-bus</groupId> + <artifactId>eag-openresty-ext</artifactId> + <type>zip</type> + <version>${project.version}</version> + <optional>true</optional> + </dependency> </dependencies> @@ -225,6 +232,35 @@ <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename> </configuration> </execution> + + <execution> + <id>eag-unpacktolinux64</id> + <goals> + <goal>unpack</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.openo.common-services.microservice-bus</groupId> + <artifactId>openresty</artifactId> + <type>tar.gz</type> + <classifier>linux64</classifier> + </artifactItem> + <artifactItem> + <groupId>org.openo.common-services.microservice-bus</groupId> + <artifactId>eag-openresty-ext</artifactId> + <type>zip</type> + </artifactItem> + </artifactItems> + <excludes>**/*.bat,*.cmd</excludes> + <outputDirectory>${linux64outputdir}/eag</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename> + </configuration> + </execution> + <execution> <id>unpacktowin64</id> <goals> @@ -268,6 +304,34 @@ <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename> </configuration> </execution> + + <execution> + <id>eag-unpacktowin64</id> + <goals> + <goal>unpack</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.openo.common-services.microservice-bus</groupId> + <artifactId>openresty</artifactId> + <type>zip</type> + <classifier>win64</classifier> + </artifactItem> + <artifactItem> + <groupId>org.openo.common-services.microservice-bus</groupId> + <artifactId>eag-openresty-ext</artifactId> + <type>zip</type> + </artifactItem> + </artifactItems> + <excludes>*.sh,*/*.sh,*/*/*.sh</excludes> + <outputDirectory>${win64outputdir}/eag</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename> + </configuration> + </execution> </executions> </plugin> @@ -275,6 +339,44 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> + + <execution> + <id>prepare-eag-openresty-linux</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <copy todir="${linux64outputdir}/eag/"> + <fileset dir="${linux64outputdir}/eag/openresty"/> + </copy> + <delete + dir="${linux64outputdir}/eag/openresty" + includeemptydirs="true"/> + </target> + </configuration> + </execution> + + <execution> + <id>prepare-eag-openresty-win</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <copy todir="${win64outputdir}/eag/"> + <fileset dir="${win64outputdir}/eag/openresty"/> + </copy> + <delete + dir="${win64outputdir}/eag/openresty" + includeemptydirs="true"/> + </target> + </configuration> + </execution> + + <execution> <id>distribution</id> <phase>package</phase> diff --git a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat b/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat index cdc98b8..c2cce3b 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat @@ -29,6 +29,9 @@ rem For /f %%i in (%~dp0\stop.tmp) DO start %%i echo ### Stopping openresty start /D %RUNHOME%openresty stop.bat +echo ### Stopping external API gateway +start /D %RUNHOME%eag stop.bat + echo ### Stopping apiroute start /D %RUNHOME%apiroute stop.bat diff --git a/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh b/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh index 2bb2a84..0c19f3f 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh +++ b/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh @@ -28,6 +28,12 @@ cd ./openresty ./stop.sh & cd $RUNHOME +echo "### Stopping external API gateway..."; +# nohup ./startup.sh >>./nohup.log 2>&1 & +cd ./eag +./stop.sh & +cd $RUNHOME + echo "\n\n### Stopping apiroute" cd ./apiroute ./stop.sh & diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup.bat b/msb-core/distributions/standalone/src/assembly/resource/startup.bat index e7f8cf3..a85ace7 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/startup.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/startup.bat @@ -35,6 +35,9 @@ start /D %RUNHOME%apiroute run.bat run echo ### Starting openresty start /D %RUNHOME%openresty run.bat +echo ### Starting external API gateway +start /D %RUNHOME%eag run.bat + echo Startup will be finished in background... echo + Run "start .\apiroute-works\logs\application.log" to see what's happening echo + Wait a minute diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup.sh b/msb-core/distributions/standalone/src/assembly/resource/startup.sh index bcc0865..e0fee7d 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/startup.sh +++ b/msb-core/distributions/standalone/src/assembly/resource/startup.sh @@ -41,6 +41,11 @@ cd ./openresty ./run.sh & cd $RUNHOME +echo "### Starting external API gateway..."; +# nohup ./startup.sh >>./nohup.log 2>&1 & +cd ./eag +./run.sh & +cd $RUNHOME echo "Startup will be finished in background..."; echo " + Run 'tail ./apiroute-works/logs/application.log -f' to see what's happening"; |