You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 10:29:46 UTC

[04/11] incubator-ignite git commit: # Renaming

# Renaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8229484d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8229484d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8229484d

Branch: refs/heads/master
Commit: 8229484d2a87585c7475d1b239b9b284e33f9c98
Parents: f84f598
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:17:04 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:17:04 2014 +0300

----------------------------------------------------------------------
 .../testsuites/GridExamplesSelfTestSuite.java   |   2 +-
 .../ScalarExamplesSelfTestSuite.scala           |   3 +-
 .../testsuites/GridAopSelfTestSuite.java        |   2 +-
 .../apache/ignite/IgniteSystemProperties.java   | 603 +++++++++++++++++++
 .../configuration/IgniteConfiguration.java      |  54 +-
 .../org/apache/ignite/lang/IgniteFuture.java    |   8 +-
 .../ignite/logger/java/IgniteJavaLogger.java    |   2 +-
 .../resources/IgniteLocalHostResource.java      |   2 +-
 .../startup/cmdline/CommandLineStartup.java     |   2 +-
 .../grid/GridClientConnectionConfiguration.java |  10 +-
 .../gridgain/grid/IgniteSystemProperties.java   | 603 -------------------
 .../org/gridgain/grid/kernal/GridGainEx.java    |   2 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |   2 +-
 .../grid/kernal/GridKernalContextImpl.java      |   2 +-
 .../gridgain/grid/kernal/GridLoggerProxy.java   |   4 +-
 .../grid/kernal/GridPerformanceSuggestions.java |   2 +-
 .../processors/cache/GridCacheAdapter.java      |   2 +-
 .../GridCachePartitionExchangeManager.java      |   2 +-
 .../processors/cache/GridCacheProcessor.java    |   2 +-
 .../processors/cache/GridCacheTxManager.java    |   2 +-
 .../kernal/processors/cache/GridCacheUtils.java |   2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   2 +-
 .../dht/GridPartitionedGetFuture.java           |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   2 +-
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../distributed/near/GridNearGetFuture.java     |   2 +-
 .../processors/ggfs/GridGgfsProcessor.java      |   2 +-
 .../kernal/processors/job/GridJobProcessor.java |   2 +-
 .../jobmetrics/GridJobMetricsProcessor.java     |   2 +-
 .../handlers/task/GridTaskCommandHandler.java   |   2 +-
 .../streamer/GridStreamProcessor.java           |   2 +-
 .../visor/node/VisorBasicConfiguration.java     |   2 +-
 .../visor/node/VisorEmailConfiguration.java     |   2 +-
 .../visor/node/VisorLifecycleConfiguration.java |   2 +-
 .../visor/node/VisorRestConfiguration.java      |   2 +-
 .../org/gridgain/grid/spi/GridSpiAdapter.java   |   2 +-
 .../tcp/GridTcpCommunicationSpi.java            |   6 +-
 .../GridTcpDiscoveryMulticastIpFinder.java      |   2 +-
 .../ipfinder/vm/GridTcpDiscoveryVmIpFinder.java |   2 +-
 .../grid/util/GridConcurrentFactory.java        |   4 +-
 .../gridgain/grid/util/GridReflectionCache.java |   2 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |   2 +-
 .../grid/util/future/GridFinishedFuture.java    |   3 +-
 .../grid/util/future/GridFutureAdapter.java     |   2 +-
 .../grid/util/io/GridUnsafeDataInput.java       |   2 +-
 .../grid/util/io/GridUnsafeDataOutput.java      |   2 +-
 .../ipc/shmem/GridIpcSharedMemorySpace.java     |   2 +-
 .../util/offheap/unsafe/GridUnsafeMemory.java   |   4 +-
 .../util/portscanner/GridJmxPortFinder.java     |   2 +-
 .../java/org/gridgain/grid/util/typedef/X.java  |   5 +-
 .../grid/kernal/GridHomePathSelfTest.java       |   2 +-
 .../grid/kernal/GridStartStopSelfTest.java      |   2 +-
 .../grid/kernal/GridVersionSelfTest.java        |   2 +-
 .../GridCacheAbstractRemoveFailureTest.java     |   2 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |   2 +-
 .../cache/GridCacheSlowTxWarnTest.java          |   2 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |   2 +-
 .../GridCacheNodeFailureAbstractTest.java       |   2 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |   2 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |   3 +-
 ...tartupWithUndefinedGridGainHomeSelfTest.java |   3 +-
 ...GridUnsafeDataOutputArraySizingSelfTest.java |   2 +-
 .../shmem/GridIpcSharedMemorySpaceSelfTest.java |   1 +
 .../shmem/GridIpcSharedMemoryUtilsSelfTest.java |   2 +-
 .../gridgain/startup/GridVmNodesStarter.java    |   2 +-
 .../logger/GridLog4jRollingFileAppender.java    |   2 +-
 .../junits/logger/GridTestLog4jLogger.java      |   2 +-
 .../hadoop/GridHadoopCommandLineTest.java       |   1 -
 .../testsuites/bamboo/GridHadoopTestSuite.java  |   2 +-
 .../grid/spi/indexing/h2/GridH2IndexingSpi.java |   2 +-
 .../ignite/logger/log4j/IgniteLog4jLogger.java  |   2 +-
 .../logger/log4j/IgniteLog4jNodeIdFilePath.java |   2 +-
 .../http/jetty/GridJettyRestProtocol.java       |   5 +-
 .../processors/schedule/ScheduleFutureImpl.java |   2 +-
 .../grid/kernal/GridFactorySelfTest.java        |   2 +-
 .../util/nodestart/GridNodeCallableImpl.java    |   2 +-
 .../visor/commands/vvm/VisorVvmCommand.scala    |   1 +
 .../main/scala/org/gridgain/visor/visor.scala   |   4 +-
 .../testsuites/VisorConsoleSelfTestSuite.scala  |   3 +-
 79 files changed, 725 insertions(+), 721 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/examples/src/test/java/org/gridgain/testsuites/GridExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/gridgain/testsuites/GridExamplesSelfTestSuite.java b/examples/src/test/java/org/gridgain/testsuites/GridExamplesSelfTestSuite.java
index a2888d4..372be9e 100644
--- a/examples/src/test/java/org/gridgain/testsuites/GridExamplesSelfTestSuite.java
+++ b/examples/src/test/java/org/gridgain/testsuites/GridExamplesSelfTestSuite.java
@@ -13,7 +13,7 @@ import junit.framework.*;
 import org.gridgain.examples.*;
 import org.gridgain.testframework.*;
 
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**
  * Examples test suite.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/examples/src/test/scala/org/gridgain/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
----------------------------------------------------------------------
diff --git a/examples/src/test/scala/org/gridgain/scalar/testsuites/ScalarExamplesSelfTestSuite.scala b/examples/src/test/scala/org/gridgain/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
index a513281..76bf5d6 100644
--- a/examples/src/test/scala/org/gridgain/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
+++ b/examples/src/test/scala/org/gridgain/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
@@ -11,12 +11,13 @@
 
 package org.gridgain.scalar.testsuites
 
+import org.apache.ignite.IgniteSystemProperties
 import org.scalatest._
 import org.gridgain.scalar.tests._
 import examples.{ScalarExamplesMultiNodeSelfTest, ScalarExamplesSelfTest}
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
-import org.gridgain.grid.IgniteSystemProperties._
+import IgniteSystemProperties._
 import org.gridgain.testframework.GridTestUtils
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/aop/src/test/java/org/gridgain/testsuites/GridAopSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/testsuites/GridAopSelfTestSuite.java b/modules/aop/src/test/java/org/gridgain/testsuites/GridAopSelfTestSuite.java
index e40dec0..97f2e3c 100644
--- a/modules/aop/src/test/java/org/gridgain/testsuites/GridAopSelfTestSuite.java
+++ b/modules/aop/src/test/java/org/gridgain/testsuites/GridAopSelfTestSuite.java
@@ -14,7 +14,7 @@ import org.gridgain.grid.gridify.*;
 import org.gridgain.testframework.*;
 import org.test.gridify.*;
 
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**
  * AOP test suite.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
new file mode 100644
index 0000000..26dcaa9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -0,0 +1,603 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite;
+
+import org.gridgain.grid.spi.discovery.*;
+import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
+import org.jetbrains.annotations.*;
+
+import javax.net.ssl.*;
+
+/**
+ * Contains constants for all system properties and environmental variables in GridGain. These
+ * properties and variables can be used to affect the behavior of GridGain.
+ */
+public final class IgniteSystemProperties {
+    /**
+     * If this system property is present the GridGain will include grid name into verbose log.
+     */
+    public static final String GG_LOG_GRID_NAME = "GRIDGAIN_LOG_GRID_NAME";
+
+    /**
+     * This property is used internally to pass an exit code to loader when
+     * GridGain instance is being restarted.
+     */
+    public static final String GG_RESTART_CODE = "GRIDGAIN_RESTART_CODE";
+
+    /**
+     * Presence of this system property with value {@code true} will make the grid
+     * node start as a daemon node. Node that this system property will override
+     * {@link org.apache.ignite.configuration.IgniteConfiguration#isDaemon()} configuration.
+     */
+    public static final String GG_DAEMON = "GRIDGAIN_DAEMON";
+
+    /** Defines GridGain installation folder. */
+    public static final String GG_HOME = "GRIDGAIN_HOME";
+
+    /** If this system property is set to {@code false} - no shutdown hook will be set. */
+    public static final String GG_NO_SHUTDOWN_HOOK = "GRIDGAIN_NO_SHUTDOWN_HOOK";
+
+    /**
+     * Name of the system property to disable requirement for proper node ordering
+     * by discovery SPI. Use with care, as proper node ordering is required for
+     * cache consistency. If set to {@code true}, then any discovery SPI can be used
+     * with distributed cache, otherwise, only discovery SPIs that have annotation
+     * {@link GridDiscoverySpiOrderSupport @GridDiscoverySpiOrderSupport(true)} will
+     * be allowed.
+     */
+    public static final String GG_NO_DISCO_ORDER = "GRIDGAIN_NO_DISCO_ORDER";
+
+    /**
+     * If this system property is set to {@code false} - no checks for new versions will
+     * be performed by GridGain. By default, GridGain periodically checks for the new
+     * version and prints out the message into the log if new version of GridGain is
+     * available for download.
+     */
+    public static final String GG_UPDATE_NOTIFIER = "GRIDGAIN_UPDATE_NOTIFIER";
+
+    /**
+     * This system property defines interval in milliseconds in which GridGain will check
+     * thread pool state for starvation. Zero value will disable this checker.
+     */
+    public static final String GG_STARVATION_CHECK_INTERVAL = "GRIDGAIN_STARVATION_CHECK_INTERVAL";
+
+    /**
+     * If this system property is present (any value) - no ASCII logo will
+     * be printed.
+     */
+    public static final String GG_NO_ASCII = "GRIDGAIN_NO_ASCII";
+
+    /**
+     * This property allows to override Jetty host for REST processor.
+     */
+    public static final String GG_JETTY_HOST = "GRIDGAIN_JETTY_HOST";
+
+    /**
+     * This property allows to override Jetty local port for REST processor.
+     */
+    public static final String GG_JETTY_PORT = "GRIDGAIN_JETTY_PORT";
+
+    /**
+     * This property does not allow GridGain to override Jetty log configuration for REST processor.
+     */
+    public static final String GG_JETTY_LOG_NO_OVERRIDE = "GRIDGAIN_JETTY_LOG_NO_OVERRIDE";
+
+    /**
+     * This property allows to override maximum count of task results stored on one node
+     * in REST processor.
+     */
+    public static final String GG_REST_MAX_TASK_RESULTS = "GRIDGAIN_REST_MAX_TASK_RESULTS";
+
+    /**
+     * This property defines the maximum number of attempts to remap near get to the same
+     * primary node. Remapping may be needed when topology is changed concurrently with
+     * get operation.
+     */
+    public static final String GG_NEAR_GET_MAX_REMAPS = "GRIDGAIN_NEAR_GET_MAX_REMAPS";
+
+    /**
+     * Set to either {@code true} or {@code false} to enable or disable quiet mode
+     * of GridGain. In quiet mode, only warning and errors are printed into the log
+     * additionally to a shortened version of standard output on the start.
+     * <p>
+     * Note that if you use <tt>ggstart.{sh|bat}</tt> scripts to start GridGain they
+     * start by default in quiet mode. You can supply <tt>-v</tt> flag to override it.
+     */
+    public static final String GG_QUIET = "GRIDGAIN_QUIET";
+
+    /**
+     * If this property is set to {@code true} (default) and GridGain is launched
+     * in verbose mode (see {@link #GG_QUIET}) and no console appenders can be found
+     * in configuration, then default console appender will be added.
+     * Set this property to {@code false} if no appenders should be added.
+     */
+    public static final String GG_CONSOLE_APPENDER = "GRIDGAIN_CONSOLE_APPENDER";
+
+    /**
+     * Name of the system property defining name of command line program.
+     */
+    public static final String GG_PROG_NAME = "GRIDGAIN_PROG_NAME";
+
+    /**
+     * Name of the system property defining success file name. This file
+     * is used with auto-restarting functionality when GridGain is started
+     * by supplied <tt>ggstart.{bat|sh}</tt> scripts.
+     */
+    public static final String GG_SUCCESS_FILE = "GRIDGAIN_SUCCESS_FILE";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * SMTP host. If provided - it will override the property in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpHost()
+     */
+    public static final String GG_SMTP_HOST = "GRIDGAIN_SMTP_HOST";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * SMTP port. If provided - it will override the property in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPort()
+     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_PORT
+     */
+    public static final String GG_SMTP_PORT = "GRIDGAIN_SMTP_PORT";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * SMTP username. If provided - it will override the property in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpUsername()
+     */
+    public static final String GG_SMTP_USERNAME = "GRIDGAIN_SMTP_USERNAME";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * SMTP password. If provided - it will override the property in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPassword()
+     */
+    public static final String GG_SMTP_PWD = "GRIDGAIN_SMTP_PASSWORD";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * SMTP FROM email. If provided - it will override the property in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpFromEmail()
+     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_FROM_EMAIL
+     */
+    public static final String GG_SMTP_FROM = "GRIDGAIN_SMTP_FROM";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * list of admin emails. Value of this property should be comma-separated list
+     * of emails. If provided - it will override the property in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#getAdminEmails()
+     */
+    public static final String GG_ADMIN_EMAILS = "GRIDGAIN_ADMIN_EMAILS";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * whether or not to use SSL. If provided - it will override the property
+     * in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpSsl()
+     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_SSL
+     */
+    public static final String GG_SMTP_SSL = "GRIDGAIN_SMTP_SSL";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * whether or not to enable email notifications for node lifecycle. If provided -
+     * it will override the property in grid configuration.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#isLifeCycleEmailNotification()
+     */
+    public static final String GG_LIFECYCLE_EMAIL_NOTIFY = "GRIDGAIN_LIFECYCLE_EMAIL_NOTIFY";
+
+    /**
+     * Name of the system property or environment variable to set or override
+     * whether or not to use STARTTLS. If provided - it will override the property
+     * in grid configuration.
+     * <p>
+     * Note that GridGain uses SMTP to send emails in critical
+     * situations such as license expiration or fatal system errors.
+     * It is <b>highly</b> recommended to configure SMTP in production
+     * environment.
+     *
+     * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpStartTls()
+     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_STARTTLS
+     */
+    public static final String GG_SMTP_STARTTLS = "GRIDGAIN_SMTP_STARTTLS";
+
+    /**
+     * Name of system property to set system-wide local IP address or host. If provided it will
+     * override all default local bind settings within GridGain or any of its SPIs.
+     * <p>
+     * Note that system-wide local bind address can also be set via {@link org.apache.ignite.configuration.IgniteConfiguration#getLocalHost()}
+     * method. However, system properties have priority over configuration properties specified in
+     * {@link org.apache.ignite.configuration.IgniteConfiguration}.
+     */
+    public static final String GG_LOCAL_HOST = "GRIDGAIN_LOCAL_HOST";
+
+    /**
+     * Name of the system property or environment variable to activate synchronous
+     * listener notification for future objects implemented in GridGain. I.e.
+     * closure passed into method {@link org.apache.ignite.lang.IgniteFuture#listenAsync(org.apache.ignite.lang.IgniteInClosure)} will
+     * be evaluated in the same thread that will end the future.
+     *
+     * @see org.apache.ignite.lang.IgniteFuture#syncNotify()
+     */
+    public static final String GG_FUT_SYNC_NOTIFICATION = "GRIDGAIN_FUTURE_SYNC_NOTIFICATION";
+
+    /**
+     * Name of the system property or environment variable to activate concurrent
+     * listener notification for future objects implemented in GridGain. I.e.
+     * upon future completion every listener will be notified concurrently in a
+     * separate thread.
+     *
+     * @see org.apache.ignite.lang.IgniteFuture#concurrentNotify()
+     */
+    public static final String GG_FUT_CONCURRENT_NOTIFICATION = "GRIDGAIN_FUTURE_CONCURRENT_NOTIFICATION";
+
+    /**
+     * System property to override deployment mode configuration parameter.
+     * Valid values for property are: PRIVATE, ISOLATED, SHARED or CONTINUOUS.
+     *
+     * @see org.gridgain.grid.GridDeploymentMode
+     * @see org.apache.ignite.configuration.IgniteConfiguration#getDeploymentMode()
+     */
+    public static final String GG_DEP_MODE_OVERRIDE = "GRIDGAIN_DEPLOYMENT_MODE_OVERRIDE";
+
+    /**
+     * Property controlling size of buffer holding completed transaction versions. Such buffer
+     * is used to detect duplicate transaction and has a default value of {@code 102400}. In
+     * most cases this value is large enough and does not need to be changed.
+     */
+    public static final String GG_MAX_COMPLETED_TX_COUNT = "GRIDGAIN_MAX_COMPLETED_TX_COUNT";
+
+    /**
+     * Concurrency level for all concurrent hash maps created by GridGain.
+     */
+    public static final String GG_MAP_CONCURRENCY_LEVEL = "GRIDGAIN_MAP_CONCURRENCY_LEVEL";
+
+    /**
+     * Transactions that take more time, than value of this property, will be output to log
+     * with warning level. {@code 0} (default value) disables warning on slow transactions.
+     */
+    public static final String GG_SLOW_TX_WARN_TIMEOUT = "GRIDGAIN_SLOW_TX_WARN_TIMEOUT";
+
+    /**
+     * Timeout after which all uncompleted transactions originated by left node will be
+     * salvaged (i.e. invalidated and committed).
+     */
+    public static final String GG_TX_SALVAGE_TIMEOUT = "GRIDGAIN_TX_SALVAGE_TIMEOUT";
+
+    /**
+     * System property to override multicast group taken from configuration.
+     * Used for testing purposes.
+     */
+    public static final String GG_OVERRIDE_MCAST_GRP = "GRIDGAIN_OVERRIDE_MCAST_GRP";
+
+    /**
+     * System property to override default reflection cache size. Default value is {@code 128}.
+     */
+    public static final String GG_REFLECTION_CACHE_SIZE = "GRIDGAIN_REFLECTION_CACHE_SIZE";
+
+    /**
+     * System property to override default job processor maps sizes for finished jobs and
+     * cancellation requests. Default value is {@code 10240}.
+     */
+    public static final String GG_JOBS_HISTORY_SIZE = "GRIDGAIN_JOBS_HISTORY_SIZE";
+
+    /**
+     * System property to override default job metrics processor property defining
+     * concurrency level for structure holding job metrics snapshots.
+     * Default value is {@code 64}.
+     */
+    public static final String GG_JOBS_METRICS_CONCURRENCY_LEVEL = "GRIDGAIN_JOBS_METRICS_CONCURRENCY_LEVEL";
+
+    /**
+     * System property to hold optional configuration URL.
+     */
+    public static final String GG_CONFIG_URL = "GRIDGAIN_CONFIG_URL";
+
+    /** System property to hold SSH host for visor-started nodes. */
+    public static final String GG_SSH_HOST = "GRIDGAIN_SSH_HOST";
+
+    /** System property to hold SSH user name for visor-started nodes. */
+    public static final String GG_SSH_USER_NAME = "GRIDGAIN_SSH_USER_NAME";
+
+    /** System property to hold preload resend timeout for evicted partitions. */
+    public static final String GG_PRELOAD_RESEND_TIMEOUT = "GRIDGAIN_PRELOAD_RESEND_TIMEOUT";
+
+    /**
+     * System property to specify how often in milliseconds marshal buffers
+     * should be rechecked and potentially trimmed. Default value is {@code 10,000ms}.
+     */
+    public static final String GG_MARSHAL_BUFFERS_RECHECK = "GRIDGAIN_MARSHAL_BUFFERS_RECHECK";
+
+    /**
+     * System property to disable {@link HostnameVerifier} for SSL connections.
+     * Can be used for development with self-signed certificates. Default value is {@code false}.
+     */
+    public static final String GG_DISABLE_HOSTNAME_VERIFIER = "GRIDGAIN_DISABLE_HOSTNAME_VERIFIER";
+
+    /**
+     * System property to disable buffered communication if node sends less messages count than
+     * specified by this property. Default value is {@code 512}.
+     */
+    public static final String GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT = "GRIDGAIN_MIN_BUFFERED_COMMUNICATION_MSG_CNT";
+
+    /**
+     * System property to manage ratio for communication buffer resize. Buffer size will either
+     * increase or decrease according to this ratio depending on system behavior. Default value is {@code 0.8}.
+     */
+    public static final String GG_COMMUNICATION_BUF_RESIZE_RATIO = "GRIDGAIN_COMMUNICATION_BUF_RESIZE_RATIO";
+
+    /**
+     * Flag that will force GridGain to fill memory block with some recognisable pattern right before
+     * this memory block is released. This will help to recognize cases when already released memory is accessed.
+     */
+    public static final String GG_OFFHEAP_SAFE_RELEASE = "GRIDGAIN_OFFHEAP_SAFE_RELEASE";
+
+    /** Maximum size for atomic cache queue delete history. */
+    public static final String GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE = "GRIDGAIN_ATOMIC_CACHE_DELETE_HISTORY_SIZE";
+
+    /**
+     * Comma separated list of addresses in format "10.100.22.100:45000,10.100.22.101:45000".
+     * Makes sense only for {@link GridTcpDiscoveryVmIpFinder}.
+     */
+    public static final String GG_TCP_DISCOVERY_ADDRESSES = "GRIDGAIN_TCP_DISCOVERY_ADDRESSES";
+
+    /**
+     * Flag indicating whether performance suggestions output on start should be disabled.
+     */
+    public static final String GG_PERFORMANCE_SUGGESTIONS_DISABLED = "GRIDGAIN_PERFORMANCE_SUGGESTIONS_DISABLED";
+
+    /**
+     * Specifies log level for Visor client logging.
+     */
+    public static final String GG_VISOR_CLIENT_LOG_LEVEL = "GRIDGAIN_VISOR_CLIENT_LOG_LEVEL";
+
+    /**
+     * Atomic cache deferred update response buffer size.
+     */
+    public static final String GG_ATOMIC_DEFERRED_ACK_BUFFER_SIZE = "GRIDGAIN_ATOMIC_DEFERRED_ACK_BUFFER_SIZE";
+
+    /**
+     * Atomic cache deferred update timeout.
+     */
+    public static final String GG_ATOMIC_DEFERRED_ACK_TIMEOUT = "GRIDGAIN_ATOMIC_DEFERRED_ACK_TIMEOUT";
+
+    /**
+     * If this property set then debug console will be opened for H2 indexing SPI.
+     */
+    public static final String GG_H2_DEBUG_CONSOLE = "GRIDGAIN_H2_DEBUG_CONSOLE";
+
+    /**
+     * If this property is set to {@code true} then shared memory space native debug will be enabled.
+     */
+    public static final String GG_IPC_SHMEM_SPACE_DEBUG = "GRIDGAIN_IPC_SHMEM_SPACE_DEBUG";
+
+    /**
+     * Portable object array initial capacity.
+     */
+    public static final String GG_PORTABLE_ARRAY_INITIAL_CAPACITY = "GRIDGAIN_PORTABLE_ARRAY_INITIAL_CAPACITY";
+
+    /**
+     * Property allowing to skip configuration consistency checks.
+     */
+    public static final String GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK =
+        "GRIDGAIN_SKIP_CONFIGURATION_CONSISTENCY_CHECK";
+
+    /**
+     * Flag indicating whether validation of keys put to cache should be disabled.
+     */
+    public static final String GG_CACHE_KEY_VALIDATION_DISABLED = "GRIDGAIN_CACHE_KEY_VALIDATION_DISABLED";
+
+    /**
+     * Environment variable to override logging directory that has been set in logger configuration.
+     */
+    public static final String GG_LOG_DIR = "GRIDGAIN_LOG_DIR";
+
+    /**
+     * Environment variable to set work directory. The property {@link org.apache.ignite.configuration.IgniteConfiguration#setWorkDirectory} has higher
+     * priority.
+     */
+    public static final String GG_WORK_DIR = "GRIDGAIN_WORK_DIR";
+
+    /**
+     * Enforces singleton.
+     */
+    private IgniteSystemProperties() {
+        // No-op.
+    }
+
+    /**
+     * Gets either system property or environment variable with given name.
+     *
+     * @param name Name of the system property or environment variable.
+     * @return Value of the system property or environment variable.
+     *         Returns {@code null} if neither can be found for given name.
+     */
+    @Nullable public static String getString(String name) {
+        assert name != null;
+
+        String v = System.getProperty(name);
+
+        if (v == null)
+            v = System.getenv(name);
+
+        return v;
+    }
+
+    /**
+     * Gets either system property or environment variable with given name.
+     *
+     * @param name Name of the system property or environment variable.
+     * @param dflt Default value.
+     * @return Value of the system property or environment variable.
+     *         Returns {@code null} if neither can be found for given name.
+     */
+    @Nullable public static String getString(String name, String dflt) {
+        String val = getString(name);
+
+        return val == null ? dflt : val;
+    }
+
+    /**
+     * Gets either system property or environment variable with given name.
+     * The result is transformed to {@code boolean} using {@code Boolean.valueOf()} method.
+     *
+     * @param name Name of the system property or environment variable.
+     * @return Boolean value of the system property or environment variable.
+     *         Returns {@code False} in case neither system property
+     *         nor environment variable with given name is found.
+     */
+    public static boolean getBoolean(String name) {
+        return getBoolean(name, false);
+    }
+
+    /**
+     * Gets either system property or environment variable with given name.
+     * The result is transformed to {@code boolean} using {@code Boolean.valueOf()} method.
+     *
+     * @param name Name of the system property or environment variable.
+     * @param dflt Default value.
+     * @return Boolean value of the system property or environment variable.
+     *         Returns default value in case neither system property
+     *         nor environment variable with given name is found.
+     */
+    public static boolean getBoolean(String name, boolean dflt) {
+        String val = getString(name);
+
+        return val == null ? dflt : Boolean.valueOf(val);
+    }
+
+    /**
+     * Gets either system property or environment variable with given name.
+     * The result is transformed to {@code int} using {@code Integer.parseInt()} method.
+     *
+     * @param name Name of the system property or environment variable.
+     * @param dflt Default value
+     * @return Integer value of the system property or environment variable.
+     *         Returns default value in case neither system property
+     *         nor environment variable with given name is found.
+     */
+    public static int getInteger(String name, int dflt) {
+        String s = getString(name);
+
+        if (s == null)
+            return dflt;
+
+        int res;
+
+        try {
+            res = Integer.parseInt(s);
+        }
+        catch (NumberFormatException ignore) {
+            res = dflt;
+        }
+
+        return res;
+    }
+
+    /**
+     * Gets either system property or environment variable with given name.
+     * The result is transformed to {@code long} using {@code Long.parseLong()} method.
+     *
+     * @param name Name of the system property or environment variable.
+     * @param dflt Default value
+     * @return Integer value of the system property or environment variable.
+     *         Returns default value in case neither system property
+     *         nor environment variable with given name is found.
+     */
+    public static long getLong(String name, long dflt) {
+        String s = getString(name);
+
+        if (s == null)
+            return dflt;
+
+        long res;
+
+        try {
+            res = Long.parseLong(s);
+        }
+        catch (NumberFormatException ignore) {
+            res = dflt;
+        }
+
+        return res;
+    }
+
+    /**
+     * Gets either system property or environment variable with given name.
+     * The result is transformed to {@code double} using {@code Double.parseDouble()} method.
+     *
+     * @param name Name of the system property or environment variable.
+     * @param dflt Default value
+     * @return Integer value of the system property or environment variable.
+     *         Returns default value in case neither system property
+     *         nor environment variable with given name is found.
+     */
+    public static double getDouble(String name, double dflt) {
+        String s = getString(name);
+
+        if (s == null)
+            return dflt;
+
+        double res;
+
+        try {
+            res = Double.parseDouble(s);
+        }
+        catch (NumberFormatException ignore) {
+            res = dflt;
+        }
+
+        return res;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/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 fe473de..75dbb5c 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
@@ -710,7 +710,7 @@ public class IgniteConfiguration {
      *
      * @return Whether or not to use SSL fot SMTP.
      * @see #DFLT_SMTP_SSL
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_SSL
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_SSL
      */
     public boolean isSmtpSsl() {
         return smtpSsl;
@@ -729,7 +729,7 @@ public class IgniteConfiguration {
      *
      * @return Whether or not to use STARTTLS fot SMTP.
      * @see #DFLT_SMTP_STARTTLS
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_STARTTLS
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_STARTTLS
      */
     public boolean isSmtpStartTls() {
         return smtpStartTls;
@@ -747,7 +747,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @return SMTP host name or {@code null} if SMTP is not configured.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_HOST
      */
     public String getSmtpHost() {
         return smtpHost;
@@ -766,7 +766,7 @@ public class IgniteConfiguration {
      *
      * @return SMTP port.
      * @see #DFLT_SMTP_PORT
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_PORT
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PORT
      */
     public int getSmtpPort() {
         return smtpPort;
@@ -784,7 +784,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @return SMTP username or {@code null}.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_USERNAME
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_USERNAME
      */
     public String getSmtpUsername() {
         return smtpUsername;
@@ -802,7 +802,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @return SMTP password or {@code null}.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_PWD
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PWD
      */
     public String getSmtpPassword() {
         return smtpPwd;
@@ -819,7 +819,7 @@ public class IgniteConfiguration {
      * @return Optional set of admin emails where email notifications will be set.
      *      If {@code null} - emails will be sent only to the email in the license
      *      if one provided.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_ADMIN_EMAILS
+     * @see org.apache.ignite.IgniteSystemProperties#GG_ADMIN_EMAILS
      */
     public String[] getAdminEmails() {
         return adminEmails;
@@ -832,7 +832,7 @@ public class IgniteConfiguration {
      * @return Optional FROM email address for email notifications. If {@code null}
      *      - {@link #DFLT_SMTP_FROM_EMAIL} will be used by default.
      * @see #DFLT_SMTP_FROM_EMAIL
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_FROM
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_FROM
      */
     public String getSmtpFromEmail() {
         return smtpFromEmail;
@@ -851,7 +851,7 @@ public class IgniteConfiguration {
      * Sets whether or not to enable lifecycle email notifications.
      *
      * @param lifeCycleEmailNtf {@code True} to enable lifecycle email notifications.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_LIFECYCLE_EMAIL_NOTIFY
+     * @see org.apache.ignite.IgniteSystemProperties#GG_LIFECYCLE_EMAIL_NOTIFY
      */
     public void setLifeCycleEmailNotification(boolean lifeCycleEmailNtf) {
         this.lifeCycleEmailNtf = lifeCycleEmailNtf;
@@ -869,7 +869,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @param smtpSsl Whether or not SMTP uses SSL.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_SSL
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_SSL
      */
     public void setSmtpSsl(boolean smtpSsl) {
         this.smtpSsl = smtpSsl;
@@ -887,7 +887,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @param smtpStartTls Whether or not SMTP uses STARTTLS.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_STARTTLS
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_STARTTLS
      */
     public void setSmtpStartTls(boolean smtpStartTls) {
         this.smtpStartTls = smtpStartTls;
@@ -905,7 +905,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @param smtpHost SMTP host to set or {@code null} to disable sending emails.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_HOST
      */
     public void setSmtpHost(String smtpHost) {
         this.smtpHost = smtpHost;
@@ -924,7 +924,7 @@ public class IgniteConfiguration {
      *
      * @param smtpPort SMTP port to set.
      * @see #DFLT_SMTP_PORT
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_PORT
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PORT
      */
     public void setSmtpPort(int smtpPort) {
         this.smtpPort = smtpPort;
@@ -942,7 +942,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @param smtpUsername SMTP username or {@code null}.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_USERNAME
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_USERNAME
      */
     public void setSmtpUsername(String smtpUsername) {
         this.smtpUsername = smtpUsername;
@@ -960,7 +960,7 @@ public class IgniteConfiguration {
      * configuration property.
      *
      * @param smtpPwd SMTP password or {@code null}.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_PWD
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PWD
      */
     public void setSmtpPassword(String smtpPwd) {
         this.smtpPwd = smtpPwd;
@@ -977,7 +977,7 @@ public class IgniteConfiguration {
      * @param adminEmails Optional set of admin emails where email notifications will be set.
      *      If {@code null} - emails will be sent only to the email in the license
      *      if one provided.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_ADMIN_EMAILS
+     * @see org.apache.ignite.IgniteSystemProperties#GG_ADMIN_EMAILS
      */
     public void setAdminEmails(String[] adminEmails) {
         this.adminEmails = adminEmails;
@@ -990,7 +990,7 @@ public class IgniteConfiguration {
      * @param smtpFromEmail Optional FROM email address for email notifications. If {@code null}
      *      - {@link #DFLT_SMTP_FROM_EMAIL} will be used by default.
      * @see #DFLT_SMTP_FROM_EMAIL
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_FROM
+     * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_FROM
      */
     public void setSmtpFromEmail(String smtpFromEmail) {
         this.smtpFromEmail = smtpFromEmail;
@@ -1371,7 +1371,7 @@ public class IgniteConfiguration {
      *
      * @return GridGain installation home or {@code null} to make the system attempt to
      *      infer it automatically.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_HOME
+     * @see org.apache.ignite.IgniteSystemProperties#GG_HOME
      */
     public String getGridGainHome() {
         return ggHome;
@@ -1382,7 +1382,7 @@ public class IgniteConfiguration {
      *
      * @param ggHome {@code GridGain} installation folder.
      * @see IgniteConfiguration#getGridGainHome()
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_HOME
+     * @see org.apache.ignite.IgniteSystemProperties#GG_HOME
      */
     public void setGridGainHome(String ggHome) {
         this.ggHome = ggHome;
@@ -1397,7 +1397,7 @@ public class IgniteConfiguration {
      *
      * @return GridGain work folder or {@code null} to make the system attempt to infer it automatically.
      * @see IgniteConfiguration#getGridGainHome()
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_HOME
+     * @see org.apache.ignite.IgniteSystemProperties#GG_HOME
      */
     public String getWorkDirectory() {
         return ggWork;
@@ -2354,12 +2354,12 @@ public class IgniteConfiguration {
      * accessing GridGain APIs remotely.
      * <p>
      * If not provided, Jetty instance with default configuration will be started picking
-     * {@link org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT}
+     * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT}
      * as host and port respectively.
      *
      * @return Path to {@code JETTY} XML configuration file.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
      * @deprecated Use {@link GridClientConnectionConfiguration#getRestJettyPath()}.
      */
     @Deprecated
@@ -2383,8 +2383,8 @@ public class IgniteConfiguration {
      * external {@code REST} access is turned on.
      *
      * @return Flag indicating whether external {@code REST} access is enabled or not.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
      * @deprecated Use {@link GridClientConnectionConfiguration}.
      */
     @Deprecated
@@ -2884,8 +2884,8 @@ public class IgniteConfiguration {
      * Gets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
      *
      * @return Secret key.
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST
-     * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
      * @deprecated Use {@link GridClientConnectionConfiguration#getRestSecretKey()}.
      */
     @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/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 fd6e66f..c597d92 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
@@ -105,7 +105,7 @@ public interface IgniteFuture<R> {
      * immediately notified within the same thread.
      * <p>
      * Default value is {@code false}. To change the default, set
-     * {@link org.gridgain.grid.IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
+     * {@link org.apache.ignite.IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
      *
      * @param syncNotify Flag to turn on or off synchronous listener notification.
      */
@@ -119,7 +119,7 @@ public interface IgniteFuture<R> {
      * immediately notified within the same thread.
      * <p>
      * Default value is {@code false}. To change the default, set
-     * {@link org.gridgain.grid.IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
+     * {@link org.apache.ignite.IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
      *
      * @return Synchronous listener notification flag.
      */
@@ -134,7 +134,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 org.gridgain.grid.IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
+     * {@link org.apache.ignite.IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
      *
      * @param concurNotify Flag to turn on or off concurrent listener notification.
      */
@@ -149,7 +149,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 org.gridgain.grid.IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
+     * {@link org.apache.ignite.IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
      *
      * @return Concurrent listener notification flag
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/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 6d9d99a..8f28634 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
@@ -23,7 +23,7 @@ import java.util.*;
 import java.util.logging.*;
 
 import static java.util.logging.Level.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**
  * Logger to use with Java logging. Implementation simply delegates to Java Logging.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
index f11374e..d20bc0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
@@ -16,7 +16,7 @@ import java.lang.annotation.*;
 /**
  * Annotates a field or a setter method for injection of local host address or host name for
  * connection binding. Local host is provided via {@link org.apache.ignite.configuration.IgniteConfiguration#getLocalHost()} or
- * via {@link org.gridgain.grid.IgniteSystemProperties#GG_LOCAL_HOST} system or environment property.
+ * via {@link org.apache.ignite.IgniteSystemProperties#GG_LOCAL_HOST} system or environment property.
  * <p>
  * Local node ID can be injected into instances of following classes:
  * <ul>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/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 95a2acc..5f1dab0 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
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.IgniteState.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.kernal.GridProductImpl.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
index cfe7997..1f02ecf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
@@ -158,12 +158,12 @@ public class GridClientConnectionConfiguration {
      * accessing GridGain APIs remotely.
      * <p>
      * If not provided, Jetty instance with default configuration will be started picking
-     * {@link IgniteSystemProperties#GG_JETTY_HOST} and {@link IgniteSystemProperties#GG_JETTY_PORT}
+     * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT}
      * as host and port respectively.
      *
      * @return Path to {@code JETTY} XML configuration file.
-     * @see IgniteSystemProperties#GG_JETTY_HOST
-     * @see IgniteSystemProperties#GG_JETTY_PORT
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
      */
     public String getRestJettyPath() {
         return jettyPath;
@@ -182,8 +182,8 @@ public class GridClientConnectionConfiguration {
      * Gets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
      *
      * @return Secret key.
-     * @see IgniteSystemProperties#GG_JETTY_HOST
-     * @see IgniteSystemProperties#GG_JETTY_PORT
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
      */
     @Nullable public String getRestSecretKey() {
         return restSecretKey;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/IgniteSystemProperties.java b/modules/core/src/main/java/org/gridgain/grid/IgniteSystemProperties.java
deleted file mode 100644
index dedea19..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/IgniteSystemProperties.java
+++ /dev/null
@@ -1,603 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.gridgain.grid.spi.discovery.*;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
-import org.jetbrains.annotations.*;
-
-import javax.net.ssl.*;
-
-/**
- * Contains constants for all system properties and environmental variables in GridGain. These
- * properties and variables can be used to affect the behavior of GridGain.
- */
-public final class IgniteSystemProperties {
-    /**
-     * If this system property is present the GridGain will include grid name into verbose log.
-     */
-    public static final String GG_LOG_GRID_NAME = "GRIDGAIN_LOG_GRID_NAME";
-
-    /**
-     * This property is used internally to pass an exit code to loader when
-     * GridGain instance is being restarted.
-     */
-    public static final String GG_RESTART_CODE = "GRIDGAIN_RESTART_CODE";
-
-    /**
-     * Presence of this system property with value {@code true} will make the grid
-     * node start as a daemon node. Node that this system property will override
-     * {@link org.apache.ignite.configuration.IgniteConfiguration#isDaemon()} configuration.
-     */
-    public static final String GG_DAEMON = "GRIDGAIN_DAEMON";
-
-    /** Defines GridGain installation folder. */
-    public static final String GG_HOME = "GRIDGAIN_HOME";
-
-    /** If this system property is set to {@code false} - no shutdown hook will be set. */
-    public static final String GG_NO_SHUTDOWN_HOOK = "GRIDGAIN_NO_SHUTDOWN_HOOK";
-
-    /**
-     * Name of the system property to disable requirement for proper node ordering
-     * by discovery SPI. Use with care, as proper node ordering is required for
-     * cache consistency. If set to {@code true}, then any discovery SPI can be used
-     * with distributed cache, otherwise, only discovery SPIs that have annotation
-     * {@link GridDiscoverySpiOrderSupport @GridDiscoverySpiOrderSupport(true)} will
-     * be allowed.
-     */
-    public static final String GG_NO_DISCO_ORDER = "GRIDGAIN_NO_DISCO_ORDER";
-
-    /**
-     * If this system property is set to {@code false} - no checks for new versions will
-     * be performed by GridGain. By default, GridGain periodically checks for the new
-     * version and prints out the message into the log if new version of GridGain is
-     * available for download.
-     */
-    public static final String GG_UPDATE_NOTIFIER = "GRIDGAIN_UPDATE_NOTIFIER";
-
-    /**
-     * This system property defines interval in milliseconds in which GridGain will check
-     * thread pool state for starvation. Zero value will disable this checker.
-     */
-    public static final String GG_STARVATION_CHECK_INTERVAL = "GRIDGAIN_STARVATION_CHECK_INTERVAL";
-
-    /**
-     * If this system property is present (any value) - no ASCII logo will
-     * be printed.
-     */
-    public static final String GG_NO_ASCII = "GRIDGAIN_NO_ASCII";
-
-    /**
-     * This property allows to override Jetty host for REST processor.
-     */
-    public static final String GG_JETTY_HOST = "GRIDGAIN_JETTY_HOST";
-
-    /**
-     * This property allows to override Jetty local port for REST processor.
-     */
-    public static final String GG_JETTY_PORT = "GRIDGAIN_JETTY_PORT";
-
-    /**
-     * This property does not allow GridGain to override Jetty log configuration for REST processor.
-     */
-    public static final String GG_JETTY_LOG_NO_OVERRIDE = "GRIDGAIN_JETTY_LOG_NO_OVERRIDE";
-
-    /**
-     * This property allows to override maximum count of task results stored on one node
-     * in REST processor.
-     */
-    public static final String GG_REST_MAX_TASK_RESULTS = "GRIDGAIN_REST_MAX_TASK_RESULTS";
-
-    /**
-     * This property defines the maximum number of attempts to remap near get to the same
-     * primary node. Remapping may be needed when topology is changed concurrently with
-     * get operation.
-     */
-    public static final String GG_NEAR_GET_MAX_REMAPS = "GRIDGAIN_NEAR_GET_MAX_REMAPS";
-
-    /**
-     * Set to either {@code true} or {@code false} to enable or disable quiet mode
-     * of GridGain. In quiet mode, only warning and errors are printed into the log
-     * additionally to a shortened version of standard output on the start.
-     * <p>
-     * Note that if you use <tt>ggstart.{sh|bat}</tt> scripts to start GridGain they
-     * start by default in quiet mode. You can supply <tt>-v</tt> flag to override it.
-     */
-    public static final String GG_QUIET = "GRIDGAIN_QUIET";
-
-    /**
-     * If this property is set to {@code true} (default) and GridGain is launched
-     * in verbose mode (see {@link #GG_QUIET}) and no console appenders can be found
-     * in configuration, then default console appender will be added.
-     * Set this property to {@code false} if no appenders should be added.
-     */
-    public static final String GG_CONSOLE_APPENDER = "GRIDGAIN_CONSOLE_APPENDER";
-
-    /**
-     * Name of the system property defining name of command line program.
-     */
-    public static final String GG_PROG_NAME = "GRIDGAIN_PROG_NAME";
-
-    /**
-     * Name of the system property defining success file name. This file
-     * is used with auto-restarting functionality when GridGain is started
-     * by supplied <tt>ggstart.{bat|sh}</tt> scripts.
-     */
-    public static final String GG_SUCCESS_FILE = "GRIDGAIN_SUCCESS_FILE";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * SMTP host. If provided - it will override the property in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpHost()
-     */
-    public static final String GG_SMTP_HOST = "GRIDGAIN_SMTP_HOST";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * SMTP port. If provided - it will override the property in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPort()
-     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_PORT
-     */
-    public static final String GG_SMTP_PORT = "GRIDGAIN_SMTP_PORT";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * SMTP username. If provided - it will override the property in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpUsername()
-     */
-    public static final String GG_SMTP_USERNAME = "GRIDGAIN_SMTP_USERNAME";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * SMTP password. If provided - it will override the property in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPassword()
-     */
-    public static final String GG_SMTP_PWD = "GRIDGAIN_SMTP_PASSWORD";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * SMTP FROM email. If provided - it will override the property in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpFromEmail()
-     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_FROM_EMAIL
-     */
-    public static final String GG_SMTP_FROM = "GRIDGAIN_SMTP_FROM";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * list of admin emails. Value of this property should be comma-separated list
-     * of emails. If provided - it will override the property in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getAdminEmails()
-     */
-    public static final String GG_ADMIN_EMAILS = "GRIDGAIN_ADMIN_EMAILS";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * whether or not to use SSL. If provided - it will override the property
-     * in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpSsl()
-     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_SSL
-     */
-    public static final String GG_SMTP_SSL = "GRIDGAIN_SMTP_SSL";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * whether or not to enable email notifications for node lifecycle. If provided -
-     * it will override the property in grid configuration.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#isLifeCycleEmailNotification()
-     */
-    public static final String GG_LIFECYCLE_EMAIL_NOTIFY = "GRIDGAIN_LIFECYCLE_EMAIL_NOTIFY";
-
-    /**
-     * Name of the system property or environment variable to set or override
-     * whether or not to use STARTTLS. If provided - it will override the property
-     * in grid configuration.
-     * <p>
-     * Note that GridGain uses SMTP to send emails in critical
-     * situations such as license expiration or fatal system errors.
-     * It is <b>highly</b> recommended to configure SMTP in production
-     * environment.
-     *
-     * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpStartTls()
-     * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_STARTTLS
-     */
-    public static final String GG_SMTP_STARTTLS = "GRIDGAIN_SMTP_STARTTLS";
-
-    /**
-     * Name of system property to set system-wide local IP address or host. If provided it will
-     * override all default local bind settings within GridGain or any of its SPIs.
-     * <p>
-     * Note that system-wide local bind address can also be set via {@link org.apache.ignite.configuration.IgniteConfiguration#getLocalHost()}
-     * method. However, system properties have priority over configuration properties specified in
-     * {@link org.apache.ignite.configuration.IgniteConfiguration}.
-     */
-    public static final String GG_LOCAL_HOST = "GRIDGAIN_LOCAL_HOST";
-
-    /**
-     * Name of the system property or environment variable to activate synchronous
-     * listener notification for future objects implemented in GridGain. I.e.
-     * closure passed into method {@link org.apache.ignite.lang.IgniteFuture#listenAsync(org.apache.ignite.lang.IgniteInClosure)} will
-     * be evaluated in the same thread that will end the future.
-     *
-     * @see org.apache.ignite.lang.IgniteFuture#syncNotify()
-     */
-    public static final String GG_FUT_SYNC_NOTIFICATION = "GRIDGAIN_FUTURE_SYNC_NOTIFICATION";
-
-    /**
-     * Name of the system property or environment variable to activate concurrent
-     * listener notification for future objects implemented in GridGain. I.e.
-     * upon future completion every listener will be notified concurrently in a
-     * separate thread.
-     *
-     * @see org.apache.ignite.lang.IgniteFuture#concurrentNotify()
-     */
-    public static final String GG_FUT_CONCURRENT_NOTIFICATION = "GRIDGAIN_FUTURE_CONCURRENT_NOTIFICATION";
-
-    /**
-     * System property to override deployment mode configuration parameter.
-     * Valid values for property are: PRIVATE, ISOLATED, SHARED or CONTINUOUS.
-     *
-     * @see GridDeploymentMode
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getDeploymentMode()
-     */
-    public static final String GG_DEP_MODE_OVERRIDE = "GRIDGAIN_DEPLOYMENT_MODE_OVERRIDE";
-
-    /**
-     * Property controlling size of buffer holding completed transaction versions. Such buffer
-     * is used to detect duplicate transaction and has a default value of {@code 102400}. In
-     * most cases this value is large enough and does not need to be changed.
-     */
-    public static final String GG_MAX_COMPLETED_TX_COUNT = "GRIDGAIN_MAX_COMPLETED_TX_COUNT";
-
-    /**
-     * Concurrency level for all concurrent hash maps created by GridGain.
-     */
-    public static final String GG_MAP_CONCURRENCY_LEVEL = "GRIDGAIN_MAP_CONCURRENCY_LEVEL";
-
-    /**
-     * Transactions that take more time, than value of this property, will be output to log
-     * with warning level. {@code 0} (default value) disables warning on slow transactions.
-     */
-    public static final String GG_SLOW_TX_WARN_TIMEOUT = "GRIDGAIN_SLOW_TX_WARN_TIMEOUT";
-
-    /**
-     * Timeout after which all uncompleted transactions originated by left node will be
-     * salvaged (i.e. invalidated and committed).
-     */
-    public static final String GG_TX_SALVAGE_TIMEOUT = "GRIDGAIN_TX_SALVAGE_TIMEOUT";
-
-    /**
-     * System property to override multicast group taken from configuration.
-     * Used for testing purposes.
-     */
-    public static final String GG_OVERRIDE_MCAST_GRP = "GRIDGAIN_OVERRIDE_MCAST_GRP";
-
-    /**
-     * System property to override default reflection cache size. Default value is {@code 128}.
-     */
-    public static final String GG_REFLECTION_CACHE_SIZE = "GRIDGAIN_REFLECTION_CACHE_SIZE";
-
-    /**
-     * System property to override default job processor maps sizes for finished jobs and
-     * cancellation requests. Default value is {@code 10240}.
-     */
-    public static final String GG_JOBS_HISTORY_SIZE = "GRIDGAIN_JOBS_HISTORY_SIZE";
-
-    /**
-     * System property to override default job metrics processor property defining
-     * concurrency level for structure holding job metrics snapshots.
-     * Default value is {@code 64}.
-     */
-    public static final String GG_JOBS_METRICS_CONCURRENCY_LEVEL = "GRIDGAIN_JOBS_METRICS_CONCURRENCY_LEVEL";
-
-    /**
-     * System property to hold optional configuration URL.
-     */
-    public static final String GG_CONFIG_URL = "GRIDGAIN_CONFIG_URL";
-
-    /** System property to hold SSH host for visor-started nodes. */
-    public static final String GG_SSH_HOST = "GRIDGAIN_SSH_HOST";
-
-    /** System property to hold SSH user name for visor-started nodes. */
-    public static final String GG_SSH_USER_NAME = "GRIDGAIN_SSH_USER_NAME";
-
-    /** System property to hold preload resend timeout for evicted partitions. */
-    public static final String GG_PRELOAD_RESEND_TIMEOUT = "GRIDGAIN_PRELOAD_RESEND_TIMEOUT";
-
-    /**
-     * System property to specify how often in milliseconds marshal buffers
-     * should be rechecked and potentially trimmed. Default value is {@code 10,000ms}.
-     */
-    public static final String GG_MARSHAL_BUFFERS_RECHECK = "GRIDGAIN_MARSHAL_BUFFERS_RECHECK";
-
-    /**
-     * System property to disable {@link HostnameVerifier} for SSL connections.
-     * Can be used for development with self-signed certificates. Default value is {@code false}.
-     */
-    public static final String GG_DISABLE_HOSTNAME_VERIFIER = "GRIDGAIN_DISABLE_HOSTNAME_VERIFIER";
-
-    /**
-     * System property to disable buffered communication if node sends less messages count than
-     * specified by this property. Default value is {@code 512}.
-     */
-    public static final String GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT = "GRIDGAIN_MIN_BUFFERED_COMMUNICATION_MSG_CNT";
-
-    /**
-     * System property to manage ratio for communication buffer resize. Buffer size will either
-     * increase or decrease according to this ratio depending on system behavior. Default value is {@code 0.8}.
-     */
-    public static final String GG_COMMUNICATION_BUF_RESIZE_RATIO = "GRIDGAIN_COMMUNICATION_BUF_RESIZE_RATIO";
-
-    /**
-     * Flag that will force GridGain to fill memory block with some recognisable pattern right before
-     * this memory block is released. This will help to recognize cases when already released memory is accessed.
-     */
-    public static final String GG_OFFHEAP_SAFE_RELEASE = "GRIDGAIN_OFFHEAP_SAFE_RELEASE";
-
-    /** Maximum size for atomic cache queue delete history. */
-    public static final String GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE = "GRIDGAIN_ATOMIC_CACHE_DELETE_HISTORY_SIZE";
-
-    /**
-     * Comma separated list of addresses in format "10.100.22.100:45000,10.100.22.101:45000".
-     * Makes sense only for {@link GridTcpDiscoveryVmIpFinder}.
-     */
-    public static final String GG_TCP_DISCOVERY_ADDRESSES = "GRIDGAIN_TCP_DISCOVERY_ADDRESSES";
-
-    /**
-     * Flag indicating whether performance suggestions output on start should be disabled.
-     */
-    public static final String GG_PERFORMANCE_SUGGESTIONS_DISABLED = "GRIDGAIN_PERFORMANCE_SUGGESTIONS_DISABLED";
-
-    /**
-     * Specifies log level for Visor client logging.
-     */
-    public static final String GG_VISOR_CLIENT_LOG_LEVEL = "GRIDGAIN_VISOR_CLIENT_LOG_LEVEL";
-
-    /**
-     * Atomic cache deferred update response buffer size.
-     */
-    public static final String GG_ATOMIC_DEFERRED_ACK_BUFFER_SIZE = "GRIDGAIN_ATOMIC_DEFERRED_ACK_BUFFER_SIZE";
-
-    /**
-     * Atomic cache deferred update timeout.
-     */
-    public static final String GG_ATOMIC_DEFERRED_ACK_TIMEOUT = "GRIDGAIN_ATOMIC_DEFERRED_ACK_TIMEOUT";
-
-    /**
-     * If this property set then debug console will be opened for H2 indexing SPI.
-     */
-    public static final String GG_H2_DEBUG_CONSOLE = "GRIDGAIN_H2_DEBUG_CONSOLE";
-
-    /**
-     * If this property is set to {@code true} then shared memory space native debug will be enabled.
-     */
-    public static final String GG_IPC_SHMEM_SPACE_DEBUG = "GRIDGAIN_IPC_SHMEM_SPACE_DEBUG";
-
-    /**
-     * Portable object array initial capacity.
-     */
-    public static final String GG_PORTABLE_ARRAY_INITIAL_CAPACITY = "GRIDGAIN_PORTABLE_ARRAY_INITIAL_CAPACITY";
-
-    /**
-     * Property allowing to skip configuration consistency checks.
-     */
-    public static final String GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK =
-        "GRIDGAIN_SKIP_CONFIGURATION_CONSISTENCY_CHECK";
-
-    /**
-     * Flag indicating whether validation of keys put to cache should be disabled.
-     */
-    public static final String GG_CACHE_KEY_VALIDATION_DISABLED = "GRIDGAIN_CACHE_KEY_VALIDATION_DISABLED";
-
-    /**
-     * Environment variable to override logging directory that has been set in logger configuration.
-     */
-    public static final String GG_LOG_DIR = "GRIDGAIN_LOG_DIR";
-
-    /**
-     * Environment variable to set work directory. The property {@link org.apache.ignite.configuration.IgniteConfiguration#setWorkDirectory} has higher
-     * priority.
-     */
-    public static final String GG_WORK_DIR = "GRIDGAIN_WORK_DIR";
-
-    /**
-     * Enforces singleton.
-     */
-    private IgniteSystemProperties() {
-        // No-op.
-    }
-
-    /**
-     * Gets either system property or environment variable with given name.
-     *
-     * @param name Name of the system property or environment variable.
-     * @return Value of the system property or environment variable.
-     *         Returns {@code null} if neither can be found for given name.
-     */
-    @Nullable public static String getString(String name) {
-        assert name != null;
-
-        String v = System.getProperty(name);
-
-        if (v == null)
-            v = System.getenv(name);
-
-        return v;
-    }
-
-    /**
-     * Gets either system property or environment variable with given name.
-     *
-     * @param name Name of the system property or environment variable.
-     * @param dflt Default value.
-     * @return Value of the system property or environment variable.
-     *         Returns {@code null} if neither can be found for given name.
-     */
-    @Nullable public static String getString(String name, String dflt) {
-        String val = getString(name);
-
-        return val == null ? dflt : val;
-    }
-
-    /**
-     * Gets either system property or environment variable with given name.
-     * The result is transformed to {@code boolean} using {@code Boolean.valueOf()} method.
-     *
-     * @param name Name of the system property or environment variable.
-     * @return Boolean value of the system property or environment variable.
-     *         Returns {@code False} in case neither system property
-     *         nor environment variable with given name is found.
-     */
-    public static boolean getBoolean(String name) {
-        return getBoolean(name, false);
-    }
-
-    /**
-     * Gets either system property or environment variable with given name.
-     * The result is transformed to {@code boolean} using {@code Boolean.valueOf()} method.
-     *
-     * @param name Name of the system property or environment variable.
-     * @param dflt Default value.
-     * @return Boolean value of the system property or environment variable.
-     *         Returns default value in case neither system property
-     *         nor environment variable with given name is found.
-     */
-    public static boolean getBoolean(String name, boolean dflt) {
-        String val = getString(name);
-
-        return val == null ? dflt : Boolean.valueOf(val);
-    }
-
-    /**
-     * Gets either system property or environment variable with given name.
-     * The result is transformed to {@code int} using {@code Integer.parseInt()} method.
-     *
-     * @param name Name of the system property or environment variable.
-     * @param dflt Default value
-     * @return Integer value of the system property or environment variable.
-     *         Returns default value in case neither system property
-     *         nor environment variable with given name is found.
-     */
-    public static int getInteger(String name, int dflt) {
-        String s = getString(name);
-
-        if (s == null)
-            return dflt;
-
-        int res;
-
-        try {
-            res = Integer.parseInt(s);
-        }
-        catch (NumberFormatException ignore) {
-            res = dflt;
-        }
-
-        return res;
-    }
-
-    /**
-     * Gets either system property or environment variable with given name.
-     * The result is transformed to {@code long} using {@code Long.parseLong()} method.
-     *
-     * @param name Name of the system property or environment variable.
-     * @param dflt Default value
-     * @return Integer value of the system property or environment variable.
-     *         Returns default value in case neither system property
-     *         nor environment variable with given name is found.
-     */
-    public static long getLong(String name, long dflt) {
-        String s = getString(name);
-
-        if (s == null)
-            return dflt;
-
-        long res;
-
-        try {
-            res = Long.parseLong(s);
-        }
-        catch (NumberFormatException ignore) {
-            res = dflt;
-        }
-
-        return res;
-    }
-
-    /**
-     * Gets either system property or environment variable with given name.
-     * The result is transformed to {@code double} using {@code Double.parseDouble()} method.
-     *
-     * @param name Name of the system property or environment variable.
-     * @param dflt Default value
-     * @return Integer value of the system property or environment variable.
-     *         Returns default value in case neither system property
-     *         nor environment variable with given name is found.
-     */
-    public static double getDouble(String name, double dflt) {
-        String s = getString(name);
-
-        if (s == null)
-            return dflt;
-
-        double res;
-
-        try {
-            res = Double.parseDouble(s);
-        }
-        catch (NumberFormatException ignore) {
-            res = dflt;
-        }
-
-        return res;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index a456a13..233f726 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -73,7 +73,7 @@ import java.util.logging.*;
 
 import static org.apache.ignite.configuration.IgniteConfiguration.*;
 import static org.apache.ignite.IgniteState.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index ad342de..6a76027 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -85,7 +85,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.lifecycle.LifecycleEventType.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.kernal.GridComponentType.*;
 import static org.gridgain.grid.kernal.GridKernalState.*;
 import static org.gridgain.grid.kernal.GridNodeAttributes.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
index 6f79728..4af386f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
@@ -66,7 +66,7 @@ import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.kernal.GridComponentType.*;
 import static org.gridgain.grid.kernal.GridKernalState.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
index df34618..cf004d7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.util.*;
 
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**
  *
@@ -157,7 +157,7 @@ public class GridLoggerProxy extends GridMetadataAwareAdapter implements IgniteL
     }
 
     /**
-     * Enriches the log message with grid name if {@link org.gridgain.grid.IgniteSystemProperties#GG_LOG_GRID_NAME}
+     * Enriches the log message with grid name if {@link org.apache.ignite.IgniteSystemProperties#GG_LOG_GRID_NAME}
      * system property is set.
      *
      * @param m Message to enrich.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
index 1601127..037d0c2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.*;
 
 import java.util.*;
 
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**
  * Grid performance suggestions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index e855f53..f0fade9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -47,7 +47,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 
 import static java.util.Collections.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.cache.GridCacheFlag.*;
 import static org.gridgain.grid.cache.GridCachePeekMode.*;
 import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
index fc58035..76f772b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.GridDhtPreloader.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
index 2a44ba3..b3f1fea 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
@@ -46,7 +46,7 @@ import javax.management.*;
 import java.util.*;
 
 import static org.gridgain.grid.GridDeploymentMode.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheConfiguration.*;
 import static org.gridgain.grid.cache.GridCacheDistributionMode.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index e5a6e07..967a666 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
 import static org.gridgain.grid.cache.GridCacheTxState.*;
 import static org.apache.ignite.events.IgniteEventType.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
index e7330d1..9ea2b4f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
@@ -30,7 +30,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;