From c656c085cf327eea0e149c956e6e63b85c2b8427 Mon Sep 17 00:00:00 2001 From: YonggangWang Date: Tue, 21 Mar 2017 14:11:10 +0800 Subject: Use redis binary from OPEN-O Nexus to build Issue-id: OCS-174 Modify Maven Scripts to Download Redis Binary from OPEN-O Nexus for MSB Building Change-Id: Ie8088eba0845034f19585fc9e77031227b1df92e Signed-off-by: YonggangWang --- .../src/assembly/resources/redis/BGREWRITEAOF.bat | 45 ------------------ .../src/assembly/resources/redis/BGREWRITEAOF.sh | 32 ------------- .../src/assembly/resources/redis/redisService.exe | Bin 59392 -> 0 bytes .../src/assembly/resources/redis/redisService.xml | 33 ------------- .../redis-ext/src/assembly/resources/redis/run.bat | 51 --------------------- .../redis-ext/src/assembly/resources/redis/run.sh | 34 -------------- .../src/assembly/resources/redis/stop.bat | 45 ------------------ .../redis-ext/src/assembly/resources/redis/stop.sh | 32 ------------- 8 files changed, 272 deletions(-) delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/redisService.exe delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/redisService.xml delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/run.bat delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/run.sh delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/stop.bat delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/stop.sh (limited to 'msb-core/redis-ext/src/assembly/resources/redis') diff --git a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat deleted file mode 100644 index 2fd7cc0..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat +++ /dev/null @@ -1,45 +0,0 @@ -@REM -@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. -@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 close redis-server -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=. - -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% - -set HOME=%DIRNAME% -set _REDISCLIENT=%DIRNAME%redis-cli.exe - - -echo ================Redis config info ============================================= -echo Redis_HOME=$HOME -echo TIP:This shell script rewrite the AOF file in the background！ -echo =============================================================================== - - -cd /d "%HOME%" -echo @WORK_DIR@%HOME% -echo @C_CMD@ "%_REDISCLIENT% -p 6379 BGREWRITEAOF" -%_REDISCLIENT% -p 6379 BGREWRITEAOF -echo closing signal has been sent,stopping in background,WAIT... -timeout /t 2 /nobreak > nul -exit diff --git a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh deleted file mode 100644 index d6d0b1b..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# 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. -# 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. -# -# Author: Zhaoxing Meng -# email: meng.zhaoxing1@zte.com.cn -# - -DIRNAME=`dirname $0` -HOME=`cd $DIRNAME/; pwd` -_REDISCLIENT="$HOME/redis-cli" - -echo ===================== Redis info ============================================= -echo Redis_HOME=$HOME -echo TIP:This shell script rewrite the AOF file in the background! -echo =============================================================================== -cd $HOME; pwd - -echo @C_CMD@ $_REDISCLIENT -p 6379 BGREWRITEAOF -$_REDISCLIENT -p 6379 BGREWRITEAOF diff --git a/msb-core/redis-ext/src/assembly/resources/redis/redisService.exe b/msb-core/redis-ext/src/assembly/resources/redis/redisService.exe deleted file mode 100644 index c6e8fc2..0000000 Binary files a/msb-core/redis-ext/src/assembly/resources/redis/redisService.exe and /dev/null differ diff --git a/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml b/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml deleted file mode 100644 index af24dab..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - msb_redis - msb_redis - This service runs redis. - %BASE% - - redis-server.exe - redis.conf - redis-cli.exe - shutdown - rotate - - \ No newline at end of file diff --git a/msb-core/redis-ext/src/assembly/resources/redis/run.bat b/msb-core/redis-ext/src/assembly/resources/redis/run.bat deleted file mode 100644 index fb92460..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/run.bat +++ /dev/null @@ -1,51 +0,0 @@ -@REM -@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. -@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 redis-server -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=. - -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% - -set HOME=%DIRNAME% -set _REDISCMD=%DIRNAME%redis-server.exe -set _REDISCONF=%DIRNAME%redis.conf - - -echo ================Redis config info ============================================= -echo Redis_HOME=%HOME% -echo config file=$_REDISCONF -echo Help:use $_REDISCMD --help for help -echo =============================================================================== - - -cd /d "%HOME%" -echo @WORK_DIR@%HOME% -echo @C_CMD@ "%_REDISCMD% %_REDISCONF%" -%_REDISCMD% %_REDISCONF% -IF ERRORLEVEL 1 goto showerror -exit -:showerror -echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check! -echo After checking, press any key to close -pause -exit diff --git a/msb-core/redis-ext/src/assembly/resources/redis/run.sh b/msb-core/redis-ext/src/assembly/resources/redis/run.sh deleted file mode 100644 index ff3e676..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/run.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# 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. -# 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. -# -# Author: Zhaoxing Meng -# email: meng.zhaoxing1@zte.com.cn -# - -DIRNAME=`dirname $0` -HOME=`cd $DIRNAME/; pwd` -_REDISCMD="$HOME/redis-server" -_REDISCONF="$HOME/redis.conf" - -echo =========== Redis config info ============================================= -echo Redis_HOME=$HOME -echo config file=$_REDISCONF -echo Help:use $_REDISCMD --help for help -echo =============================================================================== -cd $HOME; pwd - -echo @C_CMD@ $_REDISCMD $_REDISCONF -$_REDISCMD $_REDISCONF diff --git a/msb-core/redis-ext/src/assembly/resources/redis/stop.bat b/msb-core/redis-ext/src/assembly/resources/redis/stop.bat deleted file mode 100644 index 7d8ed4b..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/stop.bat +++ /dev/null @@ -1,45 +0,0 @@ -@REM -@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. -@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 close redis-server -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=. - -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% - -set HOME=%DIRNAME% -set _REDISCLIENT=%DIRNAME%redis-cli.exe - - -echo ================Redis config info ============================================= -echo Redis_HOME=$HOME -echo TIP:This shell script close the Redis instance listening on 6379! -echo =============================================================================== - - -cd /d "%HOME%" -echo @WORK_DIR@%HOME% -echo @C_CMD@ "%_REDISCLIENT% -p 6379 shutdown" -%_REDISCLIENT% -p 6379 shutdown -echo closing signal has been sent,stopping in background,WAIT... -timeout /t 2 /nobreak > nul -exit diff --git a/msb-core/redis-ext/src/assembly/resources/redis/stop.sh b/msb-core/redis-ext/src/assembly/resources/redis/stop.sh deleted file mode 100644 index 94ab13e..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/stop.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# 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. -# 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. -# -# Author: Zhaoxing Meng -# email: meng.zhaoxing1@zte.com.cn -# - -DIRNAME=`dirname $0` -HOME=`cd $DIRNAME/; pwd` -_REDISCLIENT="$HOME/redis-cli" - -echo ===================== Redis info ============================================= -echo Redis_HOME=$HOME -echo TIP:This shell script close the Redis instance listening on 6379! -echo =============================================================================== -cd $HOME; pwd - -echo @C_CMD@ $_REDISCLIENT -p 6379 shutdown -$_REDISCLIENT -p 6379 shutdown -- cgit 1.2.3-korg