Skip to content

Commit

Permalink
Minor fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
TeamCity committed May 12, 2015
1 parent 6e7ecb2 commit 0c30071
Show file tree
Hide file tree
Showing 3,984 changed files with 60,671 additions and 5,121 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
15 changes: 14 additions & 1 deletion bin/ggrouter.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
::
:: @bat.file.header
:: Copyright (C) GridGain Systems. 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
::
:: 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.

:: _________ _____ __________________ _____
:: __ ____/___________(_)______ /__ ____/______ ____(_)_______
:: _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand Down
19 changes: 16 additions & 3 deletions bin/ggrouter.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
#!/bin/bash
#
# @sh.file.header
# Copyright (C) GridGain Systems. 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
#
# 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.

# _________ _____ __________________ _____
# __ ____/___________(_)______ /__ ____/______ ____(_)_______
# _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand All @@ -18,14 +31,14 @@
# Import common functions.
#
if [ "${GRIDGAIN_HOME}" = "" ];
then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";GRIDGAIN_HOME_TMP="$(dirname "${GRIDGAIN_HOME_TMP}")" # Will be removed in release.
then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
fi

#
# Set SCRIPTS_HOME - base path to scripts.
#
SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/os/bin" # Will be replaced by SCRIPTS_HOME=${GRIDGAIN_HOME_TMP}/bin in release.
SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/bin"

source "${SCRIPTS_HOME}"/include/functions.sh

Expand Down
27 changes: 20 additions & 7 deletions bin/ggstart.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
::
:: @bat.file.header
:: Copyright (C) GridGain Systems. 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
::
:: 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.

:: _________ _____ __________________ _____
:: __ ____/___________(_)______ /__ ____/______ ____(_)_______
:: _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand Down Expand Up @@ -46,7 +59,7 @@ goto error_finish
:: Check GRIDGAIN_HOME.
:checkGridGainHome1
if defined GRIDGAIN_HOME goto checkGridGainHome2
pushd "%~dp0"/../.. &:: Will be replaced by pushd "%~dp0"/..
pushd "%~dp0"/..
set GRIDGAIN_HOME=%CD%
popd

Expand Down Expand Up @@ -75,7 +88,7 @@ if exist "%GRIDGAIN_HOME%\config" goto checkGridGainHome4
::
:: Set SCRIPTS_HOME - base path to scripts.
::
set SCRIPTS_HOME=%GRIDGAIN_HOME%\os\bin &:: Will be replaced by SCRIPTS_HOME=${GRIDGAIN_HOME}\bin in release.
set SCRIPTS_HOME=%GRIDGAIN_HOME%\bin

:: Remove trailing spaces
for /l %%a in (1,1,31) do if /i "%SCRIPTS_HOME:~-1%" == " " set SCRIPTS_HOME=%SCRIPTS_HOME:~0,-1%
Expand All @@ -96,7 +109,7 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0%
:: Set GRIDGAIN_LIBS
::
call "%SCRIPTS_HOME%\include\setenv.bat"
call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release.

set CP=%GRIDGAIN_LIBS%

::
Expand Down Expand Up @@ -171,7 +184,7 @@ if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX
:: Assertions are disabled by default since version 3.5.
:: If you want to enable them - set 'ENABLE_ASSERTIONS' flag to '1'.
::
set ENABLE_ASSERTIONS=1
set ENABLE_ASSERTIONS=0

::
:: Set '-ea' options if assertions are enabled.
Expand All @@ -194,11 +207,11 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.gridgain.grid.startup.cmdline.GridCom

if "%INTERACTIVE%" == "1" (
"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^
-DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DGRIDGAIN_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
-DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DGRIDGAIN_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
-cp "%CP%" %MAIN_CLASS%
) else (
"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^
-DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DGRIDGAIN_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
-DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DGRIDGAIN_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
-cp "%CP%" %MAIN_CLASS% "%CONFIG%"
)

Expand Down
31 changes: 22 additions & 9 deletions bin/ggstart.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
#!/bin/bash
#
# @sh.file.header
# Copyright (C) GridGain Systems. 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
#
# 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.

# _________ _____ __________________ _____
# __ ____/___________(_)______ /__ ____/______ ____(_)_______
# _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand All @@ -18,14 +31,14 @@
# Import common functions.
#
if [ "${GRIDGAIN_HOME}" = "" ];
then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";GRIDGAIN_HOME_TMP="$(dirname "${GRIDGAIN_HOME_TMP}")" # Will be removed in release.
then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
fi

#
# Set SCRIPTS_HOME - base path to scripts.
#
SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/os/bin" # Will be replaced by SCRIPTS_HOME=${GRIDGAIN_HOME_TMP}/bin in release.
SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/bin"

source "${SCRIPTS_HOME}"/include/functions.sh

Expand All @@ -52,7 +65,7 @@ fi
# Set GRIDGAIN_LIBS.
#
. "${SCRIPTS_HOME}"/include/setenv.sh
. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.

CP="${GRIDGAIN_LIBS}"

RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.gridgain.grid.startup.cmdline.GridCommandLineRandomNumberGenerator)
Expand Down Expand Up @@ -104,7 +117,7 @@ fi
# Assertions are disabled by default since version 3.5.
# If you want to enable them - set 'ENABLE_ASSERTIONS' flag to '1'.
#
ENABLE_ASSERTIONS="1"
ENABLE_ASSERTIONS="0"

#
# Set '-ea' options if assertions are enabled.
Expand Down Expand Up @@ -134,25 +147,25 @@ do
case $osname in
Darwin*)
"$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS}
;;
*)
"$JAVA" ${JVM_OPTS} ${QUIET} "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS}
;;
esac
else
case $osname in
Darwin*)
"$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}"
;;
*)
"$JAVA" ${JVM_OPTS} ${QUIET} "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
-DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}"
;;
esac
Expand Down
23 changes: 18 additions & 5 deletions bin/ggvisorcmd.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
::
:: @bat.file.header
:: Copyright (C) GridGain Systems. 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
::
:: 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.

:: _________ _____ __________________ _____
:: __ ____/___________(_)______ /__ ____/______ ____(_)_______
:: _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand Down Expand Up @@ -42,7 +55,7 @@ goto error_finish
:: Check GRIDGAIN_HOME.
:checkGridGainHome1
if not "%GRIDGAIN_HOME%" == "" goto checkGridGainHome2
pushd "%~dp0"/../.. &:: Will be replaced by pushd "%~dp0"/..
pushd "%~dp0"/..
set GRIDGAIN_HOME=%CD%
popd

Expand Down Expand Up @@ -71,7 +84,7 @@ if exist "%GRIDGAIN_HOME%\config" goto checkGridGainHome4
::
:: Set SCRIPTS_HOME - base path to scripts.
::
set SCRIPTS_HOME=%GRIDGAIN_HOME%\os\bin &:: Will be replaced by SCRIPTS_HOME=${GRIDGAIN_HOME_TMP}\bin in release.
set SCRIPTS_HOME=%GRIDGAIN_HOME%\bin

:: Remove trailing spaces
for /l %%a in (1,1,31) do if /i "%SCRIPTS_HOME:~-1%" == " " set SCRIPTS_HOME=%SCRIPTS_HOME:~0,-1%
Expand All @@ -85,7 +98,7 @@ if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run
:: Set GRIDGAIN_LIBS
::
call "%SCRIPTS_HOME%\include\setenv.bat"
call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release.

set CP=%GRIDGAIN_HOME%\bin\include\visor-common\*;%GRIDGAIN_HOME%\bin\include\visorcmd\*;%GRIDGAIN_LIBS%

::
Expand Down Expand Up @@ -119,7 +132,7 @@ if "%JVM_OPTS_VISOR%" == "" set JVM_OPTS_VISOR=-Xms1g -Xmx1g -XX:MaxPermSize=128
:: Assertions are disabled by default since version 3.5.
:: If you want to enable them - set 'ENABLE_ASSERTIONS' flag to '1'.
::
set ENABLE_ASSERTIONS=1
set ENABLE_ASSERTIONS=0

::
:: Set '-ea' options if assertions are enabled.
Expand Down
27 changes: 20 additions & 7 deletions bin/ggvisorcmd.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
#!/bin/bash
#
# @sh.file.header
# Copyright (C) GridGain Systems. 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
#
# 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.

# _________ _____ __________________ _____
# __ ____/___________(_)______ /__ ____/______ ____(_)_______
# _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand All @@ -16,14 +29,14 @@
# Import common functions.
#
if [ "${GRIDGAIN_HOME}" = "" ];
then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";GRIDGAIN_HOME_TMP="$(dirname "${GRIDGAIN_HOME_TMP}")" # Will be removed in release.
then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
fi

#
# Set SCRIPTS_HOME - base path to scripts.
#
SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/os/bin" # Will be replaced by SCRIPTS_HOME=${GRIDGAIN_HOME_TMP}/bin in release.
SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/bin"

source "${SCRIPTS_HOME}"/include/functions.sh

Expand All @@ -46,7 +59,7 @@ setGridGainHome
# Set GRIDGAIN_LIBS.
#
. "${SCRIPTS_HOME}"/include/setenv.sh
. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.

CP="${GRIDGAIN_HOME}/bin/include/visor-common/*${SEP}${GRIDGAIN_HOME}/bin/include/visorcmd/*${SEP}${GRIDGAIN_LIBS}"

#
Expand All @@ -72,7 +85,7 @@ fi
# Assertions are disabled by default since version 3.5.
# If you want to enable them - set 'ENABLE_ASSERTIONS' flag to '1'.
#
ENABLE_ASSERTIONS="1"
ENABLE_ASSERTIONS="0"

#
# Set '-ea' options if assertions are enabled.
Expand Down Expand Up @@ -104,12 +117,12 @@ trap restoreSttySettings INT
case $osname in
Darwin*)
"$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" \
-DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DGRIDGAIN_PROG_NAME="$0" \
-DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DGRIDGAIN_PROG_NAME="$0" \
-DGRIDGAIN_DEPLOYMENT_MODE_OVERRIDE=ISOLATED ${JVM_XOPTS} -cp "${CP}" \
org.gridgain.visor.commands.VisorConsole
;;
*)
"$JAVA" ${JVM_OPTS} ${QUIET} -DGRIDGAIN_UPDATE_NOTIFIER=false \
"$JAVA" ${JVM_OPTS} ${QUIET} \
-DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DGRIDGAIN_PROG_NAME="$0" -DGRIDGAIN_DEPLOYMENT_MODE_OVERRIDE=ISOLATED \
${JVM_XOPTS} -cp "${CP}" \
org.gridgain.visor.commands.VisorConsole
Expand Down
15 changes: 14 additions & 1 deletion bin/include/functions.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
#!/bin/bash

#
# @sh.file.header
# Copyright (C) GridGain Systems. 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
#
# 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.

# _________ _____ __________________ _____
# __ ____/___________(_)______ /__ ____/______ ____(_)_______
# _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand Down
15 changes: 14 additions & 1 deletion bin/include/hadoop-classpath.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
::
:: @bat.file.header
:: Copyright (C) GridGain Systems. 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
::
:: 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.

:: _________ _____ __________________ _____
:: __ ____/___________(_)______ /__ ____/______ ____(_)_______
:: _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
Expand Down
Loading

0 comments on commit 0c30071

Please sign in to comment.