You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/02/03 03:05:56 UTC
[42/44] incubator-ignite git commit: ignite-1 cleanup
ignite-1 cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ab8a275
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ab8a275
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ab8a275
Branch: refs/heads/ignite-82
Commit: 0ab8a275aec136c952a8dffaf4bdd3dc48b58d55
Parents: 61a70d9
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Feb 3 00:22:54 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Feb 3 00:22:54 2015 +0300
----------------------------------------------------------------------
.gitignore | 1 -
config/fabric/default-config.xml | 2 +-
config/ignite-log4j.xml | 27 +++-----------------
config/java.util.logging.properties | 6 ++---
ipc/shmem/readme.txt | 2 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
modules/clients/src/test/resources/log4j.xml | 2 +-
.../apache/ignite/IgniteBasicWarmupClosure.java | 2 +-
.../apache/ignite/cache/CacheConfiguration.java | 24 ++++++++---------
.../org/apache/ignite/cache/CacheEntry.java | 2 +-
.../apache/ignite/cache/CacheProjection.java | 10 ++++----
.../cache/CacheWriteSynchronizationMode.java | 10 ++++----
.../configuration/IgniteConfiguration.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 4 +--
.../main/java/org/apache/ignite/package.html | 2 +-
modules/core/src/test/config/example-cache.xml | 8 +++---
modules/core/src/test/config/ggfs-loopback.xml | 8 +++---
17 files changed, 47 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0b871a5..4765c8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ xcuserdata/
/bamboo/junit*.properties
*.suo
*.csproj.user
-gridgain*.jar
*.o
*.lo
*.obj
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/config/fabric/default-config.xml
----------------------------------------------------------------------
diff --git a/config/fabric/default-config.xml b/config/fabric/default-config.xml
index 28ef291..90bc72f 100644
--- a/config/fabric/default-config.xml
+++ b/config/fabric/default-config.xml
@@ -23,7 +23,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<!--
- Configuration below demonstrates how to setup a GridGain node with three
+ Configuration below demonstrates how to setup a Ignite node with three
preconfigured caches.
If you need to add streaming functionality, add your streamers
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/config/ignite-log4j.xml
----------------------------------------------------------------------
diff --git a/config/ignite-log4j.xml b/config/ignite-log4j.xml
index 3f171bf..f9a378d 100644
--- a/config/ignite-log4j.xml
+++ b/config/ignite-log4j.xml
@@ -21,7 +21,7 @@
"http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd">
<!--
- Default log4j configuration for GridGain.
+ Default log4j configuration for Ignite.
-->
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
<!--
@@ -67,7 +67,7 @@
Logs all output to specified file.
By default, the logging goes to IGNITE_HOME/work/log folder
-->
- <appender name="FILE" class="org.gridgain.grid.logger.log4j.GridLog4jRollingFileAppender">
+ <appender name="FILE" class="org.apache.ignite.logger.log4j.IgniteLog4jFileAppender">
<param name="Threshold" value="DEBUG"/>
<param name="File" value="${IGNITE_HOME}/work/log/ignite.log"/>
<param name="Append" value="true"/>
@@ -79,26 +79,7 @@
</appender>
<!--
- <category name="org.gridgain">
- <level value="DEBUG"/>
- </category>
- -->
-
- <!--
- Uncomment this category to enable cache
- query execution tracing.
- -->
- <!--
- <category name="org.gridgain.cache.queries">
- <level value="DEBUG"/>
- </category>
- -->
-
- <!--
- Uncomment to enable DGC tracing.
- -->
- <!--
- <category name="org.gridgain.grid.kernal.processors.cache.GridCacheDgcManager.trace">
+ <category name="org.apache.ignite">
<level value="DEBUG"/>
</category>
-->
@@ -108,7 +89,7 @@
consistency warnings.
-->
<!--
- <category name="org.gridgain.grid.CourtesyConfigNotice">
+ <category name="org.apache.ignite.CourtesyConfigNotice">
<level value="OFF"/>
</category>
-->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/config/java.util.logging.properties
----------------------------------------------------------------------
diff --git a/config/java.util.logging.properties b/config/java.util.logging.properties
index f30e028..dfabf10 100644
--- a/config/java.util.logging.properties
+++ b/config/java.util.logging.properties
@@ -41,9 +41,9 @@ handlers=java.util.logging.ConsoleHandler, org.apache.ignite.logger.java.IgniteJ
.level=INFO
#
-# Uncomment to allow debug messages for entire GridGain package.
+# Uncomment to allow debug messages for entire Ignite package.
#
-#org.gridgain.level=FINE
+#org.apache.ignite.level=FINE
#
# Uncomment this line to enable cache query execution tracing.
@@ -54,7 +54,7 @@ handlers=java.util.logging.ConsoleHandler, org.apache.ignite.logger.java.IgniteJ
# Uncomment to disable courtesy notices, such as SPI configuration
# consistency warnings.
#
-#org.gridgain.grid.CourtesyConfigNotice.level=OFF
+#org.apache.ignite.CourtesyConfigNotice.level=OFF
#
# Console handler logs all messages with importance level `INFO` and above
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/ipc/shmem/readme.txt
----------------------------------------------------------------------
diff --git a/ipc/shmem/readme.txt b/ipc/shmem/readme.txt
index d4db015..09f3f7e 100644
--- a/ipc/shmem/readme.txt
+++ b/ipc/shmem/readme.txt
@@ -26,7 +26,7 @@ Usage with Apache Ignite
-------------------
Copy compiled library to folder that already listed in 'java.library.path'
-with name in form: 'libigniteshmem-<gridgain-version>.<extention>'.
+with name in form: 'libigniteshmem-<ignite-version>.<extention>'.
Note: Grid should be restarted.
**************************************************************************************
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 5a977a1..1b59fb6 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -116,7 +116,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi,
private CheckpointListener lsnr;
/** Prefix to use in bucket name generation. */
- public static final String BUCKET_NAME_PREFIX = "gridgain-checkpoint-";
+ public static final String BUCKET_NAME_PREFIX = "ignite-checkpoint-";
/** Suffix to use in bucket name generation. */
public static final String DFLT_BUCKET_NAME_SUFFIX = "default-bucket";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/clients/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/log4j.xml b/modules/clients/src/test/resources/log4j.xml
index 68ea393..5f4f4a3 100644
--- a/modules/clients/src/test/resources/log4j.xml
+++ b/modules/clients/src/test/resources/log4j.xml
@@ -111,7 +111,7 @@
Uncomment to disable courtesy notice.
-->
<!--
- <category name="org.gridgain.grid.CourtesyConfigNotice">
+ <category name="org.apache.ignite.CourtesyConfigNotice">
<level value="OFF"/>
</category>
-->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
index a4278ce..5a3dca9 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
@@ -210,7 +210,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
cfg0.setGridLogger(new IgniteNullLogger());
- cfg0.setGridName("gridgain-warmup-grid-" + i);
+ cfg0.setGridName("ignite-warmup-grid-" + i);
ignites.add(Ignition.start(cfg0));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index d5edb86..4b3cb1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@ -749,7 +749,7 @@ public class CacheConfiguration extends MutableConfiguration {
* {@link CacheEntry#timeToLive()} value and should not be confused with entry
* evictions based on configured {@link org.apache.ignite.cache.eviction.CacheEvictionPolicy}.
*
- * @return Flag indicating whether GridGain will eagerly remove expired entries.
+ * @return Flag indicating whether Ignite will eagerly remove expired entries.
*/
public boolean isEagerTtl() {
return eagerTtl;
@@ -758,7 +758,7 @@ public class CacheConfiguration extends MutableConfiguration {
/**
* Sets eager ttl flag.
*
- * @param eagerTtl {@code True} if GridGain should eagerly remove expired cache entries.
+ * @param eagerTtl {@code True} if Ignite should eagerly remove expired cache entries.
* @see #isEagerTtl()
*/
public void setEagerTtl(boolean eagerTtl) {
@@ -1131,7 +1131,7 @@ public class CacheConfiguration extends MutableConfiguration {
}
/**
- * Flag indicating whether GridGain should use swap storage by default. By default
+ * Flag indicating whether Ignite should use swap storage by default. By default
* swap is disabled which is defined via {@link #DFLT_SWAP_ENABLED} constant.
* <p>
* Note that this flag may be overridden for cache projection created with flag
@@ -1179,7 +1179,7 @@ public class CacheConfiguration extends MutableConfiguration {
}
/**
- * Flag indicating whether GridGain should attempt to index value and/or key instances
+ * Flag indicating whether Ignite should attempt to index value and/or key instances
* stored in cache. If this property is {@code false}, then all indexing annotations
* inside of any class will be ignored. By default query indexing is disabled and
* defined via {@link #DFLT_QUERY_INDEX_ENABLED} constant.
@@ -1201,7 +1201,7 @@ public class CacheConfiguration extends MutableConfiguration {
}
/**
- * Flag indicating whether GridGain should use write-behind behaviour for the cache store.
+ * Flag indicating whether Ignite should use write-behind behaviour for the cache store.
* By default write-behind is disabled which is defined via {@link #DFLT_WRITE_BEHIND_ENABLED}
* constant.
*
@@ -1541,7 +1541,7 @@ public class CacheConfiguration extends MutableConfiguration {
* <ul>
* <li>{@code -1} - Means that off-heap storage is disabled.</li>
* <li>
- * {@code 0} - GridGain will not limit off-heap storage (it's up to user to properly
+ * {@code 0} - Ignite will not limit off-heap storage (it's up to user to properly
* add and remove entries from cache to ensure that off-heap storage does not grow
* indefinitely.
* </li>
@@ -1552,10 +1552,10 @@ public class CacheConfiguration extends MutableConfiguration {
* <p>
* Use off-heap storage to load gigabytes of data in memory without slowing down
* Garbage Collection. Essentially in this case you should allocate very small amount
- * of memory to JVM and GridGain will cache most of the data in off-heap space
+ * of memory to JVM and Ignite will cache most of the data in off-heap space
* without affecting JVM performance at all.
* <p>
- * Note that GridGain will throw an exception if max memory is set to {@code -1} and
+ * Note that Ignite will throw an exception if max memory is set to {@code -1} and
* {@code offHeapValuesOnly} flag is set to {@code true}.
*
* @return Maximum memory in bytes available to off-heap memory space.
@@ -1566,12 +1566,12 @@ public class CacheConfiguration extends MutableConfiguration {
/**
* Sets maximum amount of memory available to off-heap storage. Possible values are <ul> <li>{@code -1} - Means that
- * off-heap storage is disabled.</li> <li> {@code 0} - GridGain will not limit off-heap storage (it's up to user to
+ * off-heap storage is disabled.</li> <li> {@code 0} - Ignite will not limit off-heap storage (it's up to user to
* properly add and remove entries from cache to ensure that off-heap storage does not grow infinitely. </li>
* <li>Any positive value specifies the limit of off-heap storage in bytes.</li> </ul> Default value is {@code -1},
* specified by {@link #DFLT_OFFHEAP_MEMORY} constant which means that off-heap storage is disabled by default. <p>
* Use off-heap storage to load gigabytes of data in memory without slowing down Garbage Collection. Essentially in
- * this case you should allocate very small amount of memory to JVM and GridGain will cache most of the data in
+ * this case you should allocate very small amount of memory to JVM and Ignite will cache most of the data in
* off-heap space without affecting JVM performance at all.
*
* @param offHeapMaxMem Maximum memory in bytes available to off-heap memory space.
@@ -1696,7 +1696,7 @@ public class CacheConfiguration extends MutableConfiguration {
}
/**
- * Flag indicating whether GridGain should store portable keys and values
+ * Flag indicating whether Ignite should store portable keys and values
* as instances of {@link PortableObject}.
*
* @return Portable enabled flag.
@@ -1721,7 +1721,7 @@ public class CacheConfiguration extends MutableConfiguration {
* flag is {@code true}). Default value of this flag is {@code true},
* because this is recommended behavior from performance standpoint.
* <p>
- * If set to {@code false}, GridGain will deserialize keys and
+ * If set to {@code false}, Ignite will deserialize keys and
* values stored in portable format before they are passed
* to cache store.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
index 4211b9b..8033236 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -540,7 +540,7 @@ public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Ent
public boolean isCached();
/**
- * Gets size of serialized key and value in addition to any overhead added by {@code GridGain} itself.
+ * Gets size of serialized key and value in addition to any overhead added by {@code Ignite} itself.
*
* @return size in bytes.
* @throws IgniteCheckedException If failed to evaluate entry size.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
index 2457fcd..b6df398 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
@@ -127,7 +127,7 @@ import java.util.concurrent.*;
* state of transaction. See {@link IgniteTx} documentation for more information
* about transactions.
* <h1 class="header">Group Locking</h1>
- * <i>Group Locking</i> is a feature where instead of acquiring individual locks, GridGain will lock
+ * <i>Group Locking</i> is a feature where instead of acquiring individual locks, Ignite will lock
* multiple keys with one lock to save on locking overhead. There are 2 types of <i>Group Locking</i>:
* <i>affinity-based</i>, and <i>partitioned-based</i>.
* <p>
@@ -156,12 +156,12 @@ import java.util.concurrent.*;
* all entries will be removed. This behavior is useful during development, but should not be
* used in production.
* <h1 class="header">Portable Objects</h1>
- * If an object is defined as portable GridGain cache will automatically store it in portable (i.e. binary)
+ * If an object is defined as portable Ignite cache will automatically store it in portable (i.e. binary)
* format. User can choose to work either with the portable format or with the deserialized form (assuming
* that class definitions are present in the classpath). By default, cache works with deserialized form
* (example shows the case when {@link Integer} is used as a key for a portable object):
* <pre>
- * CacheProjection<Integer, Value> prj = GridGain.grid().cache(null);
+ * CacheProjection<Integer, Value> prj = Ignition.grid().cache(null);
*
* // Value will be serialized and stored in cache in portable format.
* prj.put(1, new Value());
@@ -174,7 +174,7 @@ import java.util.concurrent.*;
* needed for performance reasons. To work with portable format directly you should create special projection
* using {@link #keepPortable()} method:
* <pre>
- * CacheProjection<Integer, GridPortableObject> prj = GridGain.grid().cache(null).keepPortable();
+ * CacheProjection<Integer, GridPortableObject> prj = Ignition.grid().cache(null).keepPortable();
*
* // Value is not deserialized and returned in portable format.
* GridPortableObject po = prj.get(1);
@@ -1365,7 +1365,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> {
* nodes and local node, as opposed to {@link CacheProjection#clearAll()} method which only
* clears local node's cache.
* <p>
- * GridGain will make the best attempt to clear caches on all nodes. If some caches
+ * Ignite will make the best attempt to clear caches on all nodes. If some caches
* could not be cleared, then exception will be thrown.
* <p>
* This method is identical to calling {@link #globalClearAll(long) globalClearAll(0)}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
index 6c41374..d62ad7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheWriteSynchronizationMode.java
@@ -21,8 +21,8 @@ import org.apache.ignite.transactions.*;
import org.jetbrains.annotations.*;
/**
- * Mode indicating how GridGain should wait for write replies from other nodes. Default
- * value is {@link #FULL_ASYNC}}, which means that GridGain will not wait for responses from
+ * Mode indicating how Ignite should wait for write replies from other nodes. Default
+ * value is {@link #FULL_ASYNC}}, which means that Ignite will not wait for responses from
* participating nodes. This means that by default remote nodes may get their state updated slightly after
* any of the cache write methods complete, or after {@link IgniteTx#commit()} method completes.
* <p>
@@ -34,21 +34,21 @@ import org.jetbrains.annotations.*;
*/
public enum CacheWriteSynchronizationMode {
/**
- * Flag indicating that GridGain should wait for write or commit replies from all nodes.
+ * Flag indicating that Ignite should wait for write or commit replies from all nodes.
* This behavior guarantees that whenever any of the atomic or transactional writes
* complete, all other participating nodes which cache the written data have been updated.
*/
FULL_SYNC,
/**
- * Flag indicating that GridGain will not wait for write or commit responses from participating nodes,
+ * Flag indicating that Ignite will not wait for write or commit responses from participating nodes,
* which means that remote nodes may get their state updated a bit after any of the cache write methods
* complete, or after {@link IgniteTx#commit()} method completes.
*/
FULL_ASYNC,
/**
- * This flag only makes sense for {@link CacheMode#PARTITIONED} mode. When enabled, GridGain
+ * This flag only makes sense for {@link CacheMode#PARTITIONED} mode. When enabled, Ignite
* will wait for write or commit to complete on {@code primary} node, but will not wait for
* backups to be updated.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 732aafc..b0d995a 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -72,7 +72,7 @@ import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*;
*/
public class IgniteConfiguration {
/** Courtesy notice log category. */
- public static final String COURTESY_LOGGER_NAME = "org.gridgain.grid.CourtesyConfigNotice";
+ public static final String COURTESY_LOGGER_NAME = "org.apache.ignite.CourtesyConfigNotice";
/**
* Default flag for peer class loading. By default the value is {@code false}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/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 013367f..9ac9be1 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
@@ -3581,7 +3581,7 @@ public abstract class IgniteUtils {
/**
* Depending on whether or not log is provided and quiet mode is enabled logs given messages as
- * quiet message or normal log WARN message in {@code org.gridgain.grid.CourtesyConfigNotice}
+ * quiet message or normal log WARN message in {@code org.apache.ignite.CourtesyConfigNotice}
* category. If {@code log} is {@code null} or in QUIET mode it will add {@code (courtesy)}
* prefix to the message.
*
@@ -3598,7 +3598,7 @@ public abstract class IgniteUtils {
/**
* Depending on whether or not log is provided and quiet mode is enabled logs given messages as
- * quiet message or normal log WARN message in {@code org.gridgain.grid.CourtesyConfigNotice}
+ * quiet message or normal log WARN message in {@code org.apache.ignite.CourtesyConfigNotice}
* category. If {@code log} is {@code null} or in QUIET mode it will add {@code (courtesy)}
* prefix to the message.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/main/java/org/apache/ignite/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/package.html b/modules/core/src/main/java/org/apache/ignite/package.html
index 863a686..8fb6e94 100644
--- a/modules/core/src/main/java/org/apache/ignite/package.html
+++ b/modules/core/src/main/java/org/apache/ignite/package.html
@@ -18,6 +18,6 @@
<html>
<body>
<!-- Package description. -->
- Contains entry-point <b>GridGain & HPC APIs.</b>
+ Contains entry-point <b>Ignite & HPC APIs.</b>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/test/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml
index 2217994..b97f23f 100644
--- a/modules/core/src/test/config/example-cache.xml
+++ b/modules/core/src/test/config/example-cache.xml
@@ -18,13 +18,13 @@
-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the following command:
+ When starting a standalone Ignite node, you need to execute the following command:
{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file to GridGain:
- GridGain.start("examples/config/example-cache.xml");
+ When starting Ignite from Java IDE, pass path to this file to Ignite:
+ Ignition.start("examples/config/example-cache.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab8a275/modules/core/src/test/config/ggfs-loopback.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml
index 94cab9a..dfefd9a 100644
--- a/modules/core/src/test/config/ggfs-loopback.xml
+++ b/modules/core/src/test/config/ggfs-loopback.xml
@@ -18,13 +18,13 @@
-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the following command:
+ When starting a standalone Ignite node, you need to execute the following command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-ggfs-loopback.xml
- When starting GridGain from Java IDE, pass path to this file into GridGain:
- GridGain.start("path-to-this-file/example-ggfs-loopback.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignite:
+ Ignition.start("path-to-this-file/example-ggfs-loopback.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"