# ignite-164 : rename {get/set}GridGainHome -> {get/set}IgniteHome
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b7b2518
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b7b2518
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b7b2518
Branch: refs/heads/ignite-56
Commit: 0b7b251840a40e39c72cf2746b3e6746ff5008af
Parents: 467bfa9
Author: Artem Shutak <[email protected]>
Authored: Thu Feb 5 13:06:00 2015 +0300
Committer: Artem Shutak <[email protected]>
Committed: Thu Feb 5 13:06:00 2015 +0300
----------------------------------------------------------------------
.../integration/ClientAbstractSelfTest.java | 8 +--
.../rest/RestBinaryProtocolSelfTest.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../handlers/log/GridLogCommandHandler.java | 2 +-
.../internal/util/GridConfigurationFinder.java | 6 +--
.../ignite/internal/util/IgniteUtils.java | 16 +++---
...artupWithSpecifiedWorkDirectorySelfTest.java | 8 +--
...tartupWithUndefinedGridGainHomeSelfTest.java | 10 ++--
.../ipc/shmem/GgfsSharedMemoryTestServer.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../loadtest/GridSingleExecutionTest.java | 2 +-
.../cache/GridCacheAbstractLoadTest.java | 2 +-
.../logger/java/IgniteJavaLoggerTest.java | 2 +-
...redFsCheckpointSpiMultiThreadedSelfTest.java | 2 +-
.../GridAbstractCommunicationSelfTest.java | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 2 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../cmdline/GridCommandLineLoaderTest.java | 2 +-
.../ignite/testframework/GridTestUtils.java | 4 +-
.../junits/IgniteTestResources.java | 6 +--
.../junits/spi/GridSpiAbstractTest.java | 2 +-
.../apache/ignite/hadoop/GridHadoopSetup.java | 2 +-
.../GridHadoopExternalTaskExecutor.java | 2 +-
.../child/GridHadoopExternalProcessStarter.java | 2 +-
...ridGgfsHadoopFileSystemAbstractSelfTest.java | 4 +-
.../GridGgfsHadoopFileSystemLoggerSelfTest.java | 2 +-
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 4 +-
.../hadoop/GridHadoopPopularWordsTest.java | 2 +-
.../GridProjectionStartStopRestartSelfTest.java | 52 ++++++++++----------
29 files changed, 79 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
index e8a1769..97d574a 100644
---
a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
@@ -198,7 +198,7 @@ public abstract class ClientAbstractSelfTest extends
GridCommonAbstractTest {
clientCfg.setRestTcpPort(BINARY_PORT);
clientCfg.setRestAccessibleFolders(
- U.getGridGainHome() + "/work/log",
+ U.getIgniteHome() + "/work/log",
U.resolveGridGainPath("modules/core/src/test/resources/log").getAbsolutePath());
if (useSsl()) {
@@ -1305,7 +1305,7 @@ public abstract class ClientAbstractSelfTest extends
GridCommonAbstractTest {
final GridClientCompute compute = client.compute();
/* Usually this log file is created by log4j, but some times it
doesn't exists. */
- new File(U.getGridGainHome(), "work/log/gridgain.log").createNewFile();
+ new File(U.getIgniteHome(), "work/log/gridgain.log").createNewFile();
List<String> log = compute.log(6, 7);
assertNotNull(log);
@@ -1319,7 +1319,7 @@ public abstract class ClientAbstractSelfTest extends
GridCommonAbstractTest {
String path = "work/log/gridgain.log." + System.currentTimeMillis();
- File file = new File(U.getGridGainHome(), path);
+ File file = new File(U.getIgniteHome(), path);
assert !file.exists();
@@ -1400,7 +1400,7 @@ public abstract class ClientAbstractSelfTest extends
GridCommonAbstractTest {
log(),
new Callable<Object>() {
@Override public Object call() throws Exception {
- new File(U.getGridGainHome(),
"work/security.log").createNewFile();
+ new File(U.getIgniteHome(),
"work/security.log").createNewFile();
compute.log("work/log/../security.log", -1, -1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index d9c7a26..76f0cc2 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -555,7 +555,7 @@ public class RestBinaryProtocolSelfTest extends
GridCommonAbstractTest {
public void testLog() throws Exception {
String path = "work/log/ignite.log." + System.currentTimeMillis();
- File file = new File(U.getGridGainHome(), path);
+ File file = new File(U.getIgniteHome(), path);
assert !file.exists();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 1106e05..21c4e44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1355,10 +1355,10 @@ public class IgnitionEx {
// Set Ignite home.
if (ggHome == null)
- ggHome = U.getGridGainHome();
+ ggHome = U.getIgniteHome();
else
// If user provided IGNITE_HOME - set it as a system property.
- U.setGridGainHome(ggHome);
+ U.setIgniteHome(ggHome);
U.setWorkDirectory(cfg.getWorkDirectory(), ggHome);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
index 0786ca7..f4064ef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
@@ -58,7 +58,7 @@ public class GridLogCommandHandler extends
GridRestCommandHandlerAdapter {
String[] accessiblePaths =
ctx.config().getClientConnectionConfiguration().getRestAccessibleFolders();
if (accessiblePaths == null) {
- String ggHome = U.getGridGainHome();
+ String ggHome = U.getIgniteHome();
if (ggHome != null)
accessiblePaths = new String[] {ggHome};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
index 3d8ca35..bc9a13f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
@@ -53,7 +53,7 @@ public final class GridConfigurationFinder {
* @throws IOException Thrown in case of any IO error.
*/
public static List<GridTuple3<String, Long, File>> getConfigFiles() throws
IOException {
- return getConfigFiles(new File(U.getGridGainHome()));
+ return getConfigFiles(new File(U.getIgniteHome()));
}
/**
@@ -83,7 +83,7 @@ public final class GridConfigurationFinder {
}
});
- File dflt = new File(U.getGridGainHome() + File.separator + DFLT_CFG);
+ File dflt = new File(U.getIgniteHome() + File.separator + DFLT_CFG);
if (dflt.exists())
lst.addFirst(F.t(DFLT_CFG, dflt.lastModified(), dflt));
@@ -130,7 +130,7 @@ public final class GridConfigurationFinder {
}
if (springCfg) {
- String path =
file.getAbsolutePath().substring(U.getGridGainHome().length());
+ String path =
file.getAbsolutePath().substring(U.getIgniteHome().length());
if (path.startsWith(File.separator))
path = path.substring(File.separator.length());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index a5ff2f6..5535e1b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -2474,7 +2474,7 @@ public abstract class IgniteUtils {
*
* @return {@code IGNITE_HOME} property.
*/
- @Nullable public static String getGridGainHome() {
+ @Nullable public static String getIgniteHome() {
GridTuple<String> ggHomeTup = ggHome;
String ggHome0;
@@ -2504,7 +2504,7 @@ public abstract class IgniteUtils {
/**
* @param path Ignite home. May be {@code null}.
*/
- public static void setGridGainHome(@Nullable String path) {
+ public static void setIgniteHome(@Nullable String path) {
GridTuple<String> ggHomeTup = ggHome;
String ggHome0;
@@ -2543,7 +2543,7 @@ public abstract class IgniteUtils {
* If not, check if path is absolute.
* If all checks fail, then {@code null} is returned.
* <p>
- * See {@link #getGridGainHome()} for information on how {@code
IGNITE_HOME} is retrieved.
+ * See {@link #getIgniteHome()} for information on how {@code IGNITE_HOME}
is retrieved.
*
* @param path Path to resolve.
* @return Resolved path as file, or {@code null} if path cannot be
resolved.
@@ -2555,7 +2555,7 @@ public abstract class IgniteUtils {
* 1. Check relative to IGNITE_HOME specified in configuration, if any.
*/
- String home = getGridGainHome();
+ String home = getIgniteHome();
if (home != null) {
File file = new File(home, path);
@@ -2590,11 +2590,11 @@ public abstract class IgniteUtils {
* If all checks fail,
* then {@code null} is returned, otherwise URL representing path is
returned.
* <p>
- * See {@link #getGridGainHome()} for information on how {@code
IGNITE_HOME} is retrieved.
+ * See {@link #getIgniteHome()} for information on how {@code IGNITE_HOME}
is retrieved.
*
* @param path Path to resolve.
* @return Resolved path as URL, or {@code null} if path cannot be
resolved.
- * @see #getGridGainHome()
+ * @see #getIgniteHome()
*/
@Nullable public static URL resolveGridGainUrl(String path) {
return resolveGridGainUrl(path, true);
@@ -2607,12 +2607,12 @@ public abstract class IgniteUtils {
* If all checks fail,
* then {@code null} is returned, otherwise URL representing path is
returned.
* <p>
- * See {@link #getGridGainHome()} for information on how {@code
IGNITE_HOME} is retrieved.
+ * See {@link #getIgniteHome()} for information on how {@code IGNITE_HOME}
is retrieved.
*
* @param path Path to resolve.
* @param metaInf Flag to indicate whether META-INF folder should be
checked or class path root.
* @return Resolved path as URL, or {@code null} if path cannot be
resolved.
- * @see #getGridGainHome()
+ * @see #getIgniteHome()
*/
@SuppressWarnings({"UnusedCatchParameter"})
@Nullable public static URL resolveGridGainUrl(String path, boolean
metaInf) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
index 0b980b7..6fb7e1a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
@@ -59,7 +59,7 @@ public class GridStartupWithSpecifiedWorkDirectorySelfTest
extends TestCase {
nullifyHomeDirectory();
nullifyWorkDirectory();
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
}
/**
@@ -67,15 +67,15 @@ public class GridStartupWithSpecifiedWorkDirectorySelfTest
extends TestCase {
* @return Grid configuration.
*/
private IgniteConfiguration getConfiguration(IgniteLogger log) {
- // We can't use U.getGridGainHome() here because
+ // We can't use U.getIgniteHome() here because
// it will initialize cached value which is forbidden to override.
String ggHome = IgniteSystemProperties.getString(IGNITE_HOME);
assert ggHome != null;
- U.setGridGainHome(null);
+ U.setIgniteHome(null);
- String ggHome0 = U.getGridGainHome();
+ String ggHome0 = U.getIgniteHome();
assert ggHome0 == null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
index 36769db..5c87abe 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
@@ -51,7 +51,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest
extends TestCase {
// Next grid in the same VM shouldn't use cached values produced by
these tests.
nullifyHomeDirectory();
- U.getGridGainHome();
+ U.getIgniteHome();
}
/**
@@ -60,15 +60,15 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest
extends TestCase {
public void testStartStopWithUndefinedGridGainHome() throws Exception {
IgniteUtils.nullifyHomeDirectory();
- // We can't use U.getGridGainHome() here because
+ // We can't use U.getIgniteHome() here because
// it will initialize cached value which is forbidden to override.
String ggHome = IgniteSystemProperties.getString(IGNITE_HOME);
assert ggHome != null;
- U.setGridGainHome(null);
+ U.setIgniteHome(null);
- String ggHome0 = U.getGridGainHome();
+ String ggHome0 = U.getIgniteHome();
assert ggHome0 == null;
@@ -95,7 +95,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest
extends TestCase {
try (Ignite g = G.start(cfg)) {
assert g != null;
- ggHome0 = U.getGridGainHome();
+ ggHome0 = U.getIgniteHome();
assert ggHome0 == null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GgfsSharedMemoryTestServer.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GgfsSharedMemoryTestServer.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GgfsSharedMemoryTestServer.java
index 6e8a900..6994ae4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GgfsSharedMemoryTestServer.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GgfsSharedMemoryTestServer.java
@@ -35,7 +35,7 @@ public class GgfsSharedMemoryTestServer {
public static void main(String[] args) throws IgniteCheckedException {
System.out.println("Starting server ...");
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
// Tell our process PID to the wrapper.
X.println(GridJavaProcess.PID_MSG_PREFIX + U.jvmPid());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
index f081acf..c8f53c1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
@@ -49,7 +49,7 @@ public class IpcSharedMemoryCrashDetectionSelfTest extends
GridCommonAbstractTes
* @throws Exception If failed.
*/
public void testGgfsServerClientInteractionsUponClientKilling() throws
Exception {
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
// Run server endpoint.
IpcSharedMemoryServerEndpoint srv = new
IpcSharedMemoryServerEndpoint();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
index e2a49da..86ab415 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java
@@ -118,7 +118,7 @@ public final class GridSingleExecutionTest {
impl.removeAllAppenders();
- String fileName = U.getGridGainHome() + "/work/log/" + log;
+ String fileName = U.getIgniteHome() + "/work/log/" + log;
// Configure output that should go to System.out
RollingFileAppender fileApp;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
index e86b79e..59459ba 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
@@ -249,7 +249,7 @@ abstract class GridCacheAbstractLoadTest {
impl.removeAllAppenders();
- String fileName = U.getGridGainHome() + "/work/log/" + log;
+ String fileName = U.getIgniteHome() + "/work/log/" + log;
// Configure output that should go to System.out
RollingFileAppender fileApp;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
b/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
index 676f78e..4aa440e 100644
---
a/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
@@ -38,7 +38,7 @@ public class IgniteJavaLoggerTest extends TestCase {
* @throws Exception If failed.
*/
public void testLogInitialize() throws Exception {
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
log = new IgniteJavaLogger();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
index 407ba8c..2d517f5 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
@@ -194,6 +194,6 @@ public class GridSharedFsCheckpointSpiMultiThreadedSelfTest
extends
@Override protected void afterTestsStopped() throws Exception {
super.afterTestsStopped();
- deleteFolder(new File(U.getGridGainHome(), PATH));
+ deleteFolder(new File(U.getIgniteHome(), PATH));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
index 841cdf7..1eb9f47 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
@@ -268,7 +268,7 @@ public abstract class GridAbstractCommunicationSelfTest<T
extends CommunicationS
* @throws Exception If failed.
*/
private void startSpis() throws Exception {
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
spis.clear();
nodes.clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index f1587c9..c4c3ece 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -435,7 +435,7 @@ public abstract class
GridTcpCommunicationSpiMultithreadedSelfTest extends GridS
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
spis.clear();
nodes.clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
index 89d4b63..7474c38 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
@@ -55,7 +55,7 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest
extends GridCommonAbstrac
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
spi = spi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
index 3367d70..5881750 100644
---
a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
@@ -47,7 +47,7 @@ public class GridCommandLineLoaderTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLoader() throws Exception {
- String path = U.getGridGainHome() + GRID_CFG_PATH;
+ String path = U.getIgniteHome() + GRID_CFG_PATH;
info("Loading Grid from configuration file: " + path);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 300cdce..d14662b 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -825,7 +825,7 @@ public final class GridTestUtils {
File file = new File(path).getAbsoluteFile();
if (!file.exists()) {
- String home = ggHome != null ? ggHome : U.getGridGainHome();
+ String home = ggHome != null ? ggHome : U.getIgniteHome();
if (home == null)
return null;
@@ -1433,6 +1433,6 @@ public final class GridTestUtils {
* @return Path to apache ignite.
*/
public static String apacheIgniteTestPath() {
- return System.getProperty("IGNITE_TEST_PATH", U.getGridGainHome() +
"/target/ignite");
+ return System.getProperty("IGNITE_TEST_PATH", U.getIgniteHome() +
"/target/ignite");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index d830c37..9c2a475 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -70,7 +70,7 @@ public class IgniteTestResources {
log = rootLog.getLogger(getClass());
nodeId = UUID.randomUUID();
jmx = ManagementFactory.getPlatformMBeanServer();
- home = U.getGridGainHome();
+ home = U.getIgniteHome();
locHost = localHost();
GridTestKernalContext ctx = new GridTestKernalContext();
@@ -91,7 +91,7 @@ public class IgniteTestResources {
log = rootLog.getLogger(getClass());
nodeId = UUID.randomUUID();
- home = U.getGridGainHome();
+ home = U.getIgniteHome();
locHost = localHost();
GridTestKernalContext ctx = new GridTestKernalContext();
@@ -111,7 +111,7 @@ public class IgniteTestResources {
nodeId = UUID.randomUUID();
jmx = ManagementFactory.getPlatformMBeanServer();
- home = U.getGridGainHome();
+ home = U.getIgniteHome();
locHost = localHost();
GridTestKernalContext ctx = new GridTestKernalContext();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
index 2fd4df7..deae168 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
@@ -419,7 +419,7 @@ public abstract class GridSpiAbstractTest<T extends
IgniteSpi> extends GridAbstr
* @throws Exception If failed.
*/
protected void spiStart(IgniteSpi spi) throws Exception {
- U.setWorkDirectory(null, U.getGridGainHome());
+ U.setWorkDirectory(null, U.getIgniteHome());
// Start SPI with unique grid name.
spi.spiStart(getTestGridName());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/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 ab9d38f..6b414e7 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
@@ -73,7 +73,7 @@ public class GridHadoopSetup {
* </ul>
*/
private static void configureHadoop() {
- String gridgainHome = U.getGridGainHome();
+ String gridgainHome = U.getIgniteHome();
println("IGNITE_HOME is set to '" + gridgainHome + "'.");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/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 ede8776..a585c40 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",
- "-DIGNITE_HOME=" + U.getGridGainHome()));
+ "-DIGNITE_HOME=" + U.getIgniteHome()));
return meta;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
----------------------------------------------------------------------
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
index e740f90..288c63f 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
@@ -76,7 +76,7 @@ public class GridHadoopExternalProcessStarter {
* @throws Exception
*/
public void run() throws Exception {
- U.setWorkDirectory(args.workDir, U.getGridGainHome());
+ U.setWorkDirectory(args.workDir, U.getIgniteHome());
File outputDir = outputDirectory();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
index dced567..39eeb0b 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
@@ -148,7 +148,7 @@ public abstract class
GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
secondaryConf.setInt("fs.ggfs.block.size", 1024);
- String path = U.getGridGainHome() + SECONDARY_CFG_PATH;
+ String path = U.getIgniteHome() + SECONDARY_CFG_PATH;
File file = new File(path);
@@ -225,7 +225,7 @@ public abstract class
GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
@Override protected void afterTestsStopped() throws Exception {
G.stopAll(true);
- String path = U.getGridGainHome() + SECONDARY_CFG_PATH;
+ String path = U.getIgniteHome() + SECONDARY_CFG_PATH;
new File(path).delete();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerSelfTest.java
index a98c7e5..b9010f3 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerSelfTest.java
@@ -44,7 +44,7 @@ public class GridGgfsHadoopFileSystemLoggerSelfTest extends
GridGgfsCommonAbstra
private static final String GGFS_NAME = "ggfs";
/** Log file path. */
- private static final String LOG_DIR = U.getGridGainHome();
+ private static final String LOG_DIR = U.getIgniteHome();
/** Endpoint address. */
private static final String ENDPOINT = "localhost:10500";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
index ecada0c..bf7f143 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
@@ -282,7 +282,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest
extends GridGgfsCommonA
public void testLogDirectory() throws Exception {
startUp();
- assertEquals(Paths.get(U.getGridGainHome()).normalize().toString(),
+ assertEquals(Paths.get(U.getIgniteHome()).normalize().toString(),
ggfs.clientLogDirectory());
}
@@ -302,7 +302,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest
extends GridGgfsCommonA
if (logging)
fsCfg.setBoolean(String.format(PARAM_GGFS_LOG_ENABLED,
"ggfs:ggfs-grid@"), logging);
- fsCfg.setStrings(String.format(PARAM_GGFS_LOG_DIR, "ggfs:ggfs-grid@"),
U.getGridGainHome());
+ fsCfg.setStrings(String.format(PARAM_GGFS_LOG_DIR, "ggfs:ggfs-grid@"),
U.getIgniteHome());
return (GridGgfsHadoopFileSystem)FileSystem.get(new
URI("ggfs://ggfs:ggfs-grid@/"), fsCfg);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/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 26b1c72..95a7bd0 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,7 +46,7 @@ import static java.util.Collections.*;
*/
public class GridHadoopPopularWordsTest {
/** Ignite home. */
- private static final String IGNITE_HOME = U.getGridGainHome();
+ private static final String IGNITE_HOME = U.getIgniteHome();
/** The path to the input directory. ALl files in that directory will be
processed. */
private static final Path BOOKS_LOCAL_DIR =
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b7b2518/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 3be64ad..3b8278e 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
@@ -180,7 +180,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 1;
@@ -210,7 +210,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, DFLT_TIMEOUT, 1);
assert res.size() == 3;
@@ -240,7 +240,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -262,7 +262,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
assert ignite.cluster().nodes().size() == 3;
res = startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.isEmpty();
@@ -281,7 +281,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -303,7 +303,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
assert ignite.cluster().nodes().size() == 3;
res = startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.isEmpty();
@@ -322,7 +322,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -346,7 +346,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
joinedLatch = new CountDownLatch(2);
res = startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 5,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 5,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 2;
@@ -376,8 +376,8 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- F.asList(map(HOST, SSH_UNAME, pwd, key, 2,
U.getGridGainHome(), CFG_NO_ATTR, null),
- map(HOST, SSH_UNAME, pwd, key, 3, U.getGridGainHome(),
CFG_NO_ATTR, null)),
+ F.asList(map(HOST, SSH_UNAME, pwd, key, 2, U.getIgniteHome(),
CFG_NO_ATTR, null),
+ map(HOST, SSH_UNAME, pwd, key, 3, U.getIgniteHome(),
CFG_NO_ATTR, null)),
null, false, 0, 16);
assert res.size() == 5;
@@ -407,7 +407,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -432,7 +432,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
leftLatch = new CountDownLatch(3);
res = startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, true, 0, 16);
assert res.size() == 3;
@@ -463,11 +463,11 @@ public class GridProjectionStartStopRestartSelfTest
extends GridCommonAbstractTe
String script = U.isWindows() ? CUSTOM_SCRIPT_WIN :
CUSTOM_SCRIPT_LINUX;
- script =
Paths.get(U.getGridGainHome()).relativize(U.resolveGridGainPath(script).toPath()).toString();
+ script =
Paths.get(U.getIgniteHome()).relativize(U.resolveGridGainPath(script).toPath()).toString();
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1,
U.getGridGainHome(), null, script),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1,
U.getIgniteHome(), null, script),
null, false, 0, 16);
assert res.size() == 1;
@@ -499,7 +499,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, null, 3,
U.getGridGainHome(), CFG_NO_ATTR,
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, null, 3,
U.getIgniteHome(), CFG_NO_ATTR,
null), null, false, 0, 16);
assert res.size() == 3;
@@ -534,7 +534,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2,
U.getGridGainHome(), CFG_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2,
U.getIgniteHome(), CFG_ATTR, null),
null, false, 0, 16);
assert res.size() == 2;
@@ -553,7 +553,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
joinedLatch = new CountDownLatch(1);
res = startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 1;
@@ -597,7 +597,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -632,7 +632,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -674,7 +674,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -711,7 +711,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -748,7 +748,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2,
U.getGridGainHome(), CFG_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2,
U.getIgniteHome(), CFG_ATTR, null),
null, false, 0, 16);
assert res.size() == 2;
@@ -767,7 +767,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
joinedLatch = new CountDownLatch(1);
res = startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 1;
@@ -814,7 +814,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -851,7 +851,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
@@ -890,7 +890,7 @@ public class GridProjectionStartStopRestartSelfTest extends
GridCommonAbstractTe
Collection<GridTuple3<String, Boolean, String>> res =
startNodes(ignite.cluster(),
- maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getGridGainHome(), CFG_NO_ATTR, null),
+ maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3,
U.getIgniteHome(), CFG_NO_ATTR, null),
null, false, 0, 16);
assert res.size() == 3;
