#ignite-164: remove gridgain from code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08213dfb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08213dfb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08213dfb Branch: refs/heads/ignite-164v2 Commit: 08213dfbd7cd605f7a319ab88c30179fc909108e Parents: a72e031 Author: ivasilinets <vasilinetc....@gmail.com> Authored: Thu Feb 5 16:46:16 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Thu Feb 5 16:46:16 2015 +0300 ---------------------------------------------------------------------- modules/extdata/p2p/META-INF/ignite.xml | 2 +- .../uri/tasks/GridUriDeploymentDependency1.java | 2 +- .../uri/tasks/GridUriDeploymentDependency2.java | 2 +- .../uri/tasks/GridUriDeploymentTestTask2.java | 2 +- .../apache/ignite/client/hadoop/package.html | 2 +- .../org/apache/ignite/fs/hadoop/v1/package.html | 2 +- .../org/apache/ignite/fs/hadoop/v2/package.html | 2 +- .../apache/ignite/hadoop/GridHadoopSetup.java | 32 ++++++++++---------- .../apache/ignite/cache/hibernate/package.html | 4 +-- .../CacheHibernateBlobStoreEntry.hbm.xml | 2 +- .../rest/protocols/http/jetty/rest.html | 12 ++++---- .../scala/org/apache/ignite/scalar/scalar.scala | 2 +- .../util/nodestart/GridNodeCallableImpl.java | 6 ++-- modules/visor-console/pom.xml | 4 +-- .../org/apache/ignite/yardstick/IgniteNode.java | 2 +- 15 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/extdata/p2p/META-INF/ignite.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/META-INF/ignite.xml b/modules/extdata/p2p/META-INF/ignite.xml index 27f0809..70a61cd 100644 --- a/modules/extdata/p2p/META-INF/ignite.xml +++ b/modules/extdata/p2p/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> <!-- Optional test tasks specification. If not provided, then all http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency1.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency1.java index c74c48f..b11eff7 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency1.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency1.java @@ -29,7 +29,7 @@ import java.util.*; */ public class GridUriDeploymentDependency1 { /** */ - public static final String RESOURCE = "org/gridgain/grid/spi/deployment/uri/tasks/test1.properties"; + public static final String RESOURCE = "org/apache/ignite/grid/spi/deployment/uri/tasks/test1.properties"; /** * @return Value of the property {@code test1.txt} loaded from the {@code test1.properties} file. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency2.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency2.java index 39afec3..1743e95 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency2.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency2.java @@ -29,7 +29,7 @@ import java.util.*; */ public class GridUriDeploymentDependency2 { /** */ - public static final String RESOURCE = "org/gridgain/grid/spi/deployment/uri/tasks/test2.properties"; + public static final String RESOURCE = "org/apache/ignite/grid/spi/deployment/uri/tasks/test2.properties"; /** * @return Value of the property {@code test1.txt} loaded from the {@code test2.properties} file. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java index eb8e88d..a20b380 100644 --- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java +++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java @@ -34,7 +34,7 @@ public class GridUriDeploymentTestTask2 extends ComputeTaskSplitAdapter<Object, @SuppressWarnings("unchecked") public GridUriDeploymentTestTask2() { XmlBeanFactory factory = new XmlBeanFactory( - new ClassPathResource("org/gridgain/grid/spi/deployment/uri/tasks/spring2.xml", + new ClassPathResource("org/apache/ignite/grid/spi/deployment/uri/tasks/spring2.xml", getClass().getClassLoader())); factory.setBeanClassLoader(getClass().getClassLoader()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/package.html ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/package.html b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/package.html index 4747757..98bbae5 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/package.html +++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/package.html @@ -18,6 +18,6 @@ <html> <body> <!-- Package description. --> - GridGain Hadoop client protocol. + Ignite Hadoop client protocol. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html index 9fad27c..daeff2d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html +++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html @@ -18,6 +18,6 @@ <html> <body> <!-- Package description. --> - Contains Hadoop 1.x <code>FileSystem</code> wrapper for GridGain file system. + Contains Hadoop 1.x <code>FileSystem</code> wrapper for Ignite file system. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html index 1fe07be..1c60c34 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html +++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html @@ -18,6 +18,6 @@ <html> <body> <!-- Package description. --> - Contains Hadoop 2.x <code>FileSystem</code> wrapper for GridGain file system. + Contains Hadoop 2.x <code>FileSystem</code> wrapper for Ignite file system. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/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 01ea86d..2ed9b4f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java @@ -73,11 +73,11 @@ public class GridHadoopSetup { * </ul> */ private static void configureHadoop() { - String gridgainHome = U.getIgniteHome(); + String igniteHome = U.getIgniteHome(); - println("IGNITE_HOME is set to '" + gridgainHome + "'."); + println("IGNITE_HOME is set to '" + igniteHome + "'."); - checkGridGainHome(gridgainHome); + checkGridGainHome(igniteHome); String homeVar = "HADOOP_HOME"; String hadoopHome = System.getenv(homeVar); @@ -171,15 +171,15 @@ public class GridHadoopSetup { processCmdFiles(hadoopDir, "bin", "sbin", "libexec"); } - File gridgainLibs = new File(new File(gridgainHome), "libs"); + File igniteLibs = new File(new File(igniteHome), "libs"); - if (!gridgainLibs.exists()) + if (!igniteLibs.exists()) exit("Ignite 'libs' folder is not found.", null); Collection<File> jarFiles = new ArrayList<>(); - addJarsInFolder(jarFiles, gridgainLibs); - addJarsInFolder(jarFiles, new File(gridgainLibs, "gridgain-hadoop")); + addJarsInFolder(jarFiles, igniteLibs); + addJarsInFolder(jarFiles, new File(igniteLibs, "gridgain-hadoop")); boolean jarsLinksCorrect = true; @@ -195,11 +195,11 @@ public class GridHadoopSetup { if (!jarsLinksCorrect) { if (ask("Ignite JAR files are not found in Hadoop 'lib' directory. " + "Create appropriate symbolic links?")) { - File[] oldGridGainJarFiles = hadoopCommonLibDir.listFiles(IGNITE_JARS); + File[] oldIgniteJarFiles = hadoopCommonLibDir.listFiles(IGNITE_JARS); - if (oldGridGainJarFiles.length > 0 && ask("The Hadoop 'lib' directory contains JARs from other Ignite " + + if (oldIgniteJarFiles.length > 0 && ask("The Hadoop 'lib' directory contains JARs from other Ignite " + "installation. They must be deleted to continue. Continue?")) { - for (File file : oldGridGainJarFiles) { + for (File file : oldIgniteJarFiles) { println("Deleting file '" + file.getAbsolutePath() + "'."); if (!file.delete()) @@ -232,17 +232,17 @@ public class GridHadoopSetup { File hadoopEtc = new File(hadoopDir, "etc" + File.separator + "hadoop"); - File gridgainDocs = new File(gridgainHome, "docs"); + File igniteDocs = new File(igniteHome, "docs"); - if (!gridgainDocs.canRead()) - exit("Failed to read Ignite 'docs' folder at '" + gridgainDocs.getAbsolutePath() + "'.", null); + if (!igniteDocs.canRead()) + exit("Failed to read Ignite 'docs' folder at '" + igniteDocs.getAbsolutePath() + "'.", null); 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.ignite.xml"), new File(hadoopEtc, "core-site.xml")); + replaceWithBackup(new File(igniteDocs, "core-site.ignite.xml"), new File(hadoopEtc, "core-site.xml")); - replaceWithBackup(new File(gridgainDocs, "mapred-site.ignite.xml"), new File(hadoopEtc, "mapred-site.xml")); + replaceWithBackup(new File(igniteDocs, "mapred-site.ignite.xml"), new File(hadoopEtc, "mapred-site.xml")); } else println("Ok. You can configure them later, the templates are available at Ignite'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 Ignite'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.ignite.xml"), new File(hiveConfDir, "hive-site.xml")); + replaceWithBackup(new File(igniteDocs, "hive-site.ignite.xml"), new File(hiveConfDir, "hive-site.xml")); else println("Ok. You can configure it later, the template is available at Ignite's 'docs' directory..."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/package.html ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/package.html b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/package.html index 02d737f..f73abe9 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/package.html +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/package.html @@ -20,7 +20,7 @@ <body> <!-- Package description. --> Contains implementation of Hibernate L2 cache. Refer to - <i>org.gridgain.examples.datagrid.hibernate.GridHibernateL2CacheExample</i> for more information on how to - configure and use GridGain with Hibernate. + <i>org.apache.ignite.examples.datagrid.hibernate.GridHibernateL2CacheExample</i> for more information on how to + configure and use Ignite with Hibernate. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml index b880a33..4f301a5 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml @@ -20,7 +20,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";> -<hibernate-mapping package="org.gridgain.examples.datagrid.store" default-access="field"> +<hibernate-mapping package="org.apache.ignite.examples.datagrid.store" default-access="field"> <class name="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreEntry" table="ENTRIES"> <id name="key"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html index f2eb3bb..44568c0 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html @@ -61,13 +61,13 @@ <p> <div style="width: 650px; text-align: justify; padding-top: 20px"> <h2>REST API</h2> - GridGain REST API supports - external connectivity to GridGain via REST over HTTP. It comes in handy whenever GridGain Java API is not - available directly, but it is still needed to execute GridGain tasks or retrieve cached data. For example, - you can conveniently use GridGain REST API over HTTP from other non-JVM languages, such as Ruby, PHP or Python, - or any other language, whenever local instance of GridGain is not available. + Ignite REST API supports + external connectivity to Ignite via REST over HTTP. It comes in handy whenever Ignite Java API is not + available directly, but it is still needed to execute Ignite tasks or retrieve cached data. For example, + you can conveniently use Ignite REST API over HTTP from other non-JVM languages, such as Ruby, PHP or Python, + or any other language, whenever local instance of Ignite is not available. <p> - Note that PHP REST example is included with GridGain distribution. + Note that PHP REST example is included with Ignite distribution. <p> All REST HTTP commands have the following format: <code>http://1.2.3.4:8080/gridgain?cmd=CMD&...</code>, where <code>'cmd'</code> is the name of the command followed by other command parameters. Every command may have http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala index d65611b..8ab733f 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala @@ -148,7 +148,7 @@ object scalar extends ScalarConversions { " _____ \\ _ ___/_ __ `/__ / _ __ `/__ ___/ " + NL + " ____/ / / /__ / /_/ / _ / / /_/ / _ / " + NL + " /____/ \\___/ \\__,_/ /_/ \\__,_/ /_/ " + NL + NL + - " GRIDGAIN SCALAR" + + " IGNITE SCALAR" + " " + COPYRIGHT + NL println(s) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java index a12a12c..8b83f11 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java @@ -139,7 +139,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { if (win) { String logDir = ggHome + '\\' + LOG_DIR_WIN; String tmpDir = env(ses, "%TMP%", logDir); - String scriptOutputDir = tmpDir + "\\gridgain-startNodes"; + String scriptOutputDir = tmpDir + "\\ignite-startNodes"; shell(ses, "mkdir " + logDir); shell(ses, "mkdir " + scriptOutputDir); @@ -158,7 +158,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { a(" ").a(svcName). a(" \"").a(ggHome).a('\\').a(script). a(" ").a(cfg).a("\""). - a(" \"").a(logDir).a("\\gridgain.").a(id). + a(" \"").a(logDir).a("\\ignite.").a(id). a(".log\" > ").a(scriptOutputDir).a("\\").a(scriptOutputFileName). toString(); } @@ -169,7 +169,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { String scriptArgs = spaceIdx > -1 ? script.substring(spaceIdx + 1) : ""; String rmtLogArgs = buildRemoteLogArguments(spec.username(), spec.host()); String tmpDir = env(ses, "$TMPDIR", "/tmp/"); - String scriptOutputDir = tmpDir + "gridgain-startNodes"; + String scriptOutputDir = tmpDir + "ignite-startNodes"; shell(ses, "mkdir " + scriptOutputDir); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/visor-console/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml index 1a46a7e..c63e2b8 100644 --- a/modules/visor-console/pom.xml +++ b/modules/visor-console/pom.xml @@ -143,8 +143,8 @@ <goal>doc</goal> </goals> <configuration> - <doctitle>GridGain Console Visor</doctitle> - <windowtitle>GridGain Console Visor</windowtitle> + <doctitle>Ignite Console Visor</doctitle> + <windowtitle>Ignite Console Visor</windowtitle> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/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 1e162c0..4607dc5 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 @@ -139,7 +139,7 @@ public class IgniteNode implements BenchmarkServer { if (url == null) throw new IgniteCheckedException("Spring XML configuration path is invalid: " + springCfgPath + ". Note that this path should be either absolute or a relative local file system path, " + - "relative to META-INF in classpath or valid URL to GRIDGAIN_HOME.", e); + "relative to META-INF in classpath or valid URL to IGNITE_HOME.", e); } GenericApplicationContext springCtx;
