# ignite-164 : rename gridgain.xml -> ignite.xml (part 2)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b4b954ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b4b954ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b4b954ca Branch: refs/heads/sprint-1 Commit: b4b954ca75d9349dbbf347402850cf9cc21c75ff Parents: 77dedc0 Author: Artem Shutak <[email protected]> Authored: Thu Feb 5 13:01:09 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Thu Feb 5 13:01:09 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/GridKernalContextImpl.java | 2 +- .../main/java/org/apache/ignite/hadoop/GridHadoopSetup.java | 6 +++--- .../internal/processors/spring/IgniteSpringProcessorImpl.java | 2 +- .../apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java | 2 +- .../org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4b954ca/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index ca0cbd5..38ca694 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -336,7 +336,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable catch (IgniteCheckedException ignored) { if (log != null && log.isDebugEnabled()) log.debug("Failed to load spring component, will not be able to extract userVersion from " + - "META-INF/gridgain.xml."); + "META-INF/ignite.xml."); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4b954ca/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java index 50b1a54..ab9d38f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java @@ -240,9 +240,9 @@ public class GridHadoopSetup { if (hadoopEtc.canWrite()) { // TODO Bigtop if (ask("Replace 'core-site.xml' and 'mapred-site.xml' files with preconfigured templates " + "(existing files will be backed up)?")) { - replaceWithBackup(new File(gridgainDocs, "core-site.gridgain.xml"), new File(hadoopEtc, "core-site.xml")); + replaceWithBackup(new File(gridgainDocs, "core-site.ignite.xml"), new File(hadoopEtc, "core-site.xml")); - replaceWithBackup(new File(gridgainDocs, "mapred-site.gridgain.xml"), new File(hadoopEtc, "mapred-site.xml")); + replaceWithBackup(new File(gridgainDocs, "mapred-site.ignite.xml"), new File(hadoopEtc, "mapred-site.xml")); } else println("Ok. You can configure them later, the templates are available at GridGain's 'docs' directory..."); @@ -255,7 +255,7 @@ public class GridHadoopSetup { warn("Can not write to '" + hiveConfDir.getAbsolutePath() + "'. To run Hive queries you have to " + "configure 'hive-site.xml' manually. The template is available at GridGain's 'docs' directory."); else if (ask("Replace 'hive-site.xml' with preconfigured template (existing file will be backed up)?")) - replaceWithBackup(new File(gridgainDocs, "hive-site.gridgain.xml"), new File(hiveConfDir, "hive-site.xml")); + replaceWithBackup(new File(gridgainDocs, "hive-site.ignite.xml"), new File(hiveConfDir, "hive-site.xml")); else println("Ok. You can configure it later, the template is available at GridGain's 'docs' directory..."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4b954ca/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java index 5561aa1..efc7bf2 100644 --- a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java +++ b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java @@ -43,7 +43,7 @@ import java.util.concurrent.atomic.*; */ public class IgniteSpringProcessorImpl implements IgniteSpringProcessor { /** Path to {@code gridgain.xml} file. */ - public static final String IGNITE_XML_PATH = "META-INF/gridgain.xml"; + public static final String IGNITE_XML_PATH = "META-INF/ignite.xml"; /** System class loader user version. */ private static final AtomicReference<String> SYS_LDR_VER = new AtomicReference<>(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4b954ca/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java ---------------------------------------------------------------------- diff --git a/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java b/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java index 1f750df..d4a70a3 100644 --- a/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java +++ b/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java @@ -39,7 +39,7 @@ import java.io.*; */ public class IgniteDeploymentGarAntTask extends Zip { /** GAR descriptor name. Its value is {@code gridgain.xml}. */ - public static final String DESC_NAME = "gridgain.xml"; + public static final String DESC_NAME = "ignite.xml"; /** Default descriptor path. */ private static final String DESC_PATH = "META-INF"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4b954ca/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java index deb551e..ee66f85 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java @@ -329,7 +329,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi, public static final int DFLT_HTTP_SCAN_FREQUENCY = 300000; /** Default task description file path and name (value is {@code META-INF/gridgain.xml}). */ - public static final String XML_DESCRIPTOR_PATH = "META-INF/gridgain.xml"; + public static final String XML_DESCRIPTOR_PATH = "META-INF/ignite.xml"; /** * Default temporary directory name relative to file path
