# ignite-164 : rename resolveGridGainPath, resolveGridGainUrl util methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c323001c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c323001c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c323001c Branch: refs/heads/sprint-1 Commit: c323001ca24c916281fc5a370398114e61bbd177 Parents: 0b7b251 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Feb 5 13:10:36 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Feb 5 13:10:36 2015 +0300 ---------------------------------------------------------------------- .../client/ClientAbstractMultiThreadedSelfTest.java | 2 +- .../org/apache/ignite/client/ClientSslNodeStartup.java | 2 +- .../org/apache/ignite/client/ClientStartNodeTask.java | 2 +- .../impl/ClientPropertiesConfigurationSelfTest.java | 4 ++-- .../client/integration/ClientAbstractSelfTest.java | 2 +- .../src/main/java/org/apache/ignite/IgniteLogger.java | 2 +- .../java/org/apache/ignite/cache/CachingProvider.java | 2 +- .../router/impl/GridRouterCommandLineStartup.java | 2 +- .../java/org/apache/ignite/internal/IgnitionEx.java | 8 ++++---- .../rest/handlers/log/GridLogCommandHandler.java | 2 +- .../org/apache/ignite/internal/util/IgniteUtils.java | 12 ++++++------ .../ignite/internal/visor/file/VisorFileBlockTask.java | 2 +- .../internal/visor/file/VisorLatestTextFilesTask.java | 2 +- .../ignite/internal/visor/log/VisorLogSearchTask.java | 2 +- .../ignite/internal/visor/util/VisorTaskUtils.java | 2 +- .../org/apache/ignite/logger/java/IgniteJavaLogger.java | 2 +- .../marshaller/optimized/IgniteOptimizedMarshaller.java | 2 +- .../ignite/loadtests/discovery/GridGcTimeoutTest.java | 2 +- .../apache/ignite/loadtests/job/GridJobLoadTest.java | 2 +- .../ignite/loadtests/nio/GridNioBenchmarkTest.java | 2 +- .../loadtests/streamer/GridStreamerBenchmark.java | 2 +- .../ignite/startup/GridRandomCommandLineLoader.java | 2 +- .../org/apache/ignite/testframework/GridTestUtils.java | 4 ++-- .../ignite/testframework/junits/GridAbstractTest.java | 2 +- .../junits/common/GridAbstractExamplesTest.java | 2 +- .../junits/logger/GridTestLog4jLogger.java | 2 +- .../ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java | 4 ++-- .../ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java | 4 ++-- .../fs/hadoop/GridGgfsHadoopFileSystemWrapper.java | 2 +- .../child/GridHadoopExternalProcessStarter.java | 2 +- .../java/org/apache/ignite/fs/GridFileSystemLoad.java | 4 ++-- .../fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- .../ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java | 2 +- .../fs/GridGgfsHadoopFileSystemAbstractSelfTest.java | 2 +- .../fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +- .../fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java | 2 +- .../GridGgfsHadoopFileSystemSecondaryModeSelfTest.java | 2 +- .../ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java | 2 +- .../ignite/hadoop/GridHadoopPopularWordsTest.java | 2 +- .../processors/hadoop/GridHadoopCommandLineTest.java | 4 ++-- .../loadtests/ggfs/GridGgfsPerformanceBenchmark.java | 2 +- .../hibernate/CacheHibernateBlobStoreSelfTest.java | 8 ++++---- .../apache/ignite/logger/log4j/IgniteLog4jLogger.java | 4 ++-- .../logger/log4j/GridLog4jCorrectFileNameTest.java | 2 +- .../protocols/http/jetty/GridJettyRestProtocol.java | 2 +- .../org/apache/ignite/internal/GridFactorySelfTest.java | 2 +- .../ignite/internal/GridNodeStartUtilsSelfTest.java | 2 +- .../GridProjectionStartStopRestartSelfTest.java | 2 +- .../internal/GridTaskUriDeploymentDeadlockSelfTest.java | 2 +- .../org/apache/ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- ...idUriDeploymentClassLoaderMultiThreadedSelfTest.java | 4 ++-- .../uri/GridUriDeploymentClassLoaderSelfTest.java | 2 +- .../GridUriDeploymentClassloaderRegisterSelfTest.java | 2 +- .../uri/GridUriDeploymentFileProcessorSelfTest.java | 2 +- .../uri/GridUriDeploymentMultiScannersSelfTest.java | 2 +- .../deployment/uri/GridUriDeploymentSimpleSelfTest.java | 2 +- .../file/GridFileDeploymentUndeploySelfTest.java | 2 +- .../uri/scanners/http/GridHttpDeploymentSelfTest.java | 2 +- .../java/org/apache/ignite/tools/GridToolsSelfTest.java | 6 +++--- .../src/main/scala/org/apache/ignite/visor/visor.scala | 2 +- .../servlet/IgniteServletContextListenerStartup.java | 2 +- .../ignite/startup/servlet/IgniteServletStartup.java | 2 +- .../ignite/internal/websession/WebSessionSelfTest.java | 2 +- .../internal/websession/WebSessionServerStart.java | 2 +- .../java/org/apache/ignite/yardstick/IgniteNode.java | 2 +- 65 files changed, 86 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java index 3f43c4f..9b90a1e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java @@ -93,7 +93,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst public static final int REST_TCP_PORT_BASE = 12345; static { - System.setProperty("CLIENTS_MODULE_PATH", U.resolveGridGainPath("modules/clients").getAbsolutePath()); + System.setProperty("CLIENTS_MODULE_PATH", U.resolveIgnitePath("modules/clients").getAbsolutePath()); } /** Client instance for each test. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/clients/src/test/java/org/apache/ignite/client/ClientSslNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientSslNodeStartup.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientSslNodeStartup.java index f29f427..3d3cc4d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientSslNodeStartup.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientSslNodeStartup.java @@ -50,7 +50,7 @@ public class ClientSslNodeStartup { * @throws IgniteCheckedException In case of any exception. */ public static void main(String[] args) throws IgniteCheckedException { - System.setProperty("CLIENTS_MODULE_PATH", U.resolveGridGainPath("modules/clients").getAbsolutePath()); + System.setProperty("CLIENTS_MODULE_PATH", U.resolveIgnitePath("modules/clients").getAbsolutePath()); try (Ignite g = G.start("modules/clients/src/test/resources/spring-server-ssl-node.xml")) { U.sleep(Long.MAX_VALUE); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java index 03f4643..abed273 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java @@ -102,7 +102,7 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ if (path == null) throw new IllegalArgumentException("Unsupported node type: " + type); - URL url = U.resolveGridGainUrl(path); + URL url = U.resolveIgniteUrl(path); BeanFactory ctx = new FileSystemXmlApplicationContext(url.toString()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java index 7b903fa..8e2e1dd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java @@ -50,9 +50,9 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes */ static { GRID_CLIENT_SPRING_CONFIG = - U.resolveGridGainUrl("/modules/clients/config/grid-client-spring-config.xml"); + U.resolveIgniteUrl("/modules/clients/config/grid-client-spring-config.xml"); - GRID_CLIENT_CONFIG = U.resolveGridGainUrl("/modules/clients/config/grid-client-config.properties"); + GRID_CLIENT_CONFIG = U.resolveIgniteUrl("/modules/clients/config/grid-client-config.properties"); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 97d574a..90b73c0 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 @@ -199,7 +199,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { clientCfg.setRestAccessibleFolders( U.getIgniteHome() + "/work/log", - U.resolveGridGainPath("modules/core/src/test/resources/log").getAbsolutePath()); + U.resolveIgnitePath("modules/core/src/test/resources/log").getAbsolutePath()); if (useSsl()) { clientCfg.setRestTcpSslEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java index eacbe79..7b0e4ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.*; * <pre name="code" class="java"> * GridConfiguration cfg = new GridConfiguration(); * ... - * URL xml = U.resolveGridGainUrl("config/custom-log4j.xml"); + * URL xml = U.resolveIgniteUrl("config/custom-log4j.xml"); * GridLogger log = new GridLog4jLogger(xml); * ... * cfg.setGridLogger(log); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java index c594594..4dcef0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java @@ -40,7 +40,7 @@ public class CachingProvider implements javax.cache.spi.CachingProvider { URI uri = null; try { - URL dfltCfgURL = U.resolveGridGainUrl(IgnitionEx.DFLT_CFG); + URL dfltCfgURL = U.resolveIgniteUrl(IgnitionEx.DFLT_CFG); if (dfltCfgURL != null) uri = dfltCfgURL.toURI(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java index b6bcbad..828fb79 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java @@ -118,7 +118,7 @@ public class GridRouterCommandLineStartup { String cfgPath = args[0]; - URL cfgUrl = U.resolveGridGainUrl(cfgPath); + URL cfgUrl = U.resolveIgniteUrl(cfgPath); if (cfgUrl == null) { X.error("Spring XML file not found (is IGNITE_HOME set?): " + cfgPath); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 21c4e44..420905d 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 @@ -426,7 +426,7 @@ public class IgnitionEx { * also if default grid has already been started. */ public static Ignite start(@Nullable GridSpringResourceContext springCtx) throws IgniteCheckedException { - URL url = U.resolveGridGainUrl(DFLT_CFG); + URL url = U.resolveIgniteUrl(DFLT_CFG); if (url != null) return start(DFLT_CFG, null, springCtx); @@ -577,7 +577,7 @@ public class IgnitionEx { url = new URL(springCfgPath); } catch (MalformedURLException e) { - url = U.resolveGridGainUrl(springCfgPath); + url = U.resolveIgniteUrl(springCfgPath); if (url == null) throw new IgniteCheckedException("Spring XML configuration path is invalid: " + springCfgPath + @@ -810,7 +810,7 @@ public class IgnitionEx { url = new URL(springCfgPath); } catch (MalformedURLException e) { - url = U.resolveGridGainUrl(springCfgPath); + url = U.resolveIgniteUrl(springCfgPath); if (url == null) throw new IgniteCheckedException("Spring XML configuration path is invalid: " + springCfgPath + @@ -2018,7 +2018,7 @@ public class IgnitionEx { if (log4jCls != null) { try { - URL url = U.resolveGridGainUrl("config/ignite-log4j.xml"); + URL url = U.resolveIgniteUrl("config/ignite-log4j.xml"); if (url == null) { File cfgFile = new File("config/ignite-log4j.xml"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 f4064ef..5afa307 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 @@ -118,7 +118,7 @@ public class GridLogCommandHandler extends GridRestCommandHandlerAdapter { * @throws IOException If file couldn't be accessed or read failed. */ private List<String> readLog(String path, int from, int to) throws IgniteCheckedException, IOException { - URL url = U.resolveGridGainUrl(path); + URL url = U.resolveIgniteUrl(path); if (url == null) throw new IgniteCheckedException("Log file not found: " + path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 5535e1b..74e5363 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 @@ -2548,7 +2548,7 @@ public abstract class IgniteUtils { * @param path Path to resolve. * @return Resolved path as file, or {@code null} if path cannot be resolved. */ - @Nullable public static File resolveGridGainPath(String path) { + @Nullable public static File resolveIgnitePath(String path) { assert path != null; /* @@ -2596,8 +2596,8 @@ public abstract class IgniteUtils { * @return Resolved path as URL, or {@code null} if path cannot be resolved. * @see #getIgniteHome() */ - @Nullable public static URL resolveGridGainUrl(String path) { - return resolveGridGainUrl(path, true); + @Nullable public static URL resolveIgniteUrl(String path) { + return resolveIgniteUrl(path, true); } /** @@ -2615,11 +2615,11 @@ public abstract class IgniteUtils { * @see #getIgniteHome() */ @SuppressWarnings({"UnusedCatchParameter"}) - @Nullable public static URL resolveGridGainUrl(String path, boolean metaInf) { - File f = resolveGridGainPath(path); + @Nullable public static URL resolveIgniteUrl(String path, boolean metaInf) { + File f = resolveIgnitePath(path); if (f == null) - f = resolveGridGainPath("os/" + path); + f = resolveIgnitePath("os/" + path); if (f != null) { try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java index 7dad2fa..bed273a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java @@ -100,7 +100,7 @@ public class VisorFileBlockTask extends VisorOneNodeTask<VisorFileBlockTask.Viso /** {@inheritDoc} */ @Override protected IgniteBiTuple<? extends IOException, VisorFileBlock> run(VisorFileBlockArg arg) { try { - URL url = U.resolveGridGainUrl(arg.path); + URL url = U.resolveIgniteUrl(arg.path); if (url == null) return new IgniteBiTuple<>(new NoSuchFileException("File path not found: " + arg.path), null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java index a330edd..6353cbf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorLatestTextFilesTask.java @@ -66,7 +66,7 @@ public class VisorLatestTextFilesTask extends VisorOneNodeTask<IgniteBiTuple<Str assert path != null; assert regexp != null; - URL url = U.resolveGridGainUrl(path); + URL url = U.resolveIgniteUrl(path); if (url == null) return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java index e37bc9b..4cb745e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java @@ -210,7 +210,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi /** {@inheritDoc} */ @Override protected Collection<VisorLogSearchResult> run(VisorLogSearchArg arg) { - URL url = U.resolveGridGainUrl(arg.folder); + URL url = U.resolveIgniteUrl(arg.folder); if (url == null) throw U.convertException(new GridInternalException(new FileNotFoundException("Log folder not found: " + arg.folder))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index 88cdbb2..8df4c84 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -622,7 +622,7 @@ public class VisorTaskUtils { else throw new IgniteCheckedException("Failed to get profiler log folder (unexpected GGFS instance type)"); - URL logsDirUrl = U.resolveGridGainUrl(logsDir != null ? logsDir : DFLT_GGFS_LOG_DIR); + URL logsDirUrl = U.resolveIgniteUrl(logsDir != null ? logsDir : DFLT_GGFS_LOG_DIR); return logsDirUrl != null ? new File(logsDirUrl.getPath()).toPath() : null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java index 92e8d8e..a5e319c 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java @@ -127,7 +127,7 @@ public class IgniteJavaLogger implements IgniteLogger, IgniteLoggerNodeIdAware { * Reads default JUL configuration. */ private void defaultConfiguration() { - final URL cfgUrl = U.resolveGridGainUrl(DFLT_CONFIG_PATH); + final URL cfgUrl = U.resolveIgniteUrl(DFLT_CONFIG_PATH); if (cfgUrl == null) { error("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java index 921e46d..7f042a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java @@ -183,7 +183,7 @@ public class IgniteOptimizedMarshaller extends IgniteAbstractMarshaller { if (path == null) return; - URL url = IgniteUtils.resolveGridGainUrl(path, false); + URL url = IgniteUtils.resolveIgniteUrl(path, false); if (url == null) throw new IgniteCheckedException("Failed to find resource for name: " + path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java index f84b1ed..04bbdb1 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java @@ -39,7 +39,7 @@ public class GridGcTimeoutTest { */ @SuppressWarnings("InfiniteLoopStatement") public static void main(String[] args) throws IgniteCheckedException { - Ignite g = G.start(U.resolveGridGainUrl(CFG_PATH)); + Ignite g = G.start(U.resolveIgniteUrl(CFG_PATH)); IgniteDataLoader<Long, String> ldr = g.dataLoader(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java index e3c16d6..ff70714 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java @@ -41,7 +41,7 @@ public class GridJobLoadTest implements Runnable { */ static { try { - TEST_CONF_DIR = new File(U.resolveGridGainUrl("/modules/core/src/test/config/job-loadtest").toURI()); + TEST_CONF_DIR = new File(U.resolveIgniteUrl("/modules/core/src/test/config/job-loadtest").toURI()); } catch (URISyntaxException e) { throw new RuntimeException("Failed to initialize directory.", e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java index 5b454ee..4439b29 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java @@ -78,7 +78,7 @@ public class GridNioBenchmarkTest { } }; - IgniteLogger log = new GridTestLog4jLogger(U.resolveGridGainUrl("config/ignite-log4j.xml")); + IgniteLogger log = new GridTestLog4jLogger(U.resolveIgniteUrl("config/ignite-log4j.xml")); GridNioServer.<ByteBuffer>builder() .address(InetAddress.getByName("localhost")) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerBenchmark.java index dccd4d0..432ef47 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerBenchmark.java @@ -121,7 +121,7 @@ public class GridStreamerBenchmark { cfgUrl = new URL(cfgPath); } catch (MalformedURLException ignore) { - cfgUrl = U.resolveGridGainUrl(cfgPath); + cfgUrl = U.resolveIgniteUrl(cfgPath); } if (cfgUrl == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java index 39b2ea4..b4d1533 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java @@ -341,7 +341,7 @@ public final class GridRandomCommandLineLoader { assert cfg != null; if (logCfgPath != null) - cfg.setGridLogger(new GridTestLog4jLogger(U.resolveGridGainUrl(logCfgPath))); + cfg.setGridLogger(new GridTestLog4jLogger(U.resolveIgniteUrl(logCfgPath))); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 d14662b..44ed7dd 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 @@ -1323,7 +1323,7 @@ public final class GridTestUtils { KeyStore keyStore = KeyStore.getInstance("JKS"); - keyStore.load(new FileInputStream(U.resolveGridGainPath(GridTestProperties.getProperty("ssl.keystore.path"))), + keyStore.load(new FileInputStream(U.resolveIgnitePath(GridTestProperties.getProperty("ssl.keystore.path"))), storePass); keyMgrFactory.init(keyStore, storePass); @@ -1343,7 +1343,7 @@ public final class GridTestUtils { GridSslBasicContextFactory factory = new GridSslBasicContextFactory(); factory.setKeyStoreFilePath( - U.resolveGridGainPath(GridTestProperties.getProperty("ssl.keystore.path")).getAbsolutePath()); + U.resolveIgnitePath(GridTestProperties.getProperty("ssl.keystore.path")).getAbsolutePath()); factory.setKeyStorePassword(GridTestProperties.getProperty("ssl.keystore.password").toCharArray()); factory.setTrustManagers(GridSslBasicContextFactory.getDisabledTrustManager()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index aac0409..e8ba9a4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -864,7 +864,7 @@ public abstract class GridAbstractTest extends TestCase { */ @SuppressWarnings("deprecation") protected IgniteConfiguration loadConfiguration(String springCfgPath) throws IgniteCheckedException { - URL cfgLocation = U.resolveGridGainUrl(springCfgPath); + URL cfgLocation = U.resolveIgniteUrl(springCfgPath); assert cfgLocation != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java index 9df954a..5c0c7d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java @@ -57,7 +57,7 @@ public abstract class GridAbstractExamplesTest extends GridCommonAbstractTest { if (rmtCfgs.isEmpty()) { info("Loading remote configs properties from file: " + RMT_NODE_CFGS); - try (FileReader reader = new FileReader(U.resolveGridGainPath(RMT_NODE_CFGS))) { + try (FileReader reader = new FileReader(U.resolveIgnitePath(RMT_NODE_CFGS))) { rmtCfgs.load(reader); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java index e9d5f04..db09448 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java @@ -164,7 +164,7 @@ public class GridTestLog4jLogger implements IgniteLogger, IgniteLoggerNodeIdAwar this.path = path; - final URL cfgUrl = U.resolveGridGainUrl(path); + final URL cfgUrl = U.resolveIgniteUrl(path); if (cfgUrl == null) throw new IgniteCheckedException("Log4j configuration path was not found: " + path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 356be6a..f6b37a1 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 @@ -238,7 +238,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { // Get log directory. String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_GGFS_LOG_DIR); - File logDirFile = U.resolveGridGainPath(logDirCfg); + File logDirFile = U.resolveIgnitePath(logDirCfg); String logDir = logDirFile != null ? logDirFile.getAbsolutePath() : null; @@ -295,7 +295,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { try { secondaryUri = new URI(secUri); - URL secondaryCfgUrl = U.resolveGridGainUrl(secConfPath); + URL secondaryCfgUrl = U.resolveIgniteUrl(secConfPath); Configuration conf = new Configuration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 a69bb2a..c4cb52c 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 @@ -234,7 +234,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos // Get log directory. String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_GGFS_LOG_DIR); - File logDirFile = U.resolveGridGainPath(logDirCfg); + File logDirFile = U.resolveIgnitePath(logDirCfg); String logDir = logDirFile != null ? logDirFile.getAbsolutePath() : null; @@ -298,7 +298,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos try { secondaryUri = new URI(secUri); - URL secondaryCfgUrl = U.resolveGridGainUrl(secConfPath); + URL secondaryCfgUrl = U.resolveIgniteUrl(secConfPath); if (secondaryCfgUrl == null) throw new IOException("Failed to resolve secondary file system config URL: " + secConfPath); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopFileSystemWrapper.java index 4837063..012e934 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopFileSystemWrapper.java @@ -60,7 +60,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto Configuration cfg = new Configuration(); if (cfgPath != null) - cfg.addResource(U.resolveGridGainUrl(cfgPath)); + cfg.addResource(U.resolveIgniteUrl(cfgPath)); try { fileSys = uri == null ? FileSystem.get(cfg) : FileSystem.get(new URI(uri), cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 288c63f..b3df37d 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 @@ -147,7 +147,7 @@ public class GridHadoopExternalProcessStarter { * @return Logger. */ private IgniteLogger logger(final File outputDir) { - final URL url = U.resolveGridGainUrl(DFLT_LOG4J_CONFIG); + final URL url = U.resolveIgniteUrl(DFLT_LOG4J_CONFIG); IgniteLog4jLogger logger; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/fs/GridFileSystemLoad.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridFileSystemLoad.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridFileSystemLoad.java index 0882902..9cbba57 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridFileSystemLoad.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridFileSystemLoad.java @@ -232,7 +232,7 @@ public class GridFileSystemLoad { if (startNode) { X.println("Starting node using configuration: " + nodeCfg); - ignite = G.start(U.resolveGridGainUrl(nodeCfg)); + ignite = G.start(U.resolveIgniteUrl(nodeCfg)); } try { @@ -269,7 +269,7 @@ public class GridFileSystemLoad { Configuration cfg = new Configuration(true); - cfg.addResource(U.resolveGridGainUrl(hadoopCfg)); + cfg.addResource(U.resolveIgniteUrl(hadoopCfg)); final FileSystem fs = FileSystem.get(fsPath.toUri(), cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index 9274014..d0f1afa 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -293,7 +293,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf primaryFsCfg = new Configuration(); - primaryFsCfg.addResource(U.resolveGridGainUrl(primaryFileSystemConfigPath())); + primaryFsCfg.addResource(U.resolveIgniteUrl(primaryFileSystemConfigPath())); fs = AbstractFileSystem.get(primaryFsUri, primaryFsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java index 9a325ce..8588733 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java @@ -240,7 +240,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA // Instantiate file system with overridden "seq reads before prefetch" property. Configuration cfg = new Configuration(); - cfg.addResource(U.resolveGridGainUrl(PRIMARY_CFG)); + cfg.addResource(U.resolveIgniteUrl(PRIMARY_CFG)); int seqReads = SEQ_READS_BEFORE_PREFETCH + 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 39eeb0b..a65dc68 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 @@ -2102,7 +2102,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC private FileSystem local(Path home) throws IOException { Configuration cfg = new Configuration(); - cfg.addResource(U.resolveGridGainUrl(HADOOP_FS_CFG)); + cfg.addResource(U.resolveIgniteUrl(HADOOP_FS_CFG)); return FileSystem.get(home.toUri(), cfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java index b8e77be..ac88dad 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java @@ -155,7 +155,7 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst Configuration cfg = new Configuration(); - cfg.addResource(U.resolveGridGainUrl(HADOOP_FS_CFG)); + cfg.addResource(U.resolveIgniteUrl(HADOOP_FS_CFG)); cfg.setBoolean("fs.ggfs.impl.disable.cache", true); cfg.setBoolean(String.format(GridGgfsHadoopUtils.PARAM_GGFS_ENDPOINT_NO_EMBED, name), true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 bf7f143..9b46258 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 @@ -295,7 +295,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA private GridGgfsHadoopFileSystem fileSystem() throws Exception { Configuration fsCfg = new Configuration(); - fsCfg.addResource(U.resolveGridGainUrl("modules/core/src/test/config/hadoop/core-site-loopback.xml")); + fsCfg.addResource(U.resolveIgniteUrl("modules/core/src/test/config/hadoop/core-site-loopback.xml")); fsCfg.setBoolean("fs.ggfs.impl.disable.cache", true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java index 196df00..c95efed 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -138,7 +138,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo Configuration fsCfg = new Configuration(); - fsCfg.addResource(U.resolveGridGainUrl("modules/core/src/test/config/hadoop/core-site-loopback.xml")); + fsCfg.addResource(U.resolveIgniteUrl("modules/core/src/test/config/hadoop/core-site-loopback.xml")); fsCfg.setBoolean("fs.ggfs.impl.disable.cache", true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java index 922232e..cc35d1d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java @@ -133,7 +133,7 @@ public class GridGgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { protected Configuration getFileSystemConfig() { Configuration cfg = new Configuration(); - cfg.addResource(U.resolveGridGainUrl(HADOOP_FS_CFG)); + cfg.addResource(U.resolveIgniteUrl(HADOOP_FS_CFG)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 95a7bd0..9d5d572 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 @@ -180,7 +180,7 @@ public class GridHadoopPopularWordsTest { // Use explicit configuration of distributed file system, if provided. if (DFS_CFG != null) - cfg.addResource(U.resolveGridGainUrl(DFS_CFG)); + cfg.addResource(U.resolveIgniteUrl(DFS_CFG)); jobCfg.setJobName("HadoopPopularWordExample"); jobCfg.setJarByClass(GridHadoopPopularWordsTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java index 09196e7..1ceb273 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java @@ -157,9 +157,9 @@ public class GridHadoopCommandLineTest extends GridCommonAbstractTest { testWorkDir = Files.createTempDirectory("hadoop-cli-test").toFile(); - U.copy(U.resolveGridGainPath("docs/core-site.ignite.xml"), new File(testWorkDir, "core-site.xml"), false); + U.copy(U.resolveIgnitePath("docs/core-site.ignite.xml"), new File(testWorkDir, "core-site.xml"), false); - File srcFile = U.resolveGridGainPath("docs/mapred-site.ignite.xml"); + File srcFile = U.resolveIgnitePath("docs/mapred-site.ignite.xml"); File dstFile = new File(testWorkDir, "mapred-site.xml"); try (BufferedReader in = new BufferedReader(new FileReader(srcFile)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java index 253c60a..73cde0e 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java @@ -206,7 +206,7 @@ public class GridGgfsPerformanceBenchmark { private static FileSystem ggfs(Path home, String cfgPath) throws IOException { Configuration cfg = new Configuration(); - cfg.addResource(U.resolveGridGainUrl(cfgPath)); + cfg.addResource(U.resolveIgniteUrl(cfgPath)); return FileSystem.get(home.toUri(), cfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java index 65a4f77..a8201cd 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java @@ -68,8 +68,8 @@ public class CacheHibernateBlobStoreSelfTest extends * @throws Exception If failed. */ public void testConfigurationByUrl() throws Exception { - URL url = U.resolveGridGainUrl( - "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml"); + URL url = U.resolveIgniteUrl( + "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml"); assert url != null; @@ -83,8 +83,8 @@ public class CacheHibernateBlobStoreSelfTest extends * @throws Exception If failed. */ public void testConfigurationByFile() throws Exception { - URL url = U.resolveGridGainUrl( - "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml"); + URL url = U.resolveIgniteUrl( + "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml"); assert url != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java index 2c867b8..8df6e9d 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java @@ -51,7 +51,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * <pre name="code" class="java"> * GridConfiguration cfg = new GridConfiguration(); * ... - * URL xml = U.resolveGridGainUrl("config/custom-log4j.xml"); + * URL xml = U.resolveIgniteUrl("config/custom-log4j.xml"); * GridLogger log = new GridLog4jLogger(xml); * ... * cfg.setGridLogger(log); @@ -165,7 +165,7 @@ public class IgniteLog4jLogger implements IgniteLogger, IgniteLoggerNodeIdAware, this.path = path; - final URL cfgUrl = U.resolveGridGainUrl(path); + final URL cfgUrl = U.resolveIgniteUrl(path); if (cfgUrl == null) throw new IgniteCheckedException("Log4j configuration path was not found: " + path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java index 7f33f90..e8b2d7a 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java @@ -81,7 +81,7 @@ public class GridLog4jCorrectFileNameTest extends TestCase { try (Ignite ignite = G.start(getConfiguration("grid" + id))) { String id8 = U.id8(ignite.cluster().localNode().id()); String logPath = "work/log/ignite-" + id8 + ".log"; - File logFile = U.resolveGridGainPath(logPath); + File logFile = U.resolveIgnitePath(logPath); assertNotNull("Failed to resolve path: " + logPath, logFile); assertTrue("Log file does not exist: " + logFile, logFile.exists()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java index f6db05b..4a3fb6d 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java @@ -133,7 +133,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter { log.debug("Jetty configuration file is not provided, using defaults."); } else { - cfgUrl = U.resolveGridGainUrl(jettyPath); + cfgUrl = U.resolveIgniteUrl(jettyPath); if (cfgUrl == null) throw new IgniteSpiException("Invalid Jetty configuration file: " + jettyPath); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java index c4ccf59..bda5b54 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java @@ -709,7 +709,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { try { GenericApplicationContext ctx = new GenericApplicationContext(); - new XmlBeanDefinitionReader(ctx).loadBeanDefinitions(new UrlResource(U.resolveGridGainUrl(path))); + new XmlBeanDefinitionReader(ctx).loadBeanDefinitions(new UrlResource(U.resolveIgniteUrl(path))); ctx.refresh(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 992954d..d803fd0 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 @@ -35,7 +35,7 @@ public class GridNodeStartUtilsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testParseFile() throws Exception { - File file = U.resolveGridGainPath("modules/core/src/test/config/start-nodes.ini"); + File file = U.resolveIgnitePath("modules/core/src/test/config/start-nodes.ini"); IgniteBiTuple<Collection<Map<String, Object>>, Map<String, Object>> t = parseFile(file); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 3b8278e..5c39c12 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 @@ -463,7 +463,7 @@ public class GridProjectionStartStopRestartSelfTest extends GridCommonAbstractTe String script = U.isWindows() ? CUSTOM_SCRIPT_WIN : CUSTOM_SCRIPT_LINUX; - script = Paths.get(U.getIgniteHome()).relativize(U.resolveGridGainPath(script).toPath()).toString(); + script = Paths.get(U.getIgniteHome()).relativize(U.resolveIgnitePath(script).toPath()).toString(); Collection<GridTuple3<String, Boolean, String>> res = startNodes(ignite.cluster(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java index b030d66..98126c4 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java @@ -44,7 +44,7 @@ public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTes UriDeploymentSpi deploymentSpi = new UriDeploymentSpi(); deploymentSpi.setUriList( - Arrays.asList(U.resolveGridGainUrl("modules/core/src/test/resources/").toURI().toString())); + Arrays.asList(U.resolveIgniteUrl("modules/core/src/test/resources/").toURI().toString())); if (gridName.endsWith("2")) { // Delay deployment for 2nd grid only. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java index 7c4ee8c..5c1d774 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java @@ -124,7 +124,7 @@ public class GridP2PDisabledSelfTest extends GridCommonAbstractTest { String garDir = "modules/extdata/p2p/deploy"; String garFileName = "p2p.gar"; - File origGarPath = U.resolveGridGainPath(garDir + '/' + garFileName); + File origGarPath = U.resolveIgnitePath(garDir + '/' + garFileName); File tmpPath = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java index 89f019c..2fabeb2 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java @@ -42,7 +42,7 @@ public class GridUriDeploymentClassLoaderMultiThreadedSelfTest extends GridCommo */ private void doTest() throws Exception { final GridUriDeploymentClassLoader ldr = new GridUriDeploymentClassLoader( - new URL[] { U.resolveGridGainUrl(GridTestProperties.getProperty("ant.urideployment.gar.file")) }, + new URL[] { U.resolveIgniteUrl(GridTestProperties.getProperty("ant.urideployment.gar.file")) }, getClass().getClassLoader()); multithreaded( @@ -57,7 +57,7 @@ public class GridUriDeploymentClassLoaderMultiThreadedSelfTest extends GridCommo ); final GridUriDeploymentClassLoader ldr0 = new GridUriDeploymentClassLoader( - new URL[] { U.resolveGridGainUrl(GridTestProperties.getProperty("ant.urideployment.gar.file")) }, + new URL[] { U.resolveIgniteUrl(GridTestProperties.getProperty("ant.urideployment.gar.file")) }, getClass().getClassLoader()); multithreaded( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java index e6d4536..a37d37a 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java @@ -70,6 +70,6 @@ public class GridUriDeploymentClassLoaderSelfTest extends GridUriDeploymentAbstr @GridSpiTestConfig public List<String> getUriList() { return Collections.singletonList(GridTestProperties.getProperty("ant.urideployment.gar.uri"). - replace("EXTDATA", U.resolveGridGainPath("modules/extdata").getAbsolutePath())); + replace("EXTDATA", U.resolveIgnitePath("modules/extdata").getAbsolutePath())); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java index 5c7478f..8d6da98 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java @@ -123,7 +123,7 @@ public class GridUriDeploymentClassloaderRegisterSelfTest extends GridSpiAbstrac public List<String> getUriList() { // No real gar file is required. Add one just to avoid failure because of missed to default directory. return Collections.singletonList(GridTestProperties.getProperty("ant.urideployment.gar.uri"). - replace("EXTDATA", U.resolveGridGainPath("modules/extdata").getAbsolutePath())); + replace("EXTDATA", U.resolveIgnitePath("modules/extdata").getAbsolutePath())); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java index ef600b3..dc5c035 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java @@ -77,7 +77,7 @@ public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbs String baseDirName = tmpDirName + File.separator + System.currentTimeMillis(); String metaDirName = baseDirName + File.separator + "META-INF"; String garDescDirName = - U.resolveGridGainPath(GridTestProperties.getProperty("deploy.gar.descriptor.dir")) + + U.resolveIgnitePath(GridTestProperties.getProperty("deploy.gar.descriptor.dir")) + File.separator + garDescFileName; // Make base, META-INF and deployment dirs. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java index b1a6bf2..af54e06 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java @@ -48,7 +48,7 @@ public class GridUriDeploymentMultiScannersSelfTest extends GridUriDeploymentAbs // One real URI. uriList.add(GridTestProperties.getProperty("ant.urideployment.gar.uri"). - replace("EXTDATA", U.resolveGridGainPath("modules/extdata").getAbsolutePath())); + replace("EXTDATA", U.resolveIgnitePath("modules/extdata").getAbsolutePath())); return uriList; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java index 28f9ee3..e46c0c3 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java @@ -39,7 +39,7 @@ public class GridUriDeploymentSimpleSelfTest extends GridSpiAbstractTest<UriDepl public List<String> getUriList() { // No real gar file is required. Add one just to avoid failure because of missed default directory. return Collections.singletonList(GridTestProperties.getProperty("ant.urideployment.gar.uri"). - replace("EXTDATA", U.resolveGridGainPath("modules/extdata").getAbsolutePath())); + replace("EXTDATA", U.resolveIgnitePath("modules/extdata").getAbsolutePath())); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java index 43314fe..2d6d681 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java @@ -56,7 +56,7 @@ public class GridFileDeploymentUndeploySelfTest extends GridSpiAbstractTest<UriD */ public void testUndeployGarFile() throws Exception { String garFilePath = - U.resolveGridGainPath(GridTestProperties.getProperty("ant.urideployment.gar.file")).getPath(); + U.resolveIgnitePath(GridTestProperties.getProperty("ant.urideployment.gar.file")).getPath(); File garFile = new File(garFilePath); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java index 055ddc9..a24f165 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java @@ -58,7 +58,7 @@ public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes hnd.setDirectoriesListed(true); hnd.setResourceBase( - U.resolveGridGainPath(GridTestProperties.getProperty("ant.urideployment.gar.path")).getPath()); + U.resolveIgnitePath(GridTestProperties.getProperty("ant.urideployment.gar.path")).getPath()); srv.setHandler(hnd); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java index 546ea70..9a56d54 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java @@ -42,7 +42,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { String metaDirName = baseDirName + File.separator + "META-INF"; String garFileName = baseDirName + ".gar"; String garDescDirName = - U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath() + U.resolveIgnitePath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath() + File.separator + "ignite.xml"; // Make base and META-INF dir. @@ -128,7 +128,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { String metaDirName = baseDirName + File.separator + "META-INF"; String garFileName = baseDirName + ".gar"; String garDescrDirName = - U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath(); + U.resolveIgnitePath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath(); // Make base and META-INF dir. boolean mkdir = new File(baseDirName).mkdirs(); @@ -174,7 +174,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { String metaDirName = baseDirName + File.separator + "META-INF"; String garFileName = baseDirName + ".gar"; String garDescrDirName = - U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath() + U.resolveIgnitePath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath() + File.separator + "ignite.xml"; // Make base and META-INF dir. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/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 10cb85b..fb163b6 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 @@ -1475,7 +1475,7 @@ object visor extends VisorTag { new URL(path) catch { case e: Exception => - val url = IgniteUtils.resolveGridGainUrl(path) + val url = IgniteUtils.resolveIgniteUrl(path) if (url == null) throw new IgniteException("Ignite configuration path is invalid: " + path, e) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletContextListenerStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletContextListenerStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletContextListenerStartup.java index 457fffa..eb74c73 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletContextListenerStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletContextListenerStartup.java @@ -112,7 +112,7 @@ public class IgniteServletContextListenerStartup implements ServletContextListen if (cfgUrl == null) // Try with IGNITE_HOME and with context class loader. - cfgUrl = U.resolveGridGainUrl(cfgFile); + cfgUrl = U.resolveIgniteUrl(cfgFile); if (cfgUrl == null) throw new IgniteException("Failed to find Spring configuration file (path provided should be " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java index b4ff6ae..a0fc900 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java @@ -133,7 +133,7 @@ public class IgniteServletStartup extends HttpServlet { if (cfgFile == null) throw new ServletException("Failed to read property: " + cfgFilePathParam); - URL cfgUrl = U.resolveGridGainUrl(cfgFile); + URL cfgUrl = U.resolveIgniteUrl(cfgFile); if (cfgUrl == null) throw new ServletException("Failed to find Spring configuration file (path provided should be " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java index e3b2224..082b314 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java @@ -221,7 +221,7 @@ public class WebSessionSelfTest extends GridCommonAbstractTest { * @return Servlet container web context for this test. */ protected WebAppContext getWebContext(@Nullable String cfg, @Nullable String gridName, HttpServlet servlet) { - WebAppContext ctx = new WebAppContext(U.resolveGridGainPath("modules/core/src/test/webapp").getAbsolutePath(), + WebAppContext ctx = new WebAppContext(U.resolveIgnitePath("modules/core/src/test/webapp").getAbsolutePath(), "/ggtest"); ctx.setInitParameter("IgniteConfigurationFilePath", cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java index b7d989c..117c2a6 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java @@ -52,7 +52,7 @@ public class WebSessionServerStart { private static Server jettyServer(int port, HttpServlet servlet) throws Exception { Server srv = new Server(port); - WebAppContext ctx = new WebAppContext(U.resolveGridGainPath("modules/tests/webapp").getAbsolutePath(), + WebAppContext ctx = new WebAppContext(U.resolveIgnitePath("modules/tests/webapp").getAbsolutePath(), "/ggtest"); ctx.setInitParameter("cfgFilePath", "/examples/config/spring-cache.xml"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323001c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index b07d1f0..1e162c0 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -134,7 +134,7 @@ public class IgniteNode implements BenchmarkServer { url = new URL(springCfgPath); } catch (MalformedURLException e) { - url = IgniteUtils.resolveGridGainUrl(springCfgPath); + url = IgniteUtils.resolveIgniteUrl(springCfgPath); if (url == null) throw new IgniteCheckedException("Spring XML configuration path is invalid: " + springCfgPath +
