Skip to content

Commit

Permalink
#ignite-164: remove gridgain from code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivasilinets
ivasilinets committed Feb 5, 2015
1 parent a72e031 commit 08213df
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion modules/extdata/p2p/META-INF/ignite.xml
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency1.java
View file
Expand Up @@ -29,7 +29,7 @@
*/
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.
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentDependency2.java
View file
Expand Up @@ -29,7 +29,7 @@
*/
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.
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java
View file
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/package.html
View file
Expand Up @@ -18,6 +18,6 @@
<html>
<body>
<!-- Package description. -->
GridGain Hadoop client protocol.
Ignite Hadoop client protocol.
</body>
</html>
2 changes: 1 addition & 1 deletion modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html
View file
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html
View file
Expand Up @@ -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>
32 changes: 16 additions & 16 deletions modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
View file
Expand Up @@ -73,11 +73,11 @@ public static void main(String[] ignore) throws IOException {
* </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);
Expand Down Expand Up @@ -171,15 +171,15 @@ private static void configureHadoop() {
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;

Expand All @@ -195,11 +195,11 @@ private static void configureHadoop() {
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())
Expand Down Expand Up @@ -232,17 +232,17 @@ private static void configureHadoop() {

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...");
Expand All @@ -255,7 +255,7 @@ private static void configureHadoop() {
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...");
}
Expand Down
4 changes: 2 additions & 2 deletions modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/package.html
View file
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml
View file
Expand Up @@ -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"/>

Expand Down
12 changes: 6 additions & 6 deletions ...p/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
View file
Expand Up @@ -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&amp;...</code>, where
<code>'cmd'</code> is the name of the command followed by other command parameters. Every command may have
Expand Down
2 changes: 1 addition & 1 deletion modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
View file
Expand Up @@ -148,7 +148,7 @@ object scalar extends ScalarConversions {
" _____ \\ _ ___/_ __ `/__ / _ __ `/__ ___/ " + NL +
" ____/ / / /__ / /_/ / _ / / /_/ / _ / " + NL +
" /____/ \\___/ \\__,_/ /_/ \\__,_/ /_/ " + NL + NL +
" GRIDGAIN SCALAR" +
" IGNITE SCALAR" +
" " + COPYRIGHT + NL

println(s)
Expand Down
6 changes: 3 additions & 3 deletions ...les/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java
View file
Expand Up @@ -139,7 +139,7 @@ public GridNodeCallableImpl(GridRemoteStartSpecification spec, int timeout) {
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);
Expand All @@ -158,7 +158,7 @@ public GridNodeCallableImpl(GridRemoteStartSpecification spec, int timeout) {
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();
}
Expand All @@ -169,7 +169,7 @@ public GridNodeCallableImpl(GridRemoteStartSpecification spec, int timeout) {
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);

Expand Down
4 changes: 2 additions & 2 deletions modules/visor-console/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
View file
Expand Up @@ -139,7 +139,7 @@ private static IgniteConfiguration loadConfiguration(String springCfgPath) throw
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;
Expand Down

0 comments on commit 08213df

Please sign in to comment.