Issue-id: OCS-9

Change-Id: I73c18bdda656c43687810930338f9a949ed08848
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>

12 files changed, 187 insertions, 185 deletions

diff --git a/msb-core/distributions/pom.xml b/msb-core/distributions/pom.xml
index e732e6d..ace200a 100644
--- a/msb-core/distributions/pom.xml
+++ b/msb-core/distributions/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+
+    Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-            http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
+        Author: Zhaoxing Meng
+        email: meng.zhaoxing1@zte.com.cn
+
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
diff --git a/msb-core/distributions/standalone/pom.xml b/msb-core/distributions/standalone/pom.xml
index a2b9a5c..cddca6b 100644
--- a/msb-core/distributions/standalone/pom.xml
+++ b/msb-core/distributions/standalone/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+
+    Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-            http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
+        Author: Zhaoxing Meng
+        email: meng.zhaoxing1@zte.com.cn
+
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat
index f7b3b24..2c80731 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat
+++ b/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat
@@ -1,34 +1,38 @@
-@REM

-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)

-@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.

-@REM You may obtain a copy of the License at

-@REM

-@REM         http://www.apache.org/licenses/LICENSE-2.0

-@REM

-@REM Unless required by applicable law or agreed to in writing, software

-@REM distributed under the License is distributed on an "AS IS" BASIS,

-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-@REM See the License for the specific language governing permissions and

-@REM limitations under the License.

-@REM

-@echo off

-title msb install services

-

-set RUNHOME=%~dp0

-

-echo ### install redis

-cd "%RUNHOME%\redis"

-redisService.exe install

-

-echo ### install apiroute

-cd "%RUNHOME%\apiroute"

-apirouteService.exe install

-

-echo ### install openresty

-cd "%RUNHOME%\openresty\nginx"

-openrestyService.exe install

-

-:finalend

+@REM
+@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
+@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.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+@REM     Author: Zhaoxing Meng
+@REM     email: meng.zhaoxing1@zte.com.cn
+@REM
+
+@echo off
+title msb install services
+
+set RUNHOME=%~dp0
+
+echo ### install redis
+cd "%RUNHOME%\redis"
+redisService.exe install
+
+echo ### install apiroute
+cd "%RUNHOME%\apiroute"
+apirouteService.exe install
+
+echo ### install openresty
+cd "%RUNHOME%\openresty\nginx"
+openrestyService.exe install
+
+:finalend
 cd "%RUNHOME%"
\ No newline at end of file
diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat
index 4b28af8..71f702f 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat
+++ b/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat
@@ -1,34 +1,38 @@
-@REM

-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)

-@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.

-@REM You may obtain a copy of the License at

-@REM

-@REM         http://www.apache.org/licenses/LICENSE-2.0

-@REM

-@REM Unless required by applicable law or agreed to in writing, software

-@REM distributed under the License is distributed on an "AS IS" BASIS,

-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-@REM See the License for the specific language governing permissions and

-@REM limitations under the License.

-@REM

-@echo off

-title msb restart services

-

-set RUNHOME=%~dp0

-

-echo ### restart redis

-cd "%RUNHOME%\redis"

-redisService.exe restart

-

-echo ### restart apiroute

-cd "%RUNHOME%\apiroute"

-apirouteService.exe restart

-

-echo ### restart openresty

-cd "%RUNHOME%\openresty\nginx"

-openrestyService.exe restart

-

-:finalend

+@REM
+@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
+@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.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+@REM     Author: Zhaoxing Meng
+@REM     email: meng.zhaoxing1@zte.com.cn
+@REM
+
+@echo off
+title msb restart services
+
+set RUNHOME=%~dp0
+
+echo ### restart redis
+cd "%RUNHOME%\redis"
+redisService.exe restart
+
+echo ### restart apiroute
+cd "%RUNHOME%\apiroute"
+apirouteService.exe restart
+
+echo ### restart openresty
+cd "%RUNHOME%\openresty\nginx"
+openrestyService.exe restart
+
+:finalend
 cd "%RUNHOME%"
\ No newline at end of file
diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat
index 138fd03..d143759 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat
+++ b/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat
@@ -1,34 +1,38 @@
-@REM

-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)

-@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.

-@REM You may obtain a copy of the License at

-@REM

-@REM         http://www.apache.org/licenses/LICENSE-2.0

-@REM

-@REM Unless required by applicable law or agreed to in writing, software

-@REM distributed under the License is distributed on an "AS IS" BASIS,

-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-@REM See the License for the specific language governing permissions and

-@REM limitations under the License.

-@REM

-@echo off

-title msb status services

-

-set RUNHOME=%~dp0

-

-echo ### status redis

-cd "%RUNHOME%\redis"

-redisService.exe status

-

-echo ### status apiroute

-cd "%RUNHOME%\apiroute"

-apirouteService.exe status

-

-echo ### status openresty

-cd "%RUNHOME%\openresty\nginx"

-openrestyService.exe status

-

-:finalend

+@REM
+@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
+@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.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+@REM     Author: Zhaoxing Meng
+@REM     email: meng.zhaoxing1@zte.com.cn
+@REM
+
+@echo off
+title msb status services
+
+set RUNHOME=%~dp0
+
+echo ### status redis
+cd "%RUNHOME%\redis"
+redisService.exe status
+
+echo ### status apiroute
+cd "%RUNHOME%\apiroute"
+apirouteService.exe status
+
+echo ### status openresty
+cd "%RUNHOME%\openresty\nginx"
+openrestyService.exe status
+
+:finalend
 cd "%RUNHOME%"
\ No newline at end of file
diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat
index b1cd76e..0f1a89e 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat
+++ b/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat
@@ -1,37 +1,41 @@
-@REM

-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)

-@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.

-@REM You may obtain a copy of the License at

-@REM

-@REM         http://www.apache.org/licenses/LICENSE-2.0

-@REM

-@REM Unless required by applicable law or agreed to in writing, software

-@REM distributed under the License is distributed on an "AS IS" BASIS,

-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-@REM See the License for the specific language governing permissions and

-@REM limitations under the License.

-@REM

-@echo off

-title msb uninstall services

-

-set RUNHOME=%~dp0

-

-echo ### uninstall redis

-cd "%RUNHOME%\redis"

-redisService.exe stop

-redisService.exe uninstall

-

-echo ### uninstall apiroute

-cd "%RUNHOME%\apiroute"

-apirouteService.exe stop

-apirouteService.exe uninstall

-

-echo ### uninstall openresty

-cd "%RUNHOME%\openresty\nginx"

-openrestyService.exe stop

-openrestyService.exe uninstall

-

-:finalend

+@REM
+@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
+@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.
+@REM You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+@REM     Author: Zhaoxing Meng
+@REM     email: meng.zhaoxing1@zte.com.cn
+@REM
+
+@echo off
+title msb uninstall services
+
+set RUNHOME=%~dp0
+
+echo ### uninstall redis
+cd "%RUNHOME%\redis"
+redisService.exe stop
+redisService.exe uninstall
+
+echo ### uninstall apiroute
+cd "%RUNHOME%\apiroute"
+apirouteService.exe stop
+apirouteService.exe uninstall
+
+echo ### uninstall openresty
+cd "%RUNHOME%\openresty\nginx"
+openrestyService.exe stop
+openrestyService.exe uninstall
+
+:finalend
 cd "%RUNHOME%"
\ No newline at end of file
diff --git a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat b/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat
index c304747..cdc98b8 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat
+++ b/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat
@@ -1,11 +1,11 @@
 @REM
-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
 @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.
 @REM You may obtain a copy of the License at
 @REM
-@REM         http://www.apache.org/licenses/LICENSE-2.0
+@REM     http://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing, software
 @REM distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,10 @@
 @REM See the License for the specific language governing permissions and
 @REM limitations under the License.
 @REM
+@REM     Author: Zhaoxing Meng
+@REM     email: meng.zhaoxing1@zte.com.cn
+@REM
+
 @echo off
 title stopping msb
 
diff --git a/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh b/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh
index 653eef4..2bb2a84 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh
+++ b/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+#     Author: Zhaoxing Meng
+#     email: meng.zhaoxing1@zte.com.cn
+#
+
 DIRNAME=`dirname $0`
 RUNHOME=`cd $DIRNAME/; pwd`
 echo @RUNHOME@ $RUNHOME
diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup.bat b/msb-core/distributions/standalone/src/assembly/resource/startup.bat
index 7373d05..e7f8cf3 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/startup.bat
+++ b/msb-core/distributions/standalone/src/assembly/resource/startup.bat
@@ -1,11 +1,11 @@
 @REM
-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
 @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.
 @REM You may obtain a copy of the License at
 @REM
-@REM         http://www.apache.org/licenses/LICENSE-2.0
+@REM     http://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing, software
 @REM distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,10 @@
 @REM See the License for the specific language governing permissions and
 @REM limitations under the License.
 @REM
+@REM     Author: Zhaoxing Meng
+@REM     email: meng.zhaoxing1@zte.com.cn
+@REM
+
 @echo off
 title msb
 
diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup.sh b/msb-core/distributions/standalone/src/assembly/resource/startup.sh
index 1d785ce..bcc0865 100644
--- a/msb-core/distributions/standalone/src/assembly/resource/startup.sh
+++ b/msb-core/distributions/standalone/src/assembly/resource/startup.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+#     Author: Zhaoxing Meng
+#     email: meng.zhaoxing1@zte.com.cn
+#
+
 DIRNAME=`dirname $0`
 RUNHOME=`cd $DIRNAME/; pwd`
 echo @RUNHOME@ $RUNHOME
diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup4docker.sh b/msb-core/distributions/standalone/src/assembly/resource/startup4docker.sh
deleted file mode 100644
index 134f1fe..0000000
--- a/msb-core/distributions/standalone/src/assembly/resource/startup4docker.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-DIRNAME=`dirname $0`
-RUNHOME=`cd $DIRNAME/; pwd`
-echo @RUNHOME@ $RUNHOME
-
-echo "### Starting redis...";
-cd ./redis
-./run.sh 
-cd $RUNHOME
-
-echo "\n\n### Starting openresty...";
-cd ./openresty
-./run.sh 
-cd $RUNHOME
-
-echo "\n\n### Starting apiroute..."
-cd ./apiroute
-./run.sh
diff --git a/msb-core/distributions/standalone/src/main/docker/Dockerfile b/msb-core/distributions/standalone/src/main/docker/Dockerfile
deleted file mode 100644
index 8023ff4..0000000
--- a/msb-core/distributions/standalone/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8-alpine

-ADD msb-standalone-1.0.0-SNAPSHOT-linux64.tar.gz /opt/application

-WORKDIR /opt/application

-EXPOSE 10080

-ENTRYPOINT exec $PWD/startup4docker.sh
\ No newline at end of file