http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/test/webapp/META-INF/gg-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml index 9f204ca..aa6bb69 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -21,7 +21,7 @@ GridGain Spring configuration file to startup grid cache. When starting a standalone GridGain node, you need to execute the following command: - {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} examples/config/spring-cache.xml + {IGNITE_HOME}/bin/ggstart.{bat|sh} examples/config/spring-cache.xml When starting GridGain from Java IDE, pass path to this file into GridGain: GridGain.start("examples/config/spring-cache.xml");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java index 14f1cfc..5c28e45 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java @@ -63,10 +63,10 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*; * do this, add following lines to {@code conf/hadoop-env.sh} script in Hadoop * distribution: * <pre name="code" class="bash"> - * export GRIDGAIN_HOME=/path/to/GridGain/distribution - * export HADOOP_CLASSPATH=$GRIDGAIN_HOME/gridgain*.jar + * export IGNITE_HOME=/path/to/GridGain/distribution + * export HADOOP_CLASSPATH=$IGNITE_HOME/gridgain*.jar * - * for f in $GRIDGAIN_HOME/libs/*.jar; do + * for f in $IGNITE_HOME/libs/*.jar; do * export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f; * done * </pre> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java index 23d6ac9..04f2d46 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java @@ -63,10 +63,10 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*; * do this, add following lines to {@code conf/hadoop-env.sh} script in Hadoop * distribution: * <pre name="code" class="bash"> - * export GRIDGAIN_HOME=/path/to/GridGain/distribution - * export HADOOP_CLASSPATH=$GRIDGAIN_HOME/gridgain*.jar + * export IGNITE_HOME=/path/to/GridGain/distribution + * export HADOOP_CLASSPATH=$IGNITE_HOME/gridgain*.jar * - * for f in $GRIDGAIN_HOME/libs/*.jar; do + * for f in $IGNITE_HOME/libs/*.jar; do * export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f; * done * </pre> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java index 06c726e..024d73d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java @@ -75,7 +75,7 @@ public class GridHadoopSetup { private static void configureHadoop() { String gridgainHome = U.getGridGainHome(); - println("GRIDGAIN_HOME is set to '" + gridgainHome + "'."); + println("IGNITE_HOME is set to '" + gridgainHome + "'."); checkGridGainHome(gridgainHome); @@ -300,7 +300,7 @@ public class GridHadoopSetup { Path gg = Paths.get(ggHome); if (!jar.startsWith(gg)) - exit("GridGain JAR files are not under GRIDGAIN_HOME.", null); + exit("GridGain JAR files are not under IGNITE_HOME.", null); } catch (Exception e) { exit(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java index f7035ad..fdfae0d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java @@ -303,7 +303,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte meta.classpath(Arrays.asList(System.getProperty("java.class.path").split(File.pathSeparator))); meta.jvmOptions(Arrays.asList("-Xmx1g", "-ea", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", - "-DGRIDGAIN_HOME=" + U.getGridGainHome())); + "-DIGNITE_HOME=" + U.getGridGainHome())); return meta; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java index 3dd6016..a12bf5e 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java @@ -49,7 +49,7 @@ class IgniteLog4jNodeIdFilePath implements IgniteClosure<String, String> { if (!F.isEmpty(U.IGNITE_LOG_DIR)) return U.nodeIdLogFileName(nodeId, new File(U.IGNITE_LOG_DIR, "gridgain.log").getAbsolutePath()); - if (oldPath != null) // fileName could be null if GRIDGAIN_HOME is not defined. + if (oldPath != null) // fileName could be null if IGNITE_HOME is not defined. return U.nodeIdLogFileName(nodeId, oldPath); String tmpDir = IgniteSystemProperties.getString("java.io.tmpdir"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java index 74f9e1b..20c9506 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java @@ -36,7 +36,7 @@ import java.net.*; public class IgniteSpring { /** * Starts grid with default configuration. By default this method will - * use grid configuration defined in {@code GRIDGAIN_HOME/config/default-config.xml} + * use grid configuration defined in {@code IGNITE_HOME/config/default-config.xml} * configuration file. If such file is not found, then all system defaults will be used. * * @param springCtx Optional Spring application context, possibly {@code null}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java index a143f13..b7d1644 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java @@ -53,7 +53,7 @@ import java.util.*; * {@code GridSpringCacheManager} can start a node itself on its startup * based on provided GridGain configuration. You can provide path to a * Spring configuration XML file, like below (path can be absolute or - * relative to {@code GRIDGAIN_HOME}): + * relative to {@code IGNITE_HOME}): * <pre name="code" class="xml"> * <beans xmlns="http://www.springframework.org/schema/beans"; * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/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 7acbc5f..9934d5c 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 = "%GRIDGAIN_HOME%"; + private static final String DFLT_GG_HOME_WIN = "%IGNITE_HOME%"; /** Default GridGain home path for Linux (taken from environment variable). */ - private static final String DFLT_GG_HOME_LINUX = "$GRIDGAIN_HOME"; + private static final String DFLT_GG_HOME_LINUX = "$IGNITE_HOME"; /** Default start script path for Windows. */ private static final String DFLT_SCRIPT_WIN = "bin\\ggstart.bat -v -np"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/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 39e9a57..ee73d25 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 = "GRIDGAIN_HOME"; + public static final String GG_HOME_SYS_PROP = "IGNITE_HOME"; /** Defines GridGain installation folder. */ - public static final String GG_HOME_ENV_VAR = "GRIDGAIN_HOME"; + public static final String GG_HOME_ENV_VAR = "IGNITE_HOME"; /** File name to generate. */ public static final String FILE_NAME = "optimized-classnames.properties"; @@ -305,10 +305,10 @@ public class OptimizedClassNamesGenerator { } /** - * Retrieves {@code GRIDGAIN_HOME} property. The property is retrieved from system + * Retrieves {@code IGNITE_HOME} property. The property is retrieved from system * properties or from environment in that order. * - * @return {@code GRIDGAIN_HOME} property. + * @return {@code IGNITE_HOME} property. */ private static String home() { String home = System.getProperty(GG_HOME_SYS_PROP); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java index 5feec7c..15ff3c2 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java @@ -311,7 +311,7 @@ import java.util.Map.*; public class GridUriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi, GridUriDeploymentSpiMBean { /** * Default deployment directory where SPI will pick up GAR files. Note that this path is relative to - * {@code GRIDGAIN_HOME/work} folder if {@code GRIDGAIN_HOME} system or environment variable specified, + * {@code IGNITE_HOME/work} folder if {@code IGNITE_HOME} system or environment variable specified, * otherwise it is relative to {@code work} folder under system {@code java.io.tmpdir} folder. * * @see org.apache.ignite.configuration.IgniteConfiguration#getWorkDirectory() @@ -401,9 +401,9 @@ public class GridUriDeploymentSpi extends IgniteSpiAdapter implements Deployment * scanned by SPI for the new tasks. * <p> * If not provided, default value is list with - * {@code file://${GRIDGAIN_HOME}/work/deployment/file} element. - * Note that system property {@code GRIDGAIN_HOME} must be set. - * For unknown {@code GRIDGAIN_HOME} list of URI must be provided explicitly. + * {@code file://${IGNITE_HOME}/work/deployment/file} element. + * Note that system property {@code IGNITE_HOME} must be set. + * For unknown {@code IGNITE_HOME} list of URI must be provided explicitly. * * @param uriList GAR file URIs. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java index 9f678e8..6ba23c6 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java @@ -128,11 +128,11 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes * File 'bad-signed-deployfile.gar' contains non-signed modifications. * * Sign JAR with command: - * $ jarsigner -keystore $GRIDGAIN_HOME/modules/tests/config/signeddeploy/keystore -storepass "abc123" + * $ jarsigner -keystore $IGNITE_HOME/modules/tests/config/signeddeploy/keystore -storepass "abc123" * -keypass "abc123" -signedjar signed-deployfile.gar deployfile.gar business * * Verify signed JAR-file: - * $ jarsigner -verify -keystore $GRIDGAIN_HOME/modules/tests/config/signeddeploy/keystore -storepass "abc123" + * $ jarsigner -verify -keystore $IGNITE_HOME/modules/tests/config/signeddeploy/keystore -storepass "abc123" * -keypass "abc123" signed-deployfile.gar * * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/visor-console/src/main/scala/org/apache/ignite/visor/Packet.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/Packet.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/Packet.scala index d3e2e1e..b389df5 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/Packet.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/Packet.scala @@ -31,7 +31,7 @@ package org.apache.ignite * Visor console provides monitoring capabilities for GridGain. * * ==Usage== - * GridGain ships with `GRIDGAIN_HOME/bin/ggvisorcmd.{sh|bat}` script that starts Visor console. + * GridGain ships with `IGNITE_HOME/bin/ggvisorcmd.{sh|bat}` script that starts Visor console. * * Just type:<ex>help</ex> in Visor console to get help and get started. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/Packet.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/Packet.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/Packet.scala index 8d73288..5e5f285 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/Packet.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/Packet.scala @@ -61,8 +61,8 @@ package org.apache.ignite.visor.commands * -s=<path> * Source path. * -d=<path> - * Destination path (relative to GRIDGAIN_HOME). - * If not provided, files will be copied to the root of GRIDGAIN_HOME. + * Destination path (relative to IGNITE_HOME). + * If not provided, files will be copied to the root of IGNITE_HOME. * }}} * * ====Examples==== http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala index 4f189f2..5071723 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala @@ -105,7 +105,7 @@ private case class VisorCopier( val ggh = ggHome() if (ggh == "") - warn("GRIDGAIN_HOME is not set on " + host.name) + warn("IGNITE_HOME is not set on " + host.name) else { ch = ses.openChannel("sftp").asInstanceOf[ChannelSftp] @@ -138,9 +138,9 @@ private case class VisorCopier( } /** - * Gets `GRIDGAIN_HOME` from remote host. + * Gets `IGNITE_HOME` from remote host. * - * @return `GRIDGAIN_HOME` value. + * @return `IGNITE_HOME` value. */ private def ggHome(): String = { /** @@ -226,9 +226,9 @@ private case class VisorCopier( } if (windows) - exec("echo %GRIDGAIN_HOME%") + exec("echo %IGNITE_HOME%") else - shell("echo $GRIDGAIN_HOME") // Use interactive shell under nix because need read env from .profile and etc. + shell("echo $IGNITE_HOME") // Use interactive shell under nix because need read env from .profile and etc. } /** @@ -315,8 +315,8 @@ private case class VisorCopier( * -s=<path> * Source path. * -d=<path> - * Destination path (relative to GRIDGAIN_HOME). - * If not provided, files will be copied to the root of GRIDGAIN_HOME. + * Destination path (relative to IGNITE_HOME). + * If not provided, files will be copied to the root of IGNITE_HOME. * }}} * * ====Examples==== @@ -582,8 +582,8 @@ object VisorDeployCommand { ), "-s=<path>" -> "Source path.", "-d=<path>" -> List( - "Destination path (relative to $GRIDGAIN_HOME).", - "If not provided, files will be copied to the root of $GRIDGAIN_HOME." + "Destination path (relative to $IGNITE_HOME).", + "If not provided, files will be copied to the root of $IGNITE_HOME." ) ), examples = List( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/Packet.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/Packet.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/Packet.scala index e1cde80..8d3edf7 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/Packet.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/Packet.scala @@ -60,7 +60,7 @@ package org.apache.ignite.visor.commands * If current count of nodes is equal to this number and '-r' flag is not set, then nothing will happen. * -g=<path> * Path to GridGain installation folder. - * If not defined, GRIDGAIN_HOME environment variable must be set on remote hosts. + * If not defined, IGNITE_HOME environment variable must be set on remote hosts. * -c=<path> * Path to configuration file (relative to GridGain home). * If not provided, default GridGain configuration is used. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala index 7f4ab1f..342c09e 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala @@ -86,7 +86,7 @@ private case class Result( * If current count of nodes is equal to this number and '-r' flag is not set, then nothing will happen. * -g=<path> * Path to GridGain installation folder. - * If not defined, GRIDGAIN_HOME environment variable must be set on remote hosts. + * If not defined, IGNITE_HOME environment variable must be set on remote hosts. * -c=<path> * Path to configuration file (relative to GridGain home). * If not provided, default GridGain configuration is used. @@ -376,7 +376,7 @@ object VisorStartCommand { ), "-g=<path>" -> List( "Path to GridGain installation folder.", - "If not defined, GRIDGAIN_HOME environment variable must be set on remote hosts." + "If not defined, IGNITE_HOME environment variable must be set on remote hosts." ), "-c=<path>" -> List( "Path to configuration file (relative to GridGain home).", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index b740cb4..65bb143 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -116,7 +116,7 @@ trait VisorTag * Visor console provides monitoring capabilities for GridGain. * * ==Usage== - * GridGain ships with `GRIDGAIN_HOME/bin/ggvisorcmd.{sh|bat}` script that starts Visor console. + * GridGain ships with `IGNITE_HOME/bin/ggvisorcmd.{sh|bat}` script that starts Visor console. * * Just type:<ex>help</ex> in Visor console to get help and get started. */ @@ -200,8 +200,8 @@ object visor extends VisorTag { /** Default log file path. */ /** - * Default log file path. Note that this path is relative to `GRIDGAIN_HOME/work` folder - * if `GRIDGAIN_HOME` system or environment variable specified, otherwise it is relative to + * Default log file path. Note that this path is relative to `IGNITE_HOME/work` folder + * if `IGNITE_HOME` system or environment variable specified, otherwise it is relative to * `work` folder under system `java.io.tmpdir` folder. */ private final val DFLT_LOG_PATH = "visor/visor-log" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java index 928958d..69c294c 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java @@ -60,8 +60,8 @@ import java.util.*; * <ol> * <li>Add GridGain libraries in Tomcat common loader. * Add in file {@code $TOMCAT_HOME/conf/catalina.properties} for property {@code common.loader} - * the following {@code $GRIDGAIN_HOME/*.jar,$GRIDGAIN_HOME/libs/*.jar} - * (replace {@code $GRIDGAIN_HOME} with absolute path). + * the following {@code $IGNITE_HOME/*.jar,$IGNITE_HOME/libs/*.jar} + * (replace {@code $IGNITE_HOME} with absolute path). * </li> * <li>Configure this startup in {@code $TOMCAT_HOME/conf/web.xml} * <pre name="code" class="xml"> @@ -107,16 +107,16 @@ public class GridServletContextListenerStartup implements ServletContextListener cfgUrl = evt.getServletContext().getResource("/META-INF/" + cfgFile); } catch (MalformedURLException ignored) { - // Ignore, we still need to try with GRIDGAIN_HOME. + // Ignore, we still need to try with IGNITE_HOME. } if (cfgUrl == null) - // Try with GRIDGAIN_HOME and with context class loader. + // Try with IGNITE_HOME and with context class loader. cfgUrl = U.resolveGridGainUrl(cfgFile); if (cfgUrl == null) throw new IgniteException("Failed to find Spring configuration file (path provided should be " + - "either absolute, relative to GRIDGAIN_HOME, or relative to META-INF folder): " + cfgFile); + "either absolute, relative to IGNITE_HOME, or relative to META-INF folder): " + cfgFile); IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> t; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java index 8e806d3..1680298 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java @@ -62,8 +62,8 @@ import java.util.*; * <ol> * <li>Add GridGain libraries in Tomcat common loader. * Add in file {@code $TOMCAT_HOME/conf/catalina.properties} for property {@code shared.loader} - * the following {@code $GRIDGAIN_HOME/gridgain.jar,$GRIDGAIN_HOME/libs/*.jar} - * (replace {@code $GRIDGAIN_HOME} with absolute path). + * the following {@code $IGNITE_HOME/gridgain.jar,$IGNITE_HOME/libs/*.jar} + * (replace {@code $IGNITE_HOME} with absolute path). * </li> * <li>Configure startup in {@code $TOMCAT_HOME/conf/web.xml} * <pre name="code" class="xml"> @@ -137,7 +137,7 @@ public class GridServletStartup extends HttpServlet { if (cfgUrl == null) throw new ServletException("Failed to find Spring configuration file (path provided should be " + - "either absolute, relative to GRIDGAIN_HOME, or relative to META-INF folder): " + cfgFile); + "either absolute, relative to IGNITE_HOME, or relative to META-INF folder): " + cfgFile); try { IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> t = http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bfcc71e..13f5e74 100644 --- a/pom.xml +++ b/pom.xml @@ -1177,7 +1177,7 @@ </replaceregexp> <replaceregexp byline="true"> - <regexp pattern='GRIDGAIN_HOME_TMP="\$\(dirname "\$\{GRIDGAIN_HOME_TMP\}"\)"(\s*#.*)?'/> + <regexp pattern='IGNITE_HOME_TMP="\$\(dirname "\$\{IGNITE_HOME_TMP\}"\)"(\s*#.*)?'/> <substitution expression=""/> <fileset dir="target/release-package/bin"> <include name="**/*.sh"/> @@ -1185,16 +1185,16 @@ </replaceregexp> <replaceregexp byline="true"> - <regexp pattern='set SCRIPTS_HOME=%GRIDGAIN_HOME%\\os\\bin(\s*&::.*)?'/> - <substitution expression='set SCRIPTS_HOME=%GRIDGAIN_HOME%\\\\bin'/> + <regexp pattern='set SCRIPTS_HOME=%IGNITE_HOME%\\os\\bin(\s*&::.*)?'/> + <substitution expression='set SCRIPTS_HOME=%IGNITE_HOME%\\\\bin'/> <fileset dir="target/release-package/bin"> <include name="**/*.bat"/> </fileset> </replaceregexp> <replaceregexp byline="true"> - <regexp pattern='SCRIPTS_HOME="\$\{GRIDGAIN_HOME_TMP\}/os/bin"(\s*#.*)?'/> - <substitution expression='SCRIPTS_HOME="$${GRIDGAIN_HOME_TMP}/bin"'/> + <regexp pattern='SCRIPTS_HOME="\$\{IGNITE_HOME_TMP\}/os/bin"(\s*#.*)?'/> + <substitution expression='SCRIPTS_HOME="$${IGNITE_HOME_TMP}/bin"'/> <fileset dir="target/release-package/bin"> <include name="**/*.sh"/> </fileset>
