Ignite-67 GRIDGAIN_LIBS to IGNITE_LIBS
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/64cc3c09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64cc3c09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64cc3c09 Branch: refs/heads/ignite-67 Commit: 64cc3c09137cea7552d753341430c17476021c69 Parents: 7d26216 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 13:25:05 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 13:25:05 2015 +0300 ---------------------------------------------------------------------- bin/ggstart.bat | 4 ++-- bin/ggstart.sh | 4 ++-- bin/ggvisorcmd.bat | 4 ++-- bin/ggvisorcmd.sh | 4 ++-- bin/include/functions.sh | 2 +- bin/include/service.sh | 2 +- bin/include/setenv.bat | 12 ++++++------ bin/include/setenv.sh | 12 ++++++------ bin/include/target-classpath.bat | 2 +- bin/include/target-classpath.sh | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/ggstart.bat ---------------------------------------------------------------------- diff --git a/bin/ggstart.bat b/bin/ggstart.bat index 30afc0b..d18199b 100644 --- a/bin/ggstart.bat +++ b/bin/ggstart.bat @@ -97,11 +97,11 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0% :run :: -:: Set GRIDGAIN_LIBS +:: Set IGNITE_LIBS :: call "%SCRIPTS_HOME%\include\setenv.bat" call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release. -set CP=%GRIDGAIN_LIBS% +set CP=%IGNITE_LIBS% :: :: Parse command line parameters. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/ggstart.sh ---------------------------------------------------------------------- diff --git a/bin/ggstart.sh b/bin/ggstart.sh index 7262ceb..250f99a 100755 --- a/bin/ggstart.sh +++ b/bin/ggstart.sh @@ -53,11 +53,11 @@ fi . "${SCRIPTS_HOME}"/include/parseargs.sh # -# Set GRIDGAIN_LIBS. +# Set IGNITE_LIBS. # . "${SCRIPTS_HOME}"/include/setenv.sh . "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release. -CP="${GRIDGAIN_LIBS}" +CP="${IGNITE_LIBS}" RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/ggvisorcmd.bat ---------------------------------------------------------------------- diff --git a/bin/ggvisorcmd.bat b/bin/ggvisorcmd.bat index 84ab073..c4c64f9 100644 --- a/bin/ggvisorcmd.bat +++ b/bin/ggvisorcmd.bat @@ -86,11 +86,11 @@ if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run :run :: -:: Set GRIDGAIN_LIBS +:: Set IGNITE_LIBS :: call "%SCRIPTS_HOME%\include\setenv.bat" call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release. -set CP=%IGNITE_HOME%\bin\include\visor-common\*;%IGNITE_HOME%\bin\include\visorcmd\*;%GRIDGAIN_LIBS% +set CP=%IGNITE_HOME%\bin\include\visor-common\*;%IGNITE_HOME%\bin\include\visorcmd\*;%IGNITE_LIBS% :: :: Parse command line parameters. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/ggvisorcmd.sh ---------------------------------------------------------------------- diff --git a/bin/ggvisorcmd.sh b/bin/ggvisorcmd.sh index 6f4ea76..319d282 100755 --- a/bin/ggvisorcmd.sh +++ b/bin/ggvisorcmd.sh @@ -45,11 +45,11 @@ setGridGainHome . "${SCRIPTS_HOME}"/include/parseargs.sh # -# Set GRIDGAIN_LIBS. +# Set IGNITE_LIBS. # . "${SCRIPTS_HOME}"/include/setenv.sh . "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release. -CP="${IGNITE_HOME}/bin/include/visor-common/*${SEP}${IGNITE_HOME}/bin/include/visorcmd/*${SEP}${GRIDGAIN_LIBS}" +CP="${IGNITE_HOME}/bin/include/visor-common/*${SEP}${IGNITE_HOME}/bin/include/visorcmd/*${SEP}${IGNITE_LIBS}" # # JVM options. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/include/functions.sh ---------------------------------------------------------------------- diff --git a/bin/include/functions.sh b/bin/include/functions.sh index fb8d229..cc2aca8 100755 --- a/bin/include/functions.sh +++ b/bin/include/functions.sh @@ -111,7 +111,7 @@ setGridGainHome() { # The function exports JMX_MON variable with Java JMX options. # findAvailableJmxPort() { - JMX_PORT=`"$JAVA" -cp "${GRIDGAIN_LIBS}" org.gridgain.grid.util.portscanner.GridJmxPortFinder` + JMX_PORT=`"$JAVA" -cp "${IGNITE_LIBS}" org.gridgain.grid.util.portscanner.GridJmxPortFinder` # # This variable defines necessary parameters for JMX http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/include/service.sh ---------------------------------------------------------------------- diff --git a/bin/include/service.sh b/bin/include/service.sh index 577eab8..e024203 100755 --- a/bin/include/service.sh +++ b/bin/include/service.sh @@ -66,7 +66,7 @@ case "$1" in # And run. $JAVA $JVM_OPTS -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \ - -DIGNITE_PROG_NAME="$0" -cp "$GRIDGAIN_LIBS" "$MAIN_CLASS" "$DEFAULT_CONFIG" &>/dev/null & + -DIGNITE_PROG_NAME="$0" -cp "$IGNITE_LIBS" "$MAIN_CLASS" "$DEFAULT_CONFIG" &>/dev/null & # Write process id. echo $! >$PIDFILE http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/include/setenv.bat ---------------------------------------------------------------------- diff --git a/bin/include/setenv.bat b/bin/include/setenv.bat index e568673..aa35f53 100644 --- a/bin/include/setenv.bat +++ b/bin/include/setenv.bat @@ -14,11 +14,11 @@ :: limitations under the License. :: -:: Exports GRIDGAIN_LIBS variable containing classpath for GridGain. +:: Exports IGNITE_LIBS variable containing classpath for GridGain. :: Expects IGNITE_HOME to be set. :: Can be used like: :: call %IGNITE_HOME%\bin\include\setenv.bat -:: in other scripts to set classpath using exported GRIDGAIN_LIBS variable. +:: in other scripts to set classpath using exported IGNITE_LIBS variable. :: @echo off @@ -37,13 +37,13 @@ goto :eof :run :: The following libraries are required for GridGain. -set GRIDGAIN_LIBS=%IGNITE_HOME%\libs\* +set IGNITE_LIBS=%IGNITE_HOME%\libs\* for /D %%F in (%IGNITE_HOME%\libs\*) do if not "%%F" == "%IGNITE_HOME%\libs\optional" call :concat %%F\* if exist %IGNITE_HOME%\libs\gridgain-hadoop set HADOOP_EDITION=1 -if defined USER_LIBS set GRIDGAIN_LIBS=%USER_LIBS%;%GRIDGAIN_LIBS% +if defined USER_LIBS set IGNITE_LIBS=%USER_LIBS%;%IGNITE_LIBS% if "%HADOOP_EDITION%" == "1" call "%SCRIPTS_HOME%\include\hadoop-classpath.bat" @@ -51,10 +51,10 @@ set COMMON_HOME_LIB=%HADOOP_COMMON_HOME%\lib if "%GRIDGAIN_HADOOP_CLASSPATH%" == "" goto :eof -set GRIDGAIN_LIBS=%GRIDGAIN_LIBS%;%GRIDGAIN_HADOOP_CLASSPATH% +set IGNITE_LIBS=%IGNITE_LIBS%;%GRIDGAIN_HADOOP_CLASSPATH% goto :eof :concat -set GRIDGAIN_LIBS=%GRIDGAIN_LIBS%;%1 +set IGNITE_LIBS=%IGNITE_LIBS%;%1 goto :eof http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/include/setenv.sh ---------------------------------------------------------------------- diff --git a/bin/include/setenv.sh b/bin/include/setenv.sh index d09223c..27cd91a 100755 --- a/bin/include/setenv.sh +++ b/bin/include/setenv.sh @@ -15,11 +15,11 @@ # limitations under the License. # -# Exports GRIDGAIN_LIBS variable containing classpath for GridGain. +# Exports IGNITE_LIBS variable containing classpath for GridGain. # Expects IGNITE_HOME to be set. # Can be used like: # . "${IGNITE_HOME}"/bin/include/setenv.sh -# in other scripts to set classpath using exported GRIDGAIN_LIBS variable. +# in other scripts to set classpath using exported IGNITE_LIBS variable. # # @@ -52,12 +52,12 @@ esac # # Libraries included in classpath. # -GRIDGAIN_LIBS="${IGNITE_HOME}/libs/*" +IGNITE_LIBS="${IGNITE_HOME}/libs/*" for file in ${IGNITE_HOME}/libs/* do if [ -d ${file} ] && [ "${file}" != "${IGNITE_HOME}"/libs/optional ]; then - GRIDGAIN_LIBS=${GRIDGAIN_LIBS}${SEP}${file}/* + IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/* fi if [ -d ${file} ] && [ "${file}" == "${IGNITE_HOME}"/libs/gridgain-hadoop ]; then @@ -66,13 +66,13 @@ do done if [ "${USER_LIBS}" != "" ]; then - GRIDGAIN_LIBS=${USER_LIBS}${SEP}${GRIDGAIN_LIBS} + IGNITE_LIBS=${USER_LIBS}${SEP}${IGNITE_LIBS} fi if [ "${HADOOP_EDITION}" == "1" ]; then . "${SCRIPTS_HOME}"/include/hadoop-classpath.sh if [ "${GRIDGAIN_HADOOP_CLASSPATH}" != "" ]; then - GRIDGAIN_LIBS=${GRIDGAIN_LIBS}${SEP}$GRIDGAIN_HADOOP_CLASSPATH + IGNITE_LIBS=${IGNITE_LIBS}${SEP}$GRIDGAIN_HADOOP_CLASSPATH fi fi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/include/target-classpath.bat ---------------------------------------------------------------------- diff --git a/bin/include/target-classpath.bat b/bin/include/target-classpath.bat index a86c71f..30e514f 100644 --- a/bin/include/target-classpath.bat +++ b/bin/include/target-classpath.bat @@ -38,5 +38,5 @@ if exist "%1\target\" ( goto :eof :concat -set GRIDGAIN_LIBS=%GRIDGAIN_LIBS%;%1 +set IGNITE_LIBS=%IGNITE_LIBS%;%1 goto :eof http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64cc3c09/bin/include/target-classpath.sh ---------------------------------------------------------------------- diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh index 4294e36..0e6229fc 100644 --- a/bin/include/target-classpath.sh +++ b/bin/include/target-classpath.sh @@ -44,11 +44,11 @@ includeToClassPath() { do if [ -d ${file} ] && [ -d "${file}/target" ]; then if [ -d "${file}/target/classes" ]; then - GRIDGAIN_LIBS=${GRIDGAIN_LIBS}${SEP}${file}/target/classes + IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes fi if [ -d "${file}/target/libs" ]; then - GRIDGAIN_LIBS=${GRIDGAIN_LIBS}${SEP}${file}/target/libs/* + IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/* fi fi done
