diff options
Diffstat (limited to 'msb-core/distributions/standalone')
| -rw-r--r-- | msb-core/distributions/standalone/pom.xml | 107 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat | 2 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat | 2 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat | 2 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat | 2 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/startup.bat | 5 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/startup.sh | 7 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/stop.bat (renamed from msb-core/distributions/standalone/src/assembly/resource/shutdown.bat) | 5 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/src/assembly/resource/stop.sh (renamed from msb-core/distributions/standalone/src/assembly/resource/shutdown.sh) | 8 |
9 files changed, 130 insertions, 10 deletions
diff --git a/msb-core/distributions/standalone/pom.xml b/msb-core/distributions/standalone/pom.xml index cddca6b..97f6a7c 100644 --- a/msb-core/distributions/standalone/pom.xml +++ b/msb-core/distributions/standalone/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -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> @@ -287,11 +389,13 @@ <tarfileset dir="target/assembly/linux64" filemode="0644" dirmode="0755"> <exclude name="**/*.sh"/> <exclude name="openresty/nginx/sbin/nginx"/> + <exclude name="eag/nginx/sbin/nginx"/> <exclude name="redis/redis-*"/> </tarfileset> <tarfileset dir="target/assembly/linux64" filemode="0755" dirmode="0755"> <include name="**/*.sh"/> <include name="openresty/nginx/sbin/nginx"/> + <include name="eag/nginx/sbin/nginx"/> <include name="redis/redis-*"/> </tarfileset> </tar> @@ -311,4 +415,3 @@ </build> </project> - diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat index 2c80731..d04d064 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat index 71f702f..c66a6e3 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat index d143759..3415747 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat index 0f1a89e..5a5bc0b 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup.bat b/msb-core/distributions/standalone/src/assembly/resource/startup.bat index e7f8cf3..30e23de 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/startup.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/startup.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. @@ -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..aa4117d 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/startup.sh +++ b/msb-core/distributions/standalone/src/assembly/resource/startup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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"; diff --git a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat b/msb-core/distributions/standalone/src/assembly/resource/stop.bat index cdc98b8..0ebe78e 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/stop.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. @@ -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/stop.sh index 2bb2a84..b7c570b 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh +++ b/msb-core/distributions/standalone/src/assembly/resource/stop.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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 & |