Ignite-67 Every GG_HOME becomes IGNITE_HOME
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d262168 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d262168 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d262168 Branch: refs/heads/ignite-67 Commit: 7d262168d17d1eff19b867be79494e9b49a1ae0d Parents: db4b1d2 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 13:12:38 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 13:12:38 2015 +0300 ---------------------------------------------------------------------- modules/clients/src/test/bin/start-nodes-ssh.sh | 2 +- modules/clients/src/test/bin/start-nodes.cmd | 22 +++++++++--------- modules/clients/src/test/bin/start-nodes.sh | 24 ++++++++++---------- .../util/nodestart/GridNodeStartUtils.java | 10 ++++---- .../hadoop/GridHadoopPopularWordsTest.java | 6 ++--- .../util/nodestart/GridNodeCallableImpl.java | 6 ++--- .../internal/GridNodeStartUtilsSelfTest.java | 6 ++--- .../GridProjectionStartStopRestartSelfTest.java | 4 ++-- .../optimized/OptimizedClassNamesGenerator.java | 8 +++---- 9 files changed, 44 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/clients/src/test/bin/start-nodes-ssh.sh ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/bin/start-nodes-ssh.sh b/modules/clients/src/test/bin/start-nodes-ssh.sh index 4b4f455..e99b386 100644 --- a/modules/clients/src/test/bin/start-nodes-ssh.sh +++ b/modules/clients/src/test/bin/start-nodes-ssh.sh @@ -23,7 +23,7 @@ # Define environment paths. SCRIPT_DIR=$(cd $(dirname "$0"); pwd) -GG_HOME=$(cd $SCRIPT_DIR/../../..; pwd) +IGNITE_HOME=$(cd $SCRIPT_DIR/../../..; pwd) SSH_COMMAND="ssh localhost /bin/bash $SCRIPT_DIR/start-nodes.sh" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/clients/src/test/bin/start-nodes.cmd ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/bin/start-nodes.cmd b/modules/clients/src/test/bin/start-nodes.cmd index ad21637..ece9ee2 100644 --- a/modules/clients/src/test/bin/start-nodes.cmd +++ b/modules/clients/src/test/bin/start-nodes.cmd @@ -8,17 +8,17 @@ SET CLIENTS_MODULE_PATH=%SCRIPT_DIR%\..\..\.. SET BIN_PATH=%SCRIPT_DIR%\..\..\..\..\..\bin cd %SCRIPT_DIR%\..\..\..\..\..\.. -set GG_HOME=%CD% +set IGNITE_HOME=%CD% rem Define this script configuration. set NODES_COUNT=2 -echo GG_HOME: %GG_HOME% +echo IGNITE_HOME: %IGNITE_HOME% echo JAVA_HOME: %JAVA_HOME% echo SCRIPT_DIR: %SCRIPT_DIR% -echo Switch to home directory %GG_HOME% -cd %GG_HOME% +echo Switch to home directory %IGNITE_HOME% +cd %IGNITE_HOME% set MVN_EXEC=mvn @@ -30,14 +30,14 @@ echo Switch to build script directory %SCRIPT_DIR% cd %SCRIPT_DIR% rem Force to create log's directory. -rmdir %GG_HOME%\work\log /S /Q -mkdir %GG_HOME%\work\log +rmdir %IGNITE_HOME%\work\log /S /Q +mkdir %IGNITE_HOME%\work\log set JVM_OPTS=-DCLIENTS_MODULE_PATH=%CLIENTS_MODULE_PATH% -FOR /L %%G IN (1,1,%NODES_COUNT%) DO start "Node #%%G" /low /MIN cmd /C "%BIN_PATH%\ggstart.bat -v %CONFIG_DIR%\spring-server-node.xml >> %GG_HOME%\work\log\node-%%G.log 2>&1" -FOR /L %%G IN (1,1,%NODES_COUNT%) DO start "SSL Node #%%G" /low /MIN cmd /C "%BIN_PATH%\ggstart.bat -v %CONFIG_DIR%\spring-server-ssl-node.xml >> %GG_HOME%\work\log\node-ssl-%%G.log 2>&1" -FOR /L %%G IN (1,1,%NODES_COUNT%) DO start "Cache Node #%%G" /low /MIN cmd /C "%BIN_PATH%\ggstart.bat -v %CONFIG_DIR%\spring-cache.xml >> %GG_HOME%\work\log\cache-node-%%G.log 2>&1" +FOR /L %%G IN (1,1,%NODES_COUNT%) DO start "Node #%%G" /low /MIN cmd /C "%BIN_PATH%\ggstart.bat -v %CONFIG_DIR%\spring-server-node.xml >> %IGNITE_HOME%\work\log\node-%%G.log 2>&1" +FOR /L %%G IN (1,1,%NODES_COUNT%) DO start "SSL Node #%%G" /low /MIN cmd /C "%BIN_PATH%\ggstart.bat -v %CONFIG_DIR%\spring-server-ssl-node.xml >> %IGNITE_HOME%\work\log\node-ssl-%%G.log 2>&1" +FOR /L %%G IN (1,1,%NODES_COUNT%) DO start "Cache Node #%%G" /low /MIN cmd /C "%BIN_PATH%\ggstart.bat -v %CONFIG_DIR%\spring-cache.xml >> %IGNITE_HOME%\work\log\cache-node-%%G.log 2>&1" echo Wait 60 seconds while nodes started. ping -n 60 127.0.0.1 > NUL @@ -45,8 +45,8 @@ ping -n 60 127.0.0.1 > NUL rem Disable hostname verification for self-signed certificates. set JVM_OPTS=%JVM_OPTS% -DIGNITE_DISABLE_HOSTNAME_VERIFIER=true -FOR /L %%G IN (1,1,1) DO start "Router #%%G" /low /MIN cmd /C "%BIN_PATH%\ggrouter.bat -v %CONFIG_DIR%\spring-router.xml >> %GG_HOME%\work\log\router-%%G.log 2>&1" -FOR /L %%G IN (1,1,1) DO start "SSL Router #%%G" /low /MIN cmd /C "%BIN_PATH%\ggrouter.bat -v %CONFIG_DIR%\spring-router-ssl.xml >> %GG_HOME%\work\log\router-ssl-%%G.log 2>&1" +FOR /L %%G IN (1,1,1) DO start "Router #%%G" /low /MIN cmd /C "%BIN_PATH%\ggrouter.bat -v %CONFIG_DIR%\spring-router.xml >> %IGNITE_HOME%\work\log\router-%%G.log 2>&1" +FOR /L %%G IN (1,1,1) DO start "SSL Router #%%G" /low /MIN cmd /C "%BIN_PATH%\ggrouter.bat -v %CONFIG_DIR%\spring-router-ssl.xml >> %IGNITE_HOME%\work\log\router-ssl-%%G.log 2>&1" echo Wait 10 seconds while routers started. ping -n 10 127.0.0.1 > NUL http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/clients/src/test/bin/start-nodes.sh ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/bin/start-nodes.sh b/modules/clients/src/test/bin/start-nodes.sh index f74b0bb..739a81e 100644 --- a/modules/clients/src/test/bin/start-nodes.sh +++ b/modules/clients/src/test/bin/start-nodes.sh @@ -25,17 +25,17 @@ export CONFIG_DIR=$SCRIPT_DIR/../resources export CLIENTS_MODULE_PATH=$SCRIPT_DIR/../../.. export BIN_PATH=$SCRIPT_DIR/../../../../../bin -GG_HOME=$(cd $SCRIPT_DIR/../../../../../..; pwd) +IGNITE_HOME=$(cd $SCRIPT_DIR/../../../../../..; pwd) if [ ! -d "${JAVA_HOME}" ]; then JAVA_HOME=/Library/Java/Home fi export JAVA_HOME -export GG_HOME +export IGNITE_HOME -echo Switch to home directory $GG_HOME -cd $GG_HOME +echo Switch to home directory $IGNITE_HOME +cd $IGNITE_HOME MVN_EXEC=mvn @@ -48,19 +48,19 @@ ${MVN_EXEC} -P+test,-scala,-examples,-release clean package -DskipTests -DskipCl echo Switch to build script directory $SCRIPT_DIR cd $SCRIPT_DIR -if [ ! -d "${GG_HOME}/work" ]; then - mkdir "${GG_HOME}/work" +if [ ! -d "${IGNITE_HOME}/work" ]; then + mkdir "${IGNITE_HOME}/work" fi -if [ ! -d "${GG_HOME}/work/log" ]; then - mkdir "${GG_HOME}/work/log" +if [ ! -d "${IGNITE_HOME}/work/log" ]; then + mkdir "${IGNITE_HOME}/work/log" fi export JVM_OPTS="${JVM_OPTS} -DCLIENTS_MODULE_PATH=${CLIENTS_MODULE_PATH}" for iter in {1..2} do - LOG_FILE=${GG_HOME}/work/log/node-${iter}.log + LOG_FILE=${IGNITE_HOME}/work/log/node-${iter}.log echo Start node ${iter}: ${LOG_FILE} nohup /bin/bash $BIN_PATH/ggstart.sh $CONFIG_DIR/spring-server-node.xml -v < /dev/null > ${LOG_FILE} 2>&1 & @@ -68,7 +68,7 @@ done for iter in {1..2} do - LOG_FILE=${GG_HOME}/work/log/node-ssl-${iter}.log + LOG_FILE=${IGNITE_HOME}/work/log/node-ssl-${iter}.log echo Start SSL node ${iter}: ${LOG_FILE} nohup /bin/bash $BIN_PATH/ggstart.sh $CONFIG_DIR/spring-server-ssl-node.xml -v < /dev/null > ${LOG_FILE} 2>&1 & @@ -77,14 +77,14 @@ done echo Wait 60 seconds while nodes start. sleep 60 -LOG_FILE=${GG_HOME}/work/log/router.log +LOG_FILE=${IGNITE_HOME}/work/log/router.log echo Start Router: ${LOG_FILE} nohup /bin/bash $BIN_PATH/ggrouter.sh $CONFIG_DIR/spring-router.xml -v < /dev/null > ${LOG_FILE} 2>&1 & # Disable hostname verification for self-signed certificates. export JVM_OPTS="${JVM_OPTS} -DIGNITE_DISABLE_HOSTNAME_VERIFIER=true" -LOG_FILE=${GG_HOME}/work/log/router-ssl.log +LOG_FILE=${IGNITE_HOME}/work/log/router-ssl.log echo Start Router SSL: ${LOG_FILE} nohup /bin/bash $BIN_PATH/ggrouter.sh $CONFIG_DIR/spring-router-ssl.xml -v < /dev/null > ${LOG_FILE} 2>&1 & http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java index 4f6dd13..1c9572d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java @@ -50,7 +50,7 @@ public class GridNodeStartUtils { public static final String NODES = "nodes"; /** Key for GridGain home folder. */ - public static final String GG_HOME = "ggHome"; + public static final String IGNITE_HOME = "ggHome"; /** Key for configuration path. */ public static final String CFG = "cfg"; @@ -142,7 +142,7 @@ public class GridNodeStartUtils { case HOST: case UNAME: case PASSWD: - case GG_HOME: + case IGNITE_HOME: case CFG: case SCRIPT: props.put(key, val); @@ -269,8 +269,8 @@ public class GridNodeStartUtils { if (dflts.get(NODES) != null) nodes = (Integer)dflts.get(NODES); - if (dflts.get(GG_HOME) != null) - ggHome = (String)dflts.get(GG_HOME); + if (dflts.get(IGNITE_HOME) != null) + ggHome = (String)dflts.get(IGNITE_HOME); if (dflts.get(CFG) != null) cfg = (String)dflts.get(CFG); @@ -314,7 +314,7 @@ public class GridNodeStartUtils { String passwd = props.get(PASSWD) != null ? (String)props.get(PASSWD) : dfltSpec.password(); File key = props.get(KEY) != null ? (File)props.get(KEY) : dfltSpec.key(); int nodes = props.get(NODES) != null ? (Integer)props.get(NODES) : dfltSpec.nodes(); - String ggHome = props.get(GG_HOME) != null ? (String)props.get(GG_HOME) : dfltSpec.ggHome(); + String ggHome = props.get(IGNITE_HOME) != null ? (String)props.get(IGNITE_HOME) : dfltSpec.ggHome(); String cfg = props.get(CFG) != null ? (String)props.get(CFG) : dfltSpec.configuration(); String script = props.get(SCRIPT) != null ? (String)props.get(SCRIPT) : dfltSpec.script(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java b/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java index 7d9a978..f44b8e8 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java @@ -46,15 +46,15 @@ import static java.util.Collections.*; */ public class GridHadoopPopularWordsTest { /** GridGain home. */ - private static final String GG_HOME = U.getGridGainHome(); + private static final String IGNITE_HOME = U.getGridGainHome(); /** The path to the input directory. ALl files in that directory will be processed. */ private static final Path BOOKS_LOCAL_DIR = - new Path("file:" + GG_HOME, "modules/tests/java/org/gridgain/grid/hadoop/books"); + new Path("file:" + IGNITE_HOME, "modules/tests/java/org/gridgain/grid/hadoop/books"); /** The path to the output directory. THe result file will be written to this location. */ private static final Path RESULT_LOCAL_DIR = - new Path("file:" + GG_HOME, "modules/tests/java/org/gridgain/grid/hadoop/output"); + new Path("file:" + IGNITE_HOME, "modules/tests/java/org/gridgain/grid/hadoop/output"); /** Popular books source dir in DFS. */ private static final Path BOOKS_DFS_DIR = new Path("tmp/word-count-example/in"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java index 88a842b..cbb3a16 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java @@ -35,10 +35,10 @@ import static org.apache.ignite.IgniteSystemProperties.*; */ public class GridNodeCallableImpl implements GridNodeCallable { /** Default GridGain home path for Windows (taken from environment variable). */ - private static final String DFLT_GG_HOME_WIN = "%IGNITE_HOME%"; + private static final String DFLT_IGNITE_HOME_WIN = "%IGNITE_HOME%"; /** Default GridGain home path for Linux (taken from environment variable). */ - private static final String DFLT_GG_HOME_LINUX = "$IGNITE_HOME"; + private static final String DFLT_IGNITE_HOME_LINUX = "$IGNITE_HOME"; /** Default start script path for Windows. */ private static final String DFLT_SCRIPT_WIN = "bin\\ggstart.bat -v -np"; @@ -119,7 +119,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { String ggHome = spec.ggHome(); if (ggHome == null) - ggHome = win ? DFLT_GG_HOME_WIN : DFLT_GG_HOME_LINUX; + ggHome = win ? DFLT_IGNITE_HOME_WIN : DFLT_IGNITE_HOME_LINUX; String script = spec.script(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java index 0af5d3e..6eec91f 100644 --- a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java +++ b/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java @@ -57,7 +57,7 @@ public class GridNodeStartUtilsSelfTest extends GridCommonAbstractTest { assert "passwd1".equals(host.get(PASSWD)); assert new File("key1").equals(host.get(KEY)); assert (Integer)host.get(NODES) == 1; - assert "ggHome1".equals(host.get(GG_HOME)); + assert "ggHome1".equals(host.get(IGNITE_HOME)); assert "cfg1".equals(host.get(CFG)); assert "script1".equals(host.get(SCRIPT)); } @@ -67,7 +67,7 @@ public class GridNodeStartUtilsSelfTest extends GridCommonAbstractTest { assert "passwd2".equals(host.get(PASSWD)); assert new File("key2").equals(host.get(KEY)); assert (Integer)host.get(NODES) == 2; - assert "ggHome2".equals(host.get(GG_HOME)); + assert "ggHome2".equals(host.get(IGNITE_HOME)); assert "cfg2".equals(host.get(CFG)); assert "script2".equals(host.get(SCRIPT)); } @@ -82,7 +82,7 @@ public class GridNodeStartUtilsSelfTest extends GridCommonAbstractTest { assert "passwd3".equals(dflts.get(PASSWD)); assert new File("key3").equals(dflts.get(KEY)); assert (Integer)dflts.get(NODES) == 3; - assert "ggHome3".equals(dflts.get(GG_HOME)); + assert "ggHome3".equals(dflts.get(IGNITE_HOME)); assert "cfg3".equals(dflts.get(CFG)); assert "script3".equals(dflts.get(SCRIPT)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java index e5ee12c..afde828 100644 --- a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java +++ b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java @@ -950,7 +950,7 @@ public class GridProjectionStartStopRestartSelfTest extends GridCommonAbstractTe params.put(PASSWD, passwd); params.put(KEY, key); params.put(NODES, nodes); - params.put(GG_HOME, ggHome); + params.put(IGNITE_HOME, ggHome); params.put(CFG, cfg); params.put(SCRIPT, script); @@ -989,7 +989,7 @@ public class GridProjectionStartStopRestartSelfTest extends GridCommonAbstractTe params.put(PASSWD, passwd); params.put(KEY, key); params.put(NODES, nodes); - params.put(GG_HOME, ggHome); + params.put(IGNITE_HOME, ggHome); params.put(CFG, cfg); params.put(SCRIPT, script); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d262168/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java ---------------------------------------------------------------------- diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java b/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java index ee73d25..53fb490 100644 --- a/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java +++ b/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java @@ -36,10 +36,10 @@ import java.util.jar.*; */ public class OptimizedClassNamesGenerator { /** Defines GridGain installation folder. */ - public static final String GG_HOME_SYS_PROP = "IGNITE_HOME"; + public static final String IGNITE_HOME_SYS_PROP = "IGNITE_HOME"; /** Defines GridGain installation folder. */ - public static final String GG_HOME_ENV_VAR = "IGNITE_HOME"; + public static final String IGNITE_HOME_ENV_VAR = "IGNITE_HOME"; /** File name to generate. */ public static final String FILE_NAME = "optimized-classnames.properties"; @@ -311,10 +311,10 @@ public class OptimizedClassNamesGenerator { * @return {@code IGNITE_HOME} property. */ private static String home() { - String home = System.getProperty(GG_HOME_SYS_PROP); + String home = System.getProperty(IGNITE_HOME_SYS_PROP); if (home == null || home.isEmpty()) { - home = System.getenv(GG_HOME_ENV_VAR); + home = System.getenv(IGNITE_HOME_ENV_VAR); if (home == null || home.isEmpty()) return null;
