Ignite-67 GRIDGAIN_HADOOP_CLASSPATH
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/adf39084 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/adf39084 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/adf39084 Branch: refs/heads/sprint-1 Commit: adf39084c2c25b9a4e9be5e49abdf130558d01b9 Parents: 44c05ef Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 16:21:52 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 16:21:52 2015 +0300 ---------------------------------------------------------------------- bin/include/hadoop-classpath.bat | 2 +- bin/include/hadoop-classpath.sh | 4 ++-- bin/include/setenv.bat | 4 ++-- bin/include/setenv.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/adf39084/bin/include/hadoop-classpath.bat ---------------------------------------------------------------------- diff --git a/bin/include/hadoop-classpath.bat b/bin/include/hadoop-classpath.bat index 6252d01..870139b 100644 --- a/bin/include/hadoop-classpath.bat +++ b/bin/include/hadoop-classpath.bat @@ -59,7 +59,7 @@ for /f %%f in ('dir /B %HADOOP_MAPRED_HOME%\hadoop-mapreduce-client-common-*') d for /f %%f in ('dir /B %HADOOP_MAPRED_HOME%\hadoop-mapreduce-client-core-*') do call :concat %HADOOP_MAPRED_HOME%\%%f :: Export result. -set GRIDGAIN_HADOOP_CLASSPATH=%CP% +set IGNITE_HADOOP_CLASSPATH=%CP% :: Exit. goto :eof http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/adf39084/bin/include/hadoop-classpath.sh ---------------------------------------------------------------------- diff --git a/bin/include/hadoop-classpath.sh b/bin/include/hadoop-classpath.sh index 0fbc9ad..f76f05c 100755 --- a/bin/include/hadoop-classpath.sh +++ b/bin/include/hadoop-classpath.sh @@ -48,7 +48,7 @@ HADOOP_MAPRED_HOME=${HADOOP_MAPRED_HOME-"${HADOOP_PREFIX}/share/hadoop/mapreduce # # Add all Hadoop libs. -GRIDGAIN_HADOOP_CLASSPATH="${HADOOP_COMMON_HOME}/lib/*${SEP}${HADOOP_MAPRED_HOME}/lib/*${SEP}${HADOOP_MAPRED_HOME}/lib/*" +IGNITE_HADOOP_CLASSPATH="${HADOOP_COMMON_HOME}/lib/*${SEP}${HADOOP_MAPRED_HOME}/lib/*${SEP}${HADOOP_MAPRED_HOME}/lib/*" # Skip globbing pattern if it cannot be resolved. shopt -s nullglob @@ -59,5 +59,5 @@ for file in ${HADOOP_HDFS_HOME}/hadoop-hdfs-* \ ${HADOOP_COMMON_HOME}/hadoop-{common,auth}-* \ ${HADOOP_COMMON_HOME}/lib/hadoop-auth-* \ ${HADOOP_MAPRED_HOME}/hadoop-mapreduce-client-{common,core}-*; do - [[ "$file" != *-tests.jar ]] && GRIDGAIN_HADOOP_CLASSPATH=${GRIDGAIN_HADOOP_CLASSPATH}${SEP}${file} + [[ "$file" != *-tests.jar ]] && IGNITE_HADOOP_CLASSPATH=${IGNITE_HADOOP_CLASSPATH}${SEP}${file} done http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/adf39084/bin/include/setenv.bat ---------------------------------------------------------------------- diff --git a/bin/include/setenv.bat b/bin/include/setenv.bat index aa35f53..f480058 100644 --- a/bin/include/setenv.bat +++ b/bin/include/setenv.bat @@ -49,9 +49,9 @@ if "%HADOOP_EDITION%" == "1" call "%SCRIPTS_HOME%\include\hadoop-classpath.bat" set COMMON_HOME_LIB=%HADOOP_COMMON_HOME%\lib -if "%GRIDGAIN_HADOOP_CLASSPATH%" == "" goto :eof +if "%IGNITE_HADOOP_CLASSPATH%" == "" goto :eof -set IGNITE_LIBS=%IGNITE_LIBS%;%GRIDGAIN_HADOOP_CLASSPATH% +set IGNITE_LIBS=%IGNITE_LIBS%;%IGNITE_HADOOP_CLASSPATH% goto :eof http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/adf39084/bin/include/setenv.sh ---------------------------------------------------------------------- diff --git a/bin/include/setenv.sh b/bin/include/setenv.sh index 27cd91a..f686968 100755 --- a/bin/include/setenv.sh +++ b/bin/include/setenv.sh @@ -72,7 +72,7 @@ fi if [ "${HADOOP_EDITION}" == "1" ]; then . "${SCRIPTS_HOME}"/include/hadoop-classpath.sh - if [ "${GRIDGAIN_HADOOP_CLASSPATH}" != "" ]; then - IGNITE_LIBS=${IGNITE_LIBS}${SEP}$GRIDGAIN_HADOOP_CLASSPATH + if [ "${IGNITE_HADOOP_CLASSPATH}" != "" ]; then + IGNITE_LIBS=${IGNITE_LIBS}${SEP}$IGNITE_HADOOP_CLASSPATH fi fi
