ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [09/37] incubator-ignite git commit: Ignite-67 IgniteSystemProperties static fields names changed to IGNITE*
Date Fri, 30 Jan 2015 19:17:59 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
index c3efcaa..6829eeb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -63,7 +63,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
     private static final int DFLT_MAX_TASK_RESULTS = 10240;
 
     /** Maximum number of task results. */
-    private final int maxTaskResults = getInteger(GG_REST_MAX_TASK_RESULTS, DFLT_MAX_TASK_RESULTS);
+    private final int maxTaskResults = getInteger(IGNITE_REST_MAX_TASK_RESULTS, DFLT_MAX_TASK_RESULTS);
 
     /** Task results. */
     private final Map<IgniteUuid, TaskDescriptor> taskDescs =

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
index 5af5d5b..55247cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java
@@ -65,7 +65,7 @@ public class GridStreamProcessor extends GridProcessorAdapter {
 
         super.onKernalStart();
 
-        if (!getBoolean(GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) {
+        if (!getBoolean(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) {
             for (ClusterNode n : ctx.discovery().remoteNodes())
                 checkStreamer(n);
         }
@@ -165,7 +165,7 @@ public class GridStreamProcessor extends GridProcessorAdapter {
                 if (rmtAttr.atLeastOnce() != locAttr.atLeastOnce())
                     throw new IgniteCheckedException("Streamer atLeastOnce configuration flag mismatch (fix atLeastOnce flag " +
                         "in streamer configuration or set " +
-                        "-D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " +
+                        "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " +
                         "property) [streamer=" + locAttr.name() +
                         ", locAtLeastOnce=" + locAttr.atLeastOnce() +
                         ", rmtAtLeastOnce=" + rmtAttr.atLeastOnce() +
@@ -174,7 +174,7 @@ public class GridStreamProcessor extends GridProcessorAdapter {
                 if (!rmtAttr.stages().equals(locAttr.stages()))
                     throw new IgniteCheckedException("Streamer stages configuration mismatch (fix streamer stages " +
                         "configuration or set " +
-                        "-D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " +
+                        "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " +
                         "property) [streamer=" + locAttr.name() +
                         ", locStages=" + locAttr.stages() +
                         ", rmtStages=" + rmtAttr.stages() +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
index c9e8e57..4653449 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
 import org.jdk8.backport.*;
 
 import java.util.concurrent.*;
@@ -30,7 +29,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  */
 public class GridConcurrentFactory {
     /** Default concurrency level. */
-    private static final int CONCURRENCY_LEVEL = IgniteSystemProperties.getInteger(GG_MAP_CONCURRENCY_LEVEL, 256);
+    private static final int CONCURRENCY_LEVEL = IgniteSystemProperties.getInteger(IGNITE_MAP_CONCURRENCY_LEVEL, 256);
 
     /**
      * Ensure singleton.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
index dc820a2..c5ded18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridReflectionCache.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.util;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
@@ -51,7 +50,7 @@ public class GridReflectionCache implements Externalizable {
     };
 
     /** Cache size. */
-    private static final int CACHE_SIZE = Integer.getInteger(GG_REFLECTION_CACHE_SIZE, 128);
+    private static final int CACHE_SIZE = Integer.getInteger(IGNITE_REFLECTION_CACHE_SIZE, 128);
 
     /** Fields cache. */
     private ConcurrentMap<Class, List<Field>> fields = new GridBoundedConcurrentLinkedHashMap<>(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
index 8a39a21..18286ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
@@ -285,10 +285,10 @@ public abstract class GridUtils {
     private static final Collection<Class<?>> PORTABLE_CLS = new HashSet<>();
 
     /** GridGain Logging Directory. */
-    public static final String IGNITE_LOG_DIR = System.getenv(GG_LOG_DIR);
+    public static final String IGNITE_LOG_DIR = System.getenv(IgniteSystemProperties.IGNITE_LOG_DIR);
 
     /** GridGain Work Directory. */
-    public static final String IGNITE_WORK_DIR = System.getenv(GG_WORK_DIR);
+    public static final String IGNITE_WORK_DIR = System.getenv(IgniteSystemProperties.IGNITE_WORK_DIR);
 
     /** Clock timer. */
     private static Thread timer;
@@ -441,7 +441,7 @@ public abstract class GridUtils {
         SUN_REFLECT_FACTORY = refFac;
 
         // Disable hostname SSL verification for development and testing with self-signed certificates.
-        if (Boolean.parseBoolean(System.getProperty(GG_DISABLE_HOSTNAME_VERIFIER))) {
+        if (Boolean.parseBoolean(System.getProperty(IGNITE_DISABLE_HOSTNAME_VERIFIER))) {
             HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
                 @Override public boolean verify(String hostname, SSLSession sslSes) {
                     return true;
@@ -650,7 +650,7 @@ public abstract class GridUtils {
      * @return Checks if disco ordering should be enforced.
      */
     public static boolean relaxDiscoveryOrdered() {
-        return "true".equalsIgnoreCase(System.getProperty(GG_NO_DISCO_ORDER));
+        return "true".equalsIgnoreCase(System.getProperty(IGNITE_NO_DISCO_ORDER));
     }
 
     /**
@@ -1496,7 +1496,7 @@ public abstract class GridUtils {
     private static synchronized InetAddress resetLocalHost() throws IOException {
         locHost = null;
 
-        String sysLocHost = IgniteSystemProperties.getString(GG_LOCAL_HOST);
+        String sysLocHost = IgniteSystemProperties.getString(IGNITE_LOCAL_HOST);
 
         if (sysLocHost != null)
             sysLocHost = sysLocHost.trim();
@@ -2268,7 +2268,7 @@ public abstract class GridUtils {
         assert Thread.holdsLock(GridUtils.class);
 
         // Resolve GridGain home via environment variables.
-        String ggHome0 = IgniteSystemProperties.getString(GG_HOME);
+        String ggHome0 = IgniteSystemProperties.getString(IGNITE_HOME);
 
         if (!F.isEmpty(ggHome0))
             return ggHome0;
@@ -2362,7 +2362,7 @@ public abstract class GridUtils {
                     ggHome = F.t(ggHome0 = resolveProjectHome());
 
                     if (ggHome0 != null)
-                        System.setProperty(GG_HOME, ggHome0);
+                        System.setProperty(IGNITE_HOME, ggHome0);
                 }
                 else
                     ggHome0 = ggHomeTup.get();
@@ -2389,9 +2389,9 @@ public abstract class GridUtils {
 
                 if (ggHomeTup == null) {
                     if (F.isEmpty(path))
-                        System.clearProperty(GG_HOME);
+                        System.clearProperty(IGNITE_HOME);
                     else
-                        System.setProperty(GG_HOME, path);
+                        System.setProperty(IGNITE_HOME, path);
 
                     ggHome = F.t(path);
 
@@ -3872,7 +3872,7 @@ public abstract class GridUtils {
      * @param sb Sb.
      */
     private static void appendJvmId(SB sb) {
-        if (getBoolean(GG_MBEAN_APPEND_JVM_ID)) {
+        if (getBoolean(IGNITE_MBEAN_APPEND_JVM_ID)) {
             String gridId = Integer.toHexString(Ignite.class.getClassLoader().hashCode()) + "_"
                 + ManagementFactory.getRuntimeMXBean().getName();
 
@@ -7755,7 +7755,7 @@ public abstract class GridUtils {
      * @return {@code True} if property is Visor node startup property, {@code false} otherwise.
      */
     public static boolean isVisorNodeStartProperty(String name) {
-        return GG_SSH_HOST.equals(name) || GG_SSH_USER_NAME.equals(name);
+        return IGNITE_SSH_HOST.equals(name) || IGNITE_SSH_USER_NAME.equals(name);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
index 8ff11af..8f794dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFinishedFuture.java
@@ -36,7 +36,7 @@ public class GridFinishedFuture<T> implements IgniteFuture<T>, Externalizable {
     private static final long serialVersionUID = 0L;
 
     /** Synchronous notification flag. */
-    private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
+    private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(IGNITE_FUT_SYNC_NOTIFICATION, true);
 
     /** Complete value. */
     private T t;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
index eb7a0bf..e93e81b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -46,10 +46,10 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
     protected static IgniteLogger log;
 
     /** Synchronous notification flag. */
-    private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
+    private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(IGNITE_FUT_SYNC_NOTIFICATION, true);
 
     /** Concurrent notification flag. */
-    private static final boolean CONCUR_NOTIFY = IgniteSystemProperties.getBoolean(GG_FUT_CONCURRENT_NOTIFICATION, false);
+    private static final boolean CONCUR_NOTIFY = IgniteSystemProperties.getBoolean(IGNITE_FUT_CONCURRENT_NOTIFICATION, false);
 
     /** Initial state. */
     private static final int INIT = 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
index 07c54cc..fb498d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
@@ -34,7 +34,7 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
     private static final Unsafe UNSAFE = GridUnsafe.unsafe();
 
     /** */
-    private static final Long CHECK_FREQ = Long.getLong(GG_MARSHAL_BUFFERS_RECHECK, 10000);
+    private static final Long CHECK_FREQ = Long.getLong(IGNITE_MARSHAL_BUFFERS_RECHECK, 10000);
 
     /** */
     private static final long byteArrOff = UNSAFE.arrayBaseOffset(byte[].class);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
index 865ba80..e299f9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
@@ -33,7 +33,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
     private static final Unsafe UNSAFE = GridUnsafe.unsafe();
 
     /** */
-    private static final Long CHECK_FREQ = Long.getLong(GG_MARSHAL_BUFFERS_RECHECK, 10000);
+    private static final Long CHECK_FREQ = Long.getLong(IGNITE_MARSHAL_BUFFERS_RECHECK, 10000);
 
     /** */
     private static final long byteArrOff = UNSAFE.arrayBaseOffset(byte[].class);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpace.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpace.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpace.java
index 6340536..cea90e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpace.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpace.java
@@ -33,7 +33,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 @SuppressWarnings({"PointlessBooleanExpression", "ConstantConditions"})
 public class GridIpcSharedMemorySpace implements Closeable {
     /** Debug flag (enable for testing). */
-    private static final boolean DEBUG = Boolean.getBoolean(GG_IPC_SHMEM_SPACE_DEBUG);
+    private static final boolean DEBUG = Boolean.getBoolean(IGNITE_IPC_SHMEM_SPACE_DEBUG);
 
     /** Shared memory segment size (operable). */
     private final int opSize;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
index 004e542..23c77db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
@@ -47,7 +47,7 @@ public class GridUnsafeMemory {
     private static final int ADDR_SIZE = UNSAFE.addressSize();
 
     /** Safe offheap release flag. */
-    private static final boolean SAFE_RELEASE = IgniteSystemProperties.getBoolean(GG_OFFHEAP_SAFE_RELEASE);
+    private static final boolean SAFE_RELEASE = IgniteSystemProperties.getBoolean(IGNITE_OFFHEAP_SAFE_RELEASE);
 
     /** Total size. */
     @GridToStringInclude

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
index 174ee4f..2e19284 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
@@ -909,7 +909,7 @@ public final class X {
      * @throws IgniteCheckedException If GridGain home folder was not set.
      */
     public static String resolveGridGainHome() throws IgniteCheckedException {
-        String var = IgniteSystemProperties.getString(GG_HOME);
+        String var = IgniteSystemProperties.getString(IGNITE_HOME);
 
         if (var != null)
             return var;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index ae1e1dd..69ac48c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -111,12 +111,12 @@ public class VisorBasicConfiguration implements Serializable {
         VisorBasicConfiguration cfg = new VisorBasicConfiguration();
 
         cfg.gridName(c.getGridName());
-        cfg.ggHome(getProperty(GG_HOME, c.getGridGainHome()));
-        cfg.localHost(getProperty(GG_LOCAL_HOST, c.getLocalHost()));
+        cfg.ggHome(getProperty(IGNITE_HOME, c.getGridGainHome()));
+        cfg.localHost(getProperty(IGNITE_LOCAL_HOST, c.getLocalHost()));
         cfg.nodeId(g.localNode().id());
         cfg.marshaller(compactClass(c.getMarshaller()));
         cfg.deploymentMode(compactObject(c.getDeploymentMode()));
-        cfg.daemon(boolValue(GG_DAEMON, c.isDaemon()));
+        cfg.daemon(boolValue(IGNITE_DAEMON, c.isDaemon()));
         cfg.jmxRemote(g.isJmxRemoteEnabled());
         cfg.restart(g.isRestartEnabled());
         cfg.networkTimeout(c.getNetworkTimeout());
@@ -124,13 +124,13 @@ public class VisorBasicConfiguration implements Serializable {
         cfg.logger(compactClass(c.getGridLogger()));
         cfg.discoStartupDelay(c.getDiscoveryStartupDelay());
         cfg.mBeanServer(compactClass(c.getMBeanServer()));
-        cfg.noAscii(boolValue(GG_NO_ASCII, false));
-        cfg.noDiscoOrder(boolValue(GG_NO_DISCO_ORDER, false));
-        cfg.noShutdownHook(boolValue(GG_NO_SHUTDOWN_HOOK, false));
-        cfg.programName(getProperty(GG_PROG_NAME));
-        cfg.quiet(boolValue(GG_QUIET, true));
-        cfg.successFile(getProperty(GG_SUCCESS_FILE));
-        cfg.updateNotifier(boolValue(GG_UPDATE_NOTIFIER, true));
+        cfg.noAscii(boolValue(IGNITE_NO_ASCII, false));
+        cfg.noDiscoOrder(boolValue(IGNITE_NO_DISCO_ORDER, false));
+        cfg.noShutdownHook(boolValue(IGNITE_NO_SHUTDOWN_HOOK, false));
+        cfg.programName(getProperty(IGNITE_PROG_NAME));
+        cfg.quiet(boolValue(IGNITE_QUIET, true));
+        cfg.successFile(getProperty(IGNITE_SUCCESS_FILE));
+        cfg.updateNotifier(boolValue(IGNITE_UPDATE_NOTIFIER, true));
         cfg.securityCredentialsProvider(compactClass(c.getSecurityCredentialsProvider()));
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorEmailConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorEmailConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorEmailConfiguration.java
index 62034b9..e664535 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorEmailConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorEmailConfiguration.java
@@ -61,13 +61,13 @@ public class VisorEmailConfiguration implements Serializable {
     public static VisorEmailConfiguration from(IgniteConfiguration c) {
         VisorEmailConfiguration cfg = new VisorEmailConfiguration();
 
-        cfg.smtpHost(getProperty(GG_SMTP_HOST, c.getSmtpHost()));
-        cfg.smtpPort(intValue(GG_SMTP_PORT, c.getSmtpPort()));
-        cfg.smtpUsername(getProperty(GG_SMTP_USERNAME, c.getSmtpUsername()));
-        cfg.adminEmails(getProperty(GG_ADMIN_EMAILS, compactArray(c.getAdminEmails())));
-        cfg.smtpFromEmail(getProperty(GG_SMTP_FROM, c.getSmtpFromEmail()));
-        cfg.smtpSsl(boolValue(GG_SMTP_SSL, c.isSmtpSsl()));
-        cfg.smtpStartTls(boolValue(GG_SMTP_STARTTLS, c.isSmtpStartTls()));
+        cfg.smtpHost(getProperty(IGNITE_SMTP_HOST, c.getSmtpHost()));
+        cfg.smtpPort(intValue(IGNITE_SMTP_PORT, c.getSmtpPort()));
+        cfg.smtpUsername(getProperty(IGNITE_SMTP_USERNAME, c.getSmtpUsername()));
+        cfg.adminEmails(getProperty(IGNITE_ADMIN_EMAILS, compactArray(c.getAdminEmails())));
+        cfg.smtpFromEmail(getProperty(IGNITE_SMTP_FROM, c.getSmtpFromEmail()));
+        cfg.smtpSsl(boolValue(IGNITE_SMTP_SSL, c.isSmtpSsl()));
+        cfg.smtpStartTls(boolValue(IGNITE_SMTP_STARTTLS, c.isSmtpStartTls()));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
index 8a3f787..029ca8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
@@ -47,7 +47,7 @@ public class VisorLifecycleConfiguration implements Serializable {
         VisorLifecycleConfiguration cfg = new VisorLifecycleConfiguration();
 
         cfg.beans(compactArray(c.getLifecycleBeans()));
-        cfg.emailNotification(boolValue(GG_LIFECYCLE_EMAIL_NOTIFY, c.isLifeCycleEmailNotification()));
+        cfg.emailNotification(boolValue(IGNITE_LIFECYCLE_EMAIL_NOTIFY, c.isLifeCycleEmailNotification()));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
index 1dea5a3..a6158e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
@@ -78,8 +78,8 @@ public class VisorRestConfiguration implements Serializable {
             cfg.tcpSslEnabled(clnCfg.isRestTcpSslEnabled());
             cfg.accessibleFolders(clnCfg.getRestAccessibleFolders());
             cfg.jettyPath(clnCfg.getRestJettyPath());
-            cfg.jettyHost(getProperty(GG_JETTY_HOST));
-            cfg.jettyPort(intValue(GG_JETTY_PORT, null));
+            cfg.jettyHost(getProperty(IGNITE_JETTY_HOST));
+            cfg.jettyPort(intValue(IGNITE_JETTY_PORT, null));
             cfg.tcpHost(clnCfg.getRestTcpHost());
             cfg.tcpPort(clnCfg.getRestTcpPort());
             cfg.tcpSslContextFactory(compactClass(clnCfg.getRestTcpSslContextFactory()));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index 5c67f55..33538af 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -113,7 +113,7 @@ public interface IgniteFuture<R> {
      * immediately notified within the same thread.
      * <p>
      * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
+     * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
      *
      * @param syncNotify Flag to turn on or off synchronous listener notification.
      */
@@ -127,7 +127,7 @@ public interface IgniteFuture<R> {
      * immediately notified within the same thread.
      * <p>
      * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
+     * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system property to {@code true}.
      *
      * @return Synchronous listener notification flag.
      */
@@ -142,7 +142,7 @@ public interface IgniteFuture<R> {
      * started the future, or in a different thread).
      * <p>
      * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
+     * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
      *
      * @param concurNotify Flag to turn on or off concurrent listener notification.
      */
@@ -157,7 +157,7 @@ public interface IgniteFuture<R> {
      * started the future, or in a different thread).
      * <p>
      * Default value is {@code false}. To change the default, set
-     * {@link IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
+     * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
      *
      * @return Concurrent listener notification flag
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
index 598c151..c02a783 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
@@ -210,8 +210,8 @@ public class IgniteJavaLogger implements IgniteLogger, IgniteLoggerNodeIdAware {
 
             defaultConfiguration();
 
-            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
-            boolean useConsoleAppender = Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"));
+            boolean quiet = Boolean.valueOf(System.getProperty(IGNITE_QUIET, "true"));
+            boolean useConsoleAppender = Boolean.valueOf(System.getProperty(IGNITE_CONSOLE_APPENDER, "true"));
 
             if (useConsoleAppender) {
                 ConsoleHandler consoleHnd = findHandler(impl, ConsoleHandler.class);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index aef2490..9ee10c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -140,7 +140,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
         final boolean secSpi = AuthenticationSpi.class.isAssignableFrom(getClass()) ||
             SecureSessionSpi.class.isAssignableFrom(getClass());
 
-        final boolean check = secSpi || !Boolean.getBoolean(GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK);
+        final boolean check = secSpi || !Boolean.getBoolean(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK);
 
         if (check) {
             spiCtx.addLocalEventListener(paramsLsnr = new GridLocalEventListener() {
@@ -444,7 +444,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
         boolean isSpiConsistent = false;
 
         String tipStr = tip ? " (fix configuration or set " +
-            "-D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system property)" : "";
+            "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system property)" : "";
 
         if (rmtCls == null) {
             if (!optional && starting)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 4e9369a..7609df7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -679,10 +679,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
     private int msgQueueLimit = DFLT_MSG_QUEUE_LIMIT;
 
     /** Min buffered message count. */
-    private int minBufferedMsgCnt = Integer.getInteger(GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT, 512);
+    private int minBufferedMsgCnt = Integer.getInteger(IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT, 512);
 
     /** Buffer size ratio. */
-    private double bufSizeRatio = IgniteSystemProperties.getDouble(GG_COMMUNICATION_BUF_RESIZE_RATIO, 0.8);
+    private double bufSizeRatio = IgniteSystemProperties.getDouble(IGNITE_COMMUNICATION_BUF_RESIZE_RATIO, 0.8);
 
     /** NIO server. */
     private GridNioServer<GridTcpCommunicationMessageAdapter> nioSrvr;
@@ -1279,7 +1279,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
      * Sets the minimum number of messages for this SPI, that are buffered
      * prior to sending.
      * <p>
-     * Defaults to either {@code 512} or {@link IgniteSystemProperties#GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT}
+     * Defaults to either {@code 512} or {@link IgniteSystemProperties#IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT}
      * system property (if specified).
      *
      * @param minBufferedMsgCnt Minimum buffered message count.
@@ -1298,7 +1298,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
      * Sets the buffer size ratio for this SPI. As messages are sent,
      * the buffer size is adjusted using this ratio.
      * <p>
-     * Defaults to either {@code 0.8} or {@link IgniteSystemProperties#GG_COMMUNICATION_BUF_RESIZE_RATIO}
+     * Defaults to either {@code 0.8} or {@link IgniteSystemProperties#IGNITE_COMMUNICATION_BUF_RESIZE_RATIO}
      * system property (if specified).
      *
      * @param bufSizeRatio Buffer size ratio.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index a769827..6aea062 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -230,7 +230,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
     @Override public void initializeLocalAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException {
         // If IGNITE_OVERRIDE_MCAST_GRP system property is set, use its value to override multicast group from
         // configuration. Used for testing purposes.
-        String overrideMcastGrp = System.getProperty(GG_OVERRIDE_MCAST_GRP);
+        String overrideMcastGrp = System.getProperty(IGNITE_OVERRIDE_MCAST_GRP);
 
         if (overrideMcastGrp != null)
             mcastGrp = overrideMcastGrp;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
index 8d1f57f..21e1a62 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
@@ -57,7 +57,7 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
      * Initialize from system property.
      */
     {
-        String ips = IgniteSystemProperties.getString(GG_TCP_DISCOVERY_ADDRESSES);
+        String ips = IgniteSystemProperties.getString(IGNITE_TCP_DISCOVERY_ADDRESSES);
 
         if (!F.isEmpty(ips)) {
             Collection<InetSocketAddress> addrsList = new LinkedHashSet<>();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
index 1dd2e63..1e5525c 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
@@ -191,10 +191,10 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
 
         Collection<Ignite> ignites = new LinkedList<>();
 
-        String old = System.getProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER);
+        String old = System.getProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER);
 
         try {
-            System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
+            System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, "false");
 
             TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
@@ -230,7 +230,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
             if (old == null)
                 old = "false";
 
-            System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, old);
+            System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, old);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index 993daa0..7ee575a 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -62,7 +62,7 @@ public final class CommandLineStartup {
      * Static initializer.
      */
     static {
-        String quiteStr = System.getProperty(IgniteSystemProperties.GG_QUIET);
+        String quiteStr = System.getProperty(IgniteSystemProperties.IGNITE_QUIET);
 
         boolean quite = true;
 
@@ -73,7 +73,7 @@ public final class CommandLineStartup {
                 if ("false".equalsIgnoreCase(quiteStr))
                     quite = false;
                 else if (!"true".equalsIgnoreCase(quiteStr)) {
-                    System.err.println("Invalid value for '" + IgniteSystemProperties.GG_QUIET +
+                    System.err.println("Invalid value for '" + IgniteSystemProperties.IGNITE_QUIET +
                         "' VM parameter (must be {true|false}): " + quiteStr);
 
                     quite = false;
@@ -144,7 +144,7 @@ public final class CommandLineStartup {
         if (errMsg != null)
             X.error(errMsg);
 
-        String runner = System.getProperty(GG_PROG_NAME, "ggstart.{sh|bat}");
+        String runner = System.getProperty(IGNITE_PROG_NAME, "ggstart.{sh|bat}");
 
         int space = runner.indexOf(' ');
 
@@ -321,7 +321,7 @@ public final class CommandLineStartup {
             X.error("Start was interrupted (exiting): " + e.getMessage());
         }
 
-        String code = System.getProperty(GG_RESTART_CODE);
+        String code = System.getProperty(IGNITE_RESTART_CODE);
 
         if (code != null)
             try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
index 7a99eed..315a219 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFactoryVmShutdownTest.java
@@ -63,7 +63,7 @@ public class GridFactoryVmShutdownTest {
         });
 
         // Test with shutdown hook enabled and disabled.
-        // System.setProperty(GridSystemProperties.GG_NO_SHUTDOWN_HOOK, "true");
+        // System.setProperty(GridSystemProperties.IGNITE_NO_SHUTDOWN_HOOK, "true");
 
         // Grid will start and add shutdown hook.
         G.start();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
index f3cf621..8645533 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
@@ -64,7 +64,7 @@ public class GridHomePathSelfTest extends GridCommonAbstractTest {
             // Test no override.
             IgniteConfiguration c1 = getConfiguration(getTestGridName(1));
 
-            c1.setGridGainHome(System.getProperty(GG_HOME));
+            c1.setGridGainHome(System.getProperty(IGNITE_HOME));
 
             G.start(c1);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
index a889460..4c907fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
@@ -44,7 +44,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
-        System.setProperty(GG_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(GridStartStopSelfTest.class));
+        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(GridStartStopSelfTest.class));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
index bc1a9e8..3d81acb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
@@ -32,9 +32,9 @@ public class GridVersionSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testVersions() throws Exception {
-        String propVal = System.getProperty(GG_UPDATE_NOTIFIER);
+        String propVal = System.getProperty(IGNITE_UPDATE_NOTIFIER);
 
-        System.setProperty(GG_UPDATE_NOTIFIER, "true");
+        System.setProperty(IGNITE_UPDATE_NOTIFIER, "true");
 
         try {
             Ignite ignite = startGrid();
@@ -61,9 +61,9 @@ public class GridVersionSelfTest extends GridCommonAbstractTest {
             stopGrid();
 
             if (propVal != null)
-                System.setProperty(GG_UPDATE_NOTIFIER, propVal);
+                System.setProperty(IGNITE_UPDATE_NOTIFIER, propVal);
             else
-                System.clearProperty(GG_UPDATE_NOTIFIER);
+                System.clearProperty(IGNITE_UPDATE_NOTIFIER);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 8992d33..4ce72d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -78,16 +78,16 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         // Need to increase value set in GridAbstractTest
-        sizePropVal = System.getProperty(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE);
+        sizePropVal = System.getProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE);
 
-        System.setProperty(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "100000");
+        System.setProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "100000");
     }
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        System.setProperty(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, sizePropVal != null ? sizePropVal : "");
+        System.setProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, sizePropVal != null ? sizePropVal : "");
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
index 68f0638..8fe6542 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
@@ -50,9 +50,9 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration() throws Exception {
-        maxCompletedTxCount = System.getProperty(GG_MAX_COMPLETED_TX_COUNT);
+        maxCompletedTxCount = System.getProperty(IGNITE_MAX_COMPLETED_TX_COUNT);
 
-        System.setProperty(GG_MAX_COMPLETED_TX_COUNT, String.valueOf(5));
+        System.setProperty(IGNITE_MAX_COMPLETED_TX_COUNT, String.valueOf(5));
 
         IgniteConfiguration cfg = super.getConfiguration();
 
@@ -74,7 +74,7 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        System.setProperty(GG_MAX_COMPLETED_TX_COUNT, maxCompletedTxCount != null ? maxCompletedTxCount : "");
+        System.setProperty(IGNITE_MAX_COMPLETED_TX_COUNT, maxCompletedTxCount != null ? maxCompletedTxCount : "");
 
         super.afterTest();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
index 140063a..2ffc432 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
@@ -31,7 +31,7 @@ import static org.apache.ignite.cache.CacheMode.*;
 
 /**
  * Test to check slow TX warning timeout defined by
- * {@link org.apache.ignite.IgniteSystemProperties#GG_SLOW_TX_WARN_TIMEOUT}
+ * {@link org.apache.ignite.IgniteSystemProperties#IGNITE_SLOW_TX_WARN_TIMEOUT}
  * system property.
  */
 public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index dabbef2..abdc776 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -70,9 +70,9 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         // Need to increase value set in GridAbstractTest
-        sizePropVal = System.getProperty(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE);
+        sizePropVal = System.getProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE);
 
-        System.setProperty(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "100000");
+        System.setProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "100000");
 
         super.beforeTestsStarted();
     }
@@ -81,7 +81,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        System.setProperty(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, sizePropVal != null ? sizePropVal : "");
+        System.setProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, sizePropVal != null ? sizePropVal : "");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index 49611c3..fe85f50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -186,7 +186,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
 
             f.get();
 
-            U.sleep(getInteger(GG_TX_SALVAGE_TIMEOUT, 3000));
+            U.sleep(getInteger(IGNITE_TX_SALVAGE_TIMEOUT, 3000));
 
             GridCache<Integer, String> checkCache = cache(checkIdx);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index db674fc..b3c4186 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -88,15 +88,15 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
 
     @Override protected void beforeTestsStarted() throws Exception {
         // Set salvage timeout system property.
-        salvageTimeoutOld = System.setProperty(GG_TX_SALVAGE_TIMEOUT, SALVAGE_TIMEOUT.toString());
+        salvageTimeoutOld = System.setProperty(IGNITE_TX_SALVAGE_TIMEOUT, SALVAGE_TIMEOUT.toString());
     }
 
     @Override protected void afterTestsStopped() throws Exception {
         // Restore salvage timeout system property to its initial state.
         if (salvageTimeoutOld != null)
-            System.setProperty(GG_TX_SALVAGE_TIMEOUT, salvageTimeoutOld);
+            System.setProperty(IGNITE_TX_SALVAGE_TIMEOUT, salvageTimeoutOld);
         else
-            System.clearProperty(GG_TX_SALVAGE_TIMEOUT);
+            System.clearProperty(IGNITE_TX_SALVAGE_TIMEOUT);
     }
 
     @Override protected void beforeTest() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
index d6ef6f3..4d014bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
@@ -69,7 +69,7 @@ public class GridStartupWithSpecifiedWorkDirectorySelfTest extends TestCase {
     private IgniteConfiguration getConfiguration(IgniteLogger log) {
         // We can't use U.getGridGainHome() here because
         // it will initialize cached value which is forbidden to override.
-        String ggHome = IgniteSystemProperties.getString(GG_HOME);
+        String ggHome = IgniteSystemProperties.getString(IGNITE_HOME);
 
         assert ggHome != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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
index 33340f3..095bd2d 100644
--- 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
@@ -62,7 +62,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase {
 
         // We can't use U.getGridGainHome() here because
         // it will initialize cached value which is forbidden to override.
-        String ggHome = IgniteSystemProperties.getString(GG_HOME);
+        String ggHome = IgniteSystemProperties.getString(IGNITE_HOME);
 
         assert ggHome != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutputArraySizingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
index 2f6c205..56ffee4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
@@ -32,7 +32,7 @@ public class GridUnsafeDataOutputArraySizingSelfTest extends GridCommonAbstractT
     private static final byte[] BIG = new byte[2048];
 
     static {
-        System.setProperty(GG_MARSHAL_BUFFERS_RECHECK, "1000");
+        System.setProperty(IGNITE_MARSHAL_BUFFERS_RECHECK, "1000");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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 c2bd8b0..f2ea759 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
@@ -56,7 +56,7 @@ public final class GridSingleExecutionTest {
      */
     @SuppressWarnings({"CallToSystemExit"})
     public static void main(String[] args) throws Exception {
-        System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
+        System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, "false");
 
         System.out.println("Starting master node [params=" + Arrays.toString(args) + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
index ad4c07a..98b74c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
@@ -302,7 +302,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
      * @throws IgniteCheckedException In case of error.
      */
     public static void main(String[] args) throws IgniteCheckedException {
-        System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
+        System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, "false");
 
         System.out.println("Starting master node [params=" + Arrays.toString(args) + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
index 75e032b..5e3c1bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
@@ -135,7 +135,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
      * @throws Exception If fails.
      */
     public static void main(String[] args) throws Exception {
-        System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
+        System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, "false");
 
         System.out.println("Starting master node [params=" + Arrays.toString(args) + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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 f20f7c6..aa5808e 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
@@ -156,7 +156,7 @@ public final class GridRandomCommandLineLoader {
      */
     @SuppressWarnings({"BusyWait"})
     public static void main(String[] args) {
-        System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
+        System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, "false");
 
         logo();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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 78637fa..16c8f80 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
@@ -121,7 +121,7 @@ public final class GridVmNodesStarter {
      * @throws IgniteCheckedException If failed.
      */
     public static void main(String[] args) throws IgniteCheckedException {
-        System.setProperty(GG_UPDATE_NOTIFIER, "false");
+        System.setProperty(IGNITE_UPDATE_NOTIFIER, "false");
 
         Options options = createOptions();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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 4153c61..7780a73 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
@@ -94,7 +94,7 @@ public abstract class GridAbstractTest extends TestCase {
     private static long ts = System.currentTimeMillis();
 
     static {
-        System.setProperty(IgniteSystemProperties.GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000");
+        System.setProperty(IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000");
 
         Thread timer = new Thread(new GridTestClockTimer(), "gridgain-clock-for-tests");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
index 4c27791..4c43e8d 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
@@ -286,7 +286,7 @@ public class GridTestLog4jLogger implements IgniteLogger, IgniteLoggerNodeIdAwar
                 // Init logger impl.
                 impl = implInitC.apply(true);
 
-            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
+            boolean quiet = Boolean.valueOf(System.getProperty(IGNITE_QUIET, "true"));
 
             boolean consoleAppenderFound = false;
             Category rootCategory = null;
@@ -325,12 +325,12 @@ public class GridTestLog4jLogger implements IgniteLogger, IgniteLoggerNodeIdAwar
                 // User configured console appender, but log is quiet.
                 quiet = false;
 
-            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"))) {
+            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(IGNITE_CONSOLE_APPENDER, "true"))) {
                 // Console appender not found => we've looked through all categories up to root.
                 assert rootCategory != null;
 
                 // User launched gridgain in verbose mode and did not add console appender with INFO level
-                // to configuration and did not set GG_CONSOLE_APPENDER to false.
+                // to configuration and did not set IGNITE_CONSOLE_APPENDER to false.
                 if (errAppender != null) {
                     rootCategory.addAppender(createConsoleAppender(Level.INFO));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 2d105d2..69bdea7 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1175,7 +1175,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
             createSqlFunctions();
             runInitScript();
 
-            if (getString(GG_H2_DEBUG_CONSOLE) != null) {
+            if (getString(IGNITE_H2_DEBUG_CONSOLE) != null) {
                 Connection c = DriverManager.getConnection(dbUrl);
 
                 WebServer webSrv = new WebServer();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
index 5813c27..58655b2 100644
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
@@ -287,7 +287,7 @@ public class IgniteLog4jLogger implements IgniteLogger, IgniteLoggerNodeIdAware,
                 // Init logger impl.
                 impl = implInitC.apply(true);
 
-            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
+            boolean quiet = Boolean.valueOf(System.getProperty(IGNITE_QUIET, "true"));
 
             boolean consoleAppenderFound = false;
             Category rootCategory = null;
@@ -326,12 +326,12 @@ public class IgniteLog4jLogger implements IgniteLogger, IgniteLoggerNodeIdAware,
                 // User configured console appender, but log is quiet.
                 quiet = false;
 
-            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"))) {
+            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(IGNITE_CONSOLE_APPENDER, "true"))) {
                 // Console appender not found => we've looked through all categories up to root.
                 assert rootCategory != null;
 
                 // User launched gridgain in verbose mode and did not add console appender with INFO level
-                // to configuration and did not set GG_CONSOLE_APPENDER to false.
+                // to configuration and did not set IGNITE_CONSOLE_APPENDER to false.
                 if (errAppender != null) {
                     rootCategory.addAppender(createConsoleAppender(Level.INFO));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
index 4fc8a24..e46f80c 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
@@ -47,7 +47,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
      *
      */
     static {
-        if (!IgniteSystemProperties.getBoolean(GG_JETTY_LOG_NO_OVERRIDE)) {
+        if (!IgniteSystemProperties.getBoolean(IGNITE_JETTY_LOG_NO_OVERRIDE)) {
             Properties p = new Properties();
 
             p.setProperty("org.eclipse.jetty.LEVEL", "WARN");
@@ -114,7 +114,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
             throw new IgniteCheckedException("Failed to resolve local host to bind address: " + ctx.config().getLocalHost(), e);
         }
 
-        System.setProperty(GG_JETTY_HOST, locHost.getHostAddress());
+        System.setProperty(IGNITE_JETTY_HOST, locHost.getHostAddress());
 
         jettyHnd = new GridJettyRestHandler(hnd, new C1<String, Boolean>() {
             @Override public Boolean apply(String tok) {
@@ -172,21 +172,21 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
     }
 
     /**
-     * Checks {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT} system property
+     * Checks {@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT} system property
      * and overrides default connector port if it present.
      * Then initializes {@code port} with the found value.
      *
      * @param con Jetty connector.
      */
     private void override(AbstractNetworkConnector con) {
-        String host = System.getProperty(GG_JETTY_HOST);
+        String host = System.getProperty(IGNITE_JETTY_HOST);
 
         if (!F.isEmpty(host))
             con.setHost(host);
 
         int currPort = con.getPort();
 
-        Integer overridePort = Integer.getInteger(GG_JETTY_PORT);
+        Integer overridePort = Integer.getInteger(IGNITE_JETTY_PORT);
 
         if (overridePort != null && overridePort != 0)
             currPort = overridePort;
@@ -260,7 +260,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
             httpCfg.setSendServerVersion(true);
             httpCfg.setSendDateHeader(true);
 
-            String srvPortStr = System.getProperty(GG_JETTY_PORT, "8080");
+            String srvPortStr = System.getProperty(IGNITE_JETTY_PORT, "8080");
 
             int srvPort;
 
@@ -276,7 +276,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
 
             ServerConnector srvConn = new ServerConnector(httpSrv, new HttpConnectionFactory(httpCfg));
 
-            srvConn.setHost(System.getProperty(GG_JETTY_HOST, "localhost"));
+            srvConn.setHost(System.getProperty(IGNITE_JETTY_HOST, "localhost"));
             srvConn.setPort(srvPort);
             srvConn.setIdleTimeout(30000L);
             srvConn.setReuseAddress(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
index 076ec1a..6876088 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
@@ -111,10 +111,10 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable {
     private int lastLsnrExecCnt;
 
     /** Synchronous notification flag. */
-    private volatile boolean syncNotify = IgniteSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
+    private volatile boolean syncNotify = IgniteSystemProperties.getBoolean(IGNITE_FUT_SYNC_NOTIFICATION, true);
 
     /** Concurrent notification flag. */
-    private volatile boolean concurNotify = IgniteSystemProperties.getBoolean(GG_FUT_CONCURRENT_NOTIFICATION, false);
+    private volatile boolean concurNotify = IgniteSystemProperties.getBoolean(IGNITE_FUT_CONCURRENT_NOTIFICATION, false);
 
     /** Mutex. */
     private final Object mux = new Object();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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 4527386..fafb78f 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
@@ -70,7 +70,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
     public GridFactorySelfTest() {
         super(false);
 
-        System.setProperty(GG_OVERRIDE_MCAST_GRP,
+        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
             GridTestUtils.getNextMulticastGroup(GridFactorySelfTest.class));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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 9934d5c..88a842b 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
@@ -313,8 +313,8 @@ public class GridNodeCallableImpl implements GridNodeCallable {
 
         SB sb = new SB();
 
-        sb.a(" -J-D").a(GG_SSH_HOST).a("=\"").a(host).a("\"").
-            a(" -J-D").a(GG_SSH_USER_NAME).a("=\"").a(username).a("\"");
+        sb.a(" -J-D").a(IGNITE_SSH_HOST).a("=\"").a(host).a("\"").
+            a(" -J-D").a(IGNITE_SSH_USER_NAME).a("=\"").a(username).a("\"");
 
         return sb.toString();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 65bb143..1cb2ec3 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -1511,7 +1511,7 @@ object visor extends VisorTag {
                 val cfg = cfgs.iterator().next()
 
                 // Setting up 'Config URL' for properly print in console.
-                System.setProperty(IgniteSystemProperties.GG_CONFIG_URL, url.getPath)
+                System.setProperty(IgniteSystemProperties.IGNITE_CONFIG_URL, url.getPath)
 
                 var cpuCnt = Runtime.getRuntime.availableProcessors
 
@@ -1582,13 +1582,13 @@ object visor extends VisorTag {
     def open(cfg: IgniteConfiguration, cfgPath: String) {
         val daemon = Ignition.isDaemon
 
-        val shutdownHook = IgniteSystemProperties.getString(GG_NO_SHUTDOWN_HOOK, "false")
+        val shutdownHook = IgniteSystemProperties.getString(IGNITE_NO_SHUTDOWN_HOOK, "false")
 
         // Make sure Visor console starts as daemon node.
         Ignition.setDaemon(true)
 
         // Make sure visor starts without shutdown hook.
-        System.setProperty(GG_NO_SHUTDOWN_HOOK, "true")
+        System.setProperty(IGNITE_NO_SHUTDOWN_HOOK, "true")
 
         val startedGridName = try {
              Ignition.start(cfg).name
@@ -1596,7 +1596,7 @@ object visor extends VisorTag {
         finally {
             Ignition.setDaemon(daemon)
 
-            System.setProperty(GG_NO_SHUTDOWN_HOOK, shutdownHook)
+            System.setProperty(IGNITE_NO_SHUTDOWN_HOOK, shutdownHook)
         }
 
         this.cfgPath = cfgPath

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/visor-console/src/test/scala/org/apache/ignite/visor/testsuites/VisorConsoleSelfTestSuite.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/testsuites/VisorConsoleSelfTestSuite.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/testsuites/VisorConsoleSelfTestSuite.scala
index 742e3a1..94162f3 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/testsuites/VisorConsoleSelfTestSuite.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/testsuites/VisorConsoleSelfTestSuite.scala
@@ -85,7 +85,7 @@ class VisorConsoleSelfTestSuite extends Suites (
             if (thirdByte < 0)
                 thirdByte += 256
 
-            System.setProperty(GG_OVERRIDE_MCAST_GRP, "229." + thirdByte + ".255.255")
+            System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, "229." + thirdByte + ".255.255")
         }
     }
     catch {


Mime
View raw message