Repository: incubator-ignite Updated Branches: refs/heads/ignite-164v2 09fae941c -> 033341421
#ignite-164: remove gridgain from test. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07e925d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07e925d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07e925d8 Branch: refs/heads/ignite-164v2 Commit: 07e925d89a5d5085b4d119038f956d8aa7facea1 Parents: 758ff46 Author: ivasilinets <vasilinetc....@gmail.com> Authored: Thu Feb 5 16:08:33 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Thu Feb 5 16:08:33 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/updatestatus.html | 4 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 106 ------------------- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 106 +++++++++++++++++++ .../internal/util/IgniteUtilsSelfTest.java | 6 +- .../loadtest/GridSingleExecutionTest.java | 2 +- .../cache/GridCacheAbstractLoadTest.java | 6 +- .../cache/GridCacheGroupLockComparisonTest.java | 12 +-- .../startup/GridRandomCommandLineLoader.java | 2 +- .../ignite/startup/GridVmNodesStarter.java | 2 +- .../ignite/testframework/GridTestUtils.java | 18 ++-- .../config/GridTestProperties.java | 2 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/IgniteTestResources.java | 2 +- .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- .../logger/log4j/GridLog4jLoggingFileTest.java | 2 +- .../logger/log4j/GridLog4jLoggingUrlTest.java | 2 +- .../ignite/internal/GridFactorySelfTest.java | 6 +- .../META-INF/bad-signed-deployfile-ignite.xml | 2 +- .../spi/deployment/uri/META-INF/bad_classes.xml | 2 +- .../META-INF/deploy-with-resources-ignite.xml | 2 +- .../uri/META-INF/deploydepend-ignite.xml | 2 +- .../uri/META-INF/deploydir-ignite.xml | 2 +- .../uri/META-INF/deployfile-ignite.xml | 2 +- .../deployment/uri/META-INF/ignite.brokenxml | 4 +- .../deployment/uri/META-INF/ignite.incorrefs | 4 +- .../spi/deployment/uri/META-INF/ignite.xml | 2 +- .../spi/deployment/uri/META-INF/p2p-ignite.xml | 2 +- .../META-INF/well-signed-deployfile-ignite.xml | 2 +- .../ignite/tools/gartask/META-INF/ignite.xml | 4 +- 29 files changed, 157 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/core/src/test/java/org/apache/ignite/internal/updatestatus.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/updatestatus.html b/modules/core/src/test/java/org/apache/ignite/internal/updatestatus.html index 9c97ac2..308c64f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/updatestatus.html +++ b/modules/core/src/test/java/org/apache/ignite/internal/updatestatus.html @@ -18,11 +18,11 @@ <html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en"> <head> <meta name="version" content="1.0.0.20060510"/> - <title>GridGain Update Page</title> + <title>Ignite Update Page</title> <style type="text/css"></style> </head> <body> -<h1>GridGain Update Page.</h1> +<h1>Ignite Update Page.</h1> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 deleted file mode 100644 index 5c87abe..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.util; - -import junit.framework.*; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.logger.java.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.junits.common.*; - -import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.internal.util.IgniteUtils.*; - -/** - * Checks that node can be started without operations with undefined IGNITE_HOME. - * <p> - * Notes: - * 1. The test intentionally extends JUnit {@link TestCase} class to make the test - * independent from {@link GridCommonAbstractTest} stuff. - * 2. Do not replace native Java asserts with JUnit ones - test won't fall on TeamCity. - */ -public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase { - /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - - /** */ - private static final int GRID_COUNT = 2; - - /** {@inheritDoc} */ - @Override protected void tearDown() throws Exception { - // Next grid in the same VM shouldn't use cached values produced by these tests. - nullifyHomeDirectory(); - - U.getIgniteHome(); - } - - /** - * @throws Exception If failed. - */ - public void testStartStopWithUndefinedGridGainHome() throws Exception { - IgniteUtils.nullifyHomeDirectory(); - - // 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.setIgniteHome(null); - - String ggHome0 = U.getIgniteHome(); - - assert ggHome0 == null; - - IgniteLogger log = new IgniteJavaLogger(); - - log.info(">>> Test started: " + getName()); - log.info("Grid start-stop test count: " + GRID_COUNT); - - for (int i = 0; i < GRID_COUNT; i++) { - TcpDiscoverySpi disc = new TcpDiscoverySpi(); - - disc.setIpFinder(IP_FINDER); - - IgniteConfiguration cfg = new IgniteConfiguration(); - - // We have to explicitly configure path to license config because of undefined IGNITE_HOME. - cfg.setLicenseUrl("file:///" + ggHome + "/" + Ignition.DFLT_LIC_FILE_NAME); - - // Default console logger is used - cfg.setGridLogger(log); - cfg.setDiscoverySpi(disc); - cfg.setRestEnabled(false); - - try (Ignite g = G.start(cfg)) { - assert g != null; - - ggHome0 = U.getIgniteHome(); - - assert ggHome0 == null; - - X.println("Stopping grid " + g.cluster().localNode().id()); - } - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java new file mode 100644 index 0000000..1cb9aa6 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java @@ -0,0 +1,106 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.util; + +import junit.framework.*; +import org.apache.ignite.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.logger.java.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.testframework.junits.common.*; + +import static org.apache.ignite.IgniteSystemProperties.*; +import static org.apache.ignite.internal.util.IgniteUtils.*; + +/** + * Checks that node can be started without operations with undefined IGNITE_HOME. + * <p> + * Notes: + * 1. The test intentionally extends JUnit {@link TestCase} class to make the test + * independent from {@link GridCommonAbstractTest} stuff. + * 2. Do not replace native Java asserts with JUnit ones - test won't fall on TeamCity. + */ +public class GridStartupWithUndefinedIgniteHomeSelfTest extends TestCase { + /** */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + + /** */ + private static final int GRID_COUNT = 2; + + /** {@inheritDoc} */ + @Override protected void tearDown() throws Exception { + // Next grid in the same VM shouldn't use cached values produced by these tests. + nullifyHomeDirectory(); + + U.getIgniteHome(); + } + + /** + * @throws Exception If failed. + */ + public void testStartStopWithUndefinedIgniteHome() throws Exception { + IgniteUtils.nullifyHomeDirectory(); + + // 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.setIgniteHome(null); + + String ggHome0 = U.getIgniteHome(); + + assert ggHome0 == null; + + IgniteLogger log = new IgniteJavaLogger(); + + log.info(">>> Test started: " + getName()); + log.info("Grid start-stop test count: " + GRID_COUNT); + + for (int i = 0; i < GRID_COUNT; i++) { + TcpDiscoverySpi disc = new TcpDiscoverySpi(); + + disc.setIpFinder(IP_FINDER); + + IgniteConfiguration cfg = new IgniteConfiguration(); + + // We have to explicitly configure path to license config because of undefined IGNITE_HOME. + cfg.setLicenseUrl("file:///" + ggHome + "/" + Ignition.DFLT_LIC_FILE_NAME); + + // Default console logger is used + cfg.setGridLogger(log); + cfg.setDiscoverySpi(disc); + cfg.setRestEnabled(false); + + try (Ignite g = G.start(cfg)) { + assert g != null; + + ggHome0 = U.getIgniteHome(); + + assert ggHome0 == null; + + X.println("Stopping grid " + g.cluster().localNode().id()); + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java index 774ca2b..5fefc48 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java @@ -159,7 +159,7 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest { try { String urlPath = "/testDownloadUrl/"; srv = GridEmbeddedHttpServer.startHttpServer().withFileDownloadingHandler(urlPath, - GridTestUtils.resolveGridGainPath("/modules/core/src/test/config/tests.properties")); + GridTestUtils.resolveIgnitePath("/modules/core/src/test/config/tests.properties")); File file = new File(System.getProperty("java.io.tmpdir") + File.separator + "url-http.file"); @@ -182,7 +182,7 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest { try { String urlPath = "/testDownloadUrl/"; srv = GridEmbeddedHttpServer.startHttpsServer().withFileDownloadingHandler(urlPath, - GridTestUtils.resolveGridGainPath("modules/core/src/test/config/tests.properties")); + GridTestUtils.resolveIgnitePath("modules/core/src/test/config/tests.properties")); File file = new File(System.getProperty("java.io.tmpdir") + File.separator + "url-http.file"); @@ -204,7 +204,7 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest { File file = new File(System.getProperty("java.io.tmpdir") + File.separator + "url-http.file"); file = U.downloadUrl( - GridTestUtils.resolveGridGainPath("modules/core/src/test/config/tests.properties").toURI().toURL(), file); + GridTestUtils.resolveIgnitePath("modules/core/src/test/config/tests.properties").toURI().toURL(), file); assert file.exists(); assert file.delete(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 86ab415..56b1d85 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 @@ -180,7 +180,7 @@ public final class GridSingleExecutionTest { */ @SuppressWarnings("unchecked") private static Iterable<IgniteConfiguration> getConfigurations(String springCfgPath, String log) throws IgniteCheckedException { - File path = GridTestUtils.resolveGridGainPath(springCfgPath); + File path = GridTestUtils.resolveIgnitePath(springCfgPath); if (path == null) { throw new IgniteCheckedException("Spring XML configuration file path is invalid: " + new File(springCfgPath) + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 59459ba..da32777 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 @@ -102,8 +102,8 @@ abstract class GridCacheAbstractLoadTest { Properties props = new Properties(); try { - props.load(new FileReader(GridTestUtils.resolveGridGainPath( - "modules/tests/config/cache-load.properties"))); + props.load(new FileReader(GridTestUtils.resolveIgnitePath( + "modules/tests/config/cache-load.properties"))); } catch (IOException e) { throw new RuntimeException(e); @@ -319,7 +319,7 @@ abstract class GridCacheAbstractLoadTest { */ @SuppressWarnings("unchecked") protected IgniteConfiguration configuration(String springCfgPath, String log) throws IgniteCheckedException { - File path = GridTestUtils.resolveGridGainPath(springCfgPath); + File path = GridTestUtils.resolveIgnitePath(springCfgPath); if (path == null) throw new IgniteCheckedException("Spring XML configuration file path is invalid: " + new File(springCfgPath) + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java index 7edcf98..f76b554 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java @@ -66,19 +66,19 @@ public class GridCacheGroupLockComparisonTest { System.out.println("batchSize=" + BATCH_SIZE); // Populate and warm-up. - gridGainGroupLock(g, OBJECT_CNT, THREADS); + igniteGroupLock(g, OBJECT_CNT, THREADS); - gridGainGroupLock(g, OBJECT_CNT, THREADS); + igniteGroupLock(g, OBJECT_CNT, THREADS); } } /** - * @param ignite Grid. + * @param ignite Ignite. * @param max Maximum cache size. * @param threads Threads. * @throws Exception If failed. */ - private static void gridGainPutAll(Ignite ignite, final long max, int threads) throws Exception { + private static void ignitePutAll(Ignite ignite, final long max, int threads) throws Exception { X.println(">>>"); X.println(">>> Testing putAll"); X.println(">>>"); @@ -128,12 +128,12 @@ public class GridCacheGroupLockComparisonTest { } /** - * @param ignite Grid. + * @param ignite Ignite. * @param max Maximum cache size. * @param threads Threads. * @throws Exception If failed. */ - private static void gridGainGroupLock(Ignite ignite, final long max, int threads) throws Exception { + private static void igniteGroupLock(Ignite ignite, final long max, int threads) throws Exception { X.println(">>>"); X.println(">>> Testing group lock"); X.println(">>>"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 bf179c8..f3d704e 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 @@ -293,7 +293,7 @@ public final class GridRandomCommandLineLoader { throws IgniteCheckedException { assert springCfgPath != null; - File path = GridTestUtils.resolveGridGainPath(springCfgPath); + File path = GridTestUtils.resolveIgnitePath(springCfgPath); if (path == null) throw new IgniteCheckedException("Spring XML configuration file path is invalid: " + new File(springCfgPath) + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java b/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java index 6fffaa8..a73cc27 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java @@ -186,7 +186,7 @@ public final class GridVmNodesStarter { @SuppressWarnings("unchecked") private static Iterable<IgniteConfiguration> getConfigurations(String springCfgPath) throws IgniteCheckedException { - File path = GridTestUtils.resolveGridGainPath(springCfgPath); + File path = GridTestUtils.resolveIgnitePath(springCfgPath); if (path == null) throw new IgniteCheckedException("Spring XML configuration file path is invalid: " + new File(springCfgPath) + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 705b6ba..19bb3c6 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 @@ -801,31 +801,31 @@ public final class GridTestUtils { * @return Resolved path, or {@code null} if file cannot be resolved. * @see #getIgniteHome() */ - @Nullable public static File resolveGridGainPath(String path) { - return resolveGridGainPath(null, path); + @Nullable public static File resolveIgnitePath(String path) { + return resolveIgnitePath(null, path); } /** - * @param ggHome Optional ignite home path. + * @param igniteHome Optional ignite home path. * @param path Path to resolve. * @return Resolved path, or {@code null} if file cannot be resolved. */ - @Nullable public static File resolveGridGainPath(@Nullable String ggHome, String path) { - File file = resolvePath(ggHome, path); + @Nullable public static File resolveIgnitePath(@Nullable String igniteHome, String path) { + File file = resolvePath(igniteHome, path); - return file != null ? file : resolvePath(ggHome, "os/" + path); + return file != null ? file : resolvePath(igniteHome, "os/" + path); } /** - * @param ggHome Optional ignite home path. + * @param igniteHome Optional ignite home path. * @param path Path to resolve. * @return Resolved path, or {@code null} if file cannot be resolved. */ - @Nullable private static File resolvePath(@Nullable String ggHome, String path) { + @Nullable private static File resolvePath(@Nullable String igniteHome, String path) { File file = new File(path).getAbsoluteFile(); if (!file.exists()) { - String home = ggHome != null ? ggHome : U.getIgniteHome(); + String home = igniteHome != null ? igniteHome : U.getIgniteHome(); if (home == null) return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java index 0e2c2f7..37b3a44 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java @@ -260,7 +260,7 @@ public final class GridTestProperties { path += File.separatorChar + fileName; - File file = GridTestUtils.resolveGridGainPath(path); + File file = GridTestUtils.resolveIgnitePath(path); if (file != null && file.exists()) { assert !file.isDirectory(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 e67ddc7..3068088 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 @@ -1038,7 +1038,7 @@ public abstract class GridAbstractTest extends TestCase { * @return Ignite home. */ protected String home() { - return getTestResources().getGridgainHome(); + return getTestResources().getIgniteHome(); } /** @@ -1057,7 +1057,7 @@ public abstract class GridAbstractTest extends TestCase { cfg.setGridLogger(rsrcs.getLogger()); cfg.setMarshaller(rsrcs.getMarshaller()); cfg.setNodeId(rsrcs.getNodeId()); - cfg.setIgniteHome(rsrcs.getGridgainHome()); + cfg.setIgniteHome(rsrcs.getIgniteHome()); cfg.setMBeanServer(rsrcs.getMBeanServer()); cfg.setPeerClassLoadingEnabled(true); cfg.setMetricsLogFrequency(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 9c2a475..eebc9ec 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 @@ -188,7 +188,7 @@ public class IgniteTestResources { /** * @return Ignite home. */ - public String getGridgainHome() { + public String getIgniteHome() { return home; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index e15d1de..dd0e4be 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@ -60,7 +60,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(GridPortProcessorSelfTest.class); suite.addTestSuite(GridHomePathSelfTest.class); suite.addTestSuite(GridStartupWithSpecifiedWorkDirectorySelfTest.class); - suite.addTestSuite(GridStartupWithUndefinedGridGainHomeSelfTest.class); + suite.addTestSuite(GridStartupWithUndefinedIgniteHomeSelfTest.class); suite.addTestSuite(GridVersionSelfTest.class); suite.addTestSuite(GridListenActorSelfTest.class); suite.addTestSuite(GridNodeLocalSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java index 0bb6abd..9694983 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java @@ -34,7 +34,7 @@ public class GridLog4jLoggingFileTest extends TestCase { /** {@inheritDoc} */ @Override protected void setUp() throws Exception { - File xml = GridTestUtils.resolveGridGainPath("modules/core/src/test/config/log4j-test.xml"); + File xml = GridTestUtils.resolveIgnitePath("modules/core/src/test/config/log4j-test.xml"); assert xml != null; assert xml.exists() == true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java index 748ded9..df1438b 100644 --- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java +++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java @@ -34,7 +34,7 @@ public class GridLog4jLoggingUrlTest extends TestCase { /** {@inheritDoc} */ @Override protected void setUp() throws Exception { - File xml = GridTestUtils.resolveGridGainPath("modules/core/src/test/config/log4j-test.xml"); + File xml = GridTestUtils.resolveIgnitePath("modules/core/src/test/config/log4j-test.xml"); assert xml != null; assert xml.exists(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/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 bda5b54..2b12861 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 @@ -88,7 +88,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { try { srv = GridEmbeddedHttpServer.startHttpServer().withFileDownloadingHandler(null, - GridTestUtils.resolveGridGainPath("/modules/core/src/test/config/default-spring-url-testing.xml")); + GridTestUtils.resolveIgnitePath("/modules/core/src/test/config/default-spring-url-testing.xml")); Ignite ignite = G.start(srv.getBaseUrl()); @@ -111,7 +111,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { try { srv = GridEmbeddedHttpServer.startHttpServer().withFileDownloadingHandler(null, - GridTestUtils.resolveGridGainPath("modules/core/src/test/config/default-spring-url-testing.xml")); + GridTestUtils.resolveIgnitePath("modules/core/src/test/config/default-spring-url-testing.xml")); Ignite ignite = G.start(new URL(srv.getBaseUrl())); @@ -208,7 +208,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { @SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter"}) public void testStartMultipleGridsFromSpring() throws Exception { File cfgFile = - GridTestUtils.resolveGridGainPath(GridTestProperties.getProperty("loader.self.multipletest.config")); + GridTestUtils.resolveIgnitePath(GridTestProperties.getProperty("loader.self.multipletest.config")); assert cfgFile != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml index 0770842..b0f9f1f 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml index adf6948..69a23e3 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml index cc7a105..cc9d3eb 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml index 7e21444..990e30a 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml index 18876ba..bf3b421 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml index 6798b5d..ff720ac 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml index 70ddc1c..79b72e9 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml @@ -6,12 +6,12 @@ Spring configuration file for test classes in gar-file. --> <beans> - <description>Gridgain Spring configuration file in gar-file for ant GAR task.</description> + <description>Ignite Spring configuration file in gar-file for ant GAR task.</description> <!-- Test task specification. --> - <bean id="task" class="org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0"/sdfs>zx + <bean id="task" class="org.apache.ignite.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0"/sdfs>zx <property name="taskTypeId" value="brokenxml-task"/> <property name="version" value="ver1"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs index 303310d..880e03b 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs @@ -6,12 +6,12 @@ Spring configuration file for test classes in gar-file. --> <beans> - <description>Gridgain Spring configuration file in gar-file for ant GAR task.</description> + <description>Ignite Spring configuration file in gar-file for ant GAR task.</description> <!-- Test task specification. --> - <bean id="task" class="org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0"> + <bean id="task" class="org.apache.ignite.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0"> <property name="taskTypeId" value="incorrectref-task"/> <property name="version" value="ver1"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml index 3733af0..662d3ff 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml index 958f26e..36f9335 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <bean id="userVersion" class="java.lang.String"> <constructor-arg value="1"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml index fa6b6bd..fd84a37 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml @@ -26,7 +26,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07e925d8/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml index 869695b..edd7e88 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml @@ -26,13 +26,13 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> + <description>Ignite Spring configuration file in gar-file.</description> <!-- Test tasks specification. --> <util:list id="tasks"> - <value>org.gridgain.grid.tests.p2p.GridP2PTestTask</value> + <value>org.apache.ignite.grid.tests.p2p.GridP2PTestTask</value> <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value> </util:list> </beans>
