Ignite-67 IgniteSystemProperties static fields names changed to IGNITE*
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db4b1d2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db4b1d2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db4b1d2b Branch: refs/heads/ignite-67 Commit: db4b1d2b6b3247083ead64dc1f98d1f029475551 Parents: d336959 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 12:45:45 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 12:45:46 2015 +0300 ---------------------------------------------------------------------- .../testsuites/IgniteExamplesSelfTestSuite.java | 2 +- .../ScalarExamplesSelfTestSuite.scala | 2 +- .../testsuites/IgniteAopSelfTestSuite.java | 2 +- .../client/ClientDefaultCacheSelfTest.java | 4 +- .../client/ClientTopologyCacheSelfTest.java | 2 +- .../integration/ClientAbstractSelfTest.java | 4 +- .../client/router/ClientFailedInitSelfTest.java | 4 +- .../client/router/RouterFactorySelfTest.java | 4 +- .../JettyRestProcessorAbstractSelfTest.java | 4 +- .../rest/TaskCommandHandlerSelfTest.java | 4 +- .../apache/ignite/IgniteBasicWarmupClosure.java | 6 +- .../apache/ignite/IgniteSystemProperties.java | 126 +++++++++---------- .../ClientConnectionConfiguration.java | 10 +- .../configuration/IgniteConfiguration.java | 54 ++++---- .../org/apache/ignite/internal/GridGainEx.java | 32 ++--- .../org/apache/ignite/internal/GridKernal.java | 12 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../apache/ignite/internal/GridLoggerProxy.java | 4 +- .../internal/GridPerformanceSuggestions.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 4 +- .../processors/cache/GridCacheUtils.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../cache/transactions/IgniteTxManager.java | 10 +- .../processors/fs/IgniteFsProcessor.java | 8 +- .../processors/job/GridJobProcessor.java | 2 +- .../jobmetrics/GridJobMetricsProcessor.java | 2 +- .../handlers/task/GridTaskCommandHandler.java | 2 +- .../streamer/GridStreamProcessor.java | 6 +- .../internal/util/GridConcurrentFactory.java | 3 +- .../internal/util/GridReflectionCache.java | 3 +- .../apache/ignite/internal/util/GridUtils.java | 22 ++-- .../util/future/GridFinishedFuture.java | 2 +- .../internal/util/future/GridFutureAdapter.java | 4 +- .../internal/util/io/GridUnsafeDataInput.java | 2 +- .../internal/util/io/GridUnsafeDataOutput.java | 2 +- .../ipc/shmem/GridIpcSharedMemorySpace.java | 2 +- .../util/offheap/unsafe/GridUnsafeMemory.java | 2 +- .../apache/ignite/internal/util/typedef/X.java | 2 +- .../visor/node/VisorBasicConfiguration.java | 20 +-- .../visor/node/VisorEmailConfiguration.java | 14 +-- .../visor/node/VisorLifecycleConfiguration.java | 2 +- .../visor/node/VisorRestConfiguration.java | 4 +- .../org/apache/ignite/lang/IgniteFuture.java | 8 +- .../ignite/logger/java/IgniteJavaLogger.java | 4 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 8 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 2 +- .../ignite/startup/BasicWarmupClosure.java | 6 +- .../startup/cmdline/CommandLineStartup.java | 8 +- .../internal/GridFactoryVmShutdownTest.java | 2 +- .../ignite/internal/GridHomePathSelfTest.java | 2 +- .../ignite/internal/GridStartStopSelfTest.java | 2 +- .../ignite/internal/GridVersionSelfTest.java | 8 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheMissingCommitVersionSelfTest.java | 6 +- .../cache/GridCacheSlowTxWarnTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 6 +- .../GridCacheNodeFailureAbstractTest.java | 2 +- .../GridCachePartitionedTxSalvageSelfTest.java | 6 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 2 +- ...GridUnsafeDataOutputArraySizingSelfTest.java | 2 +- .../loadtest/GridSingleExecutionTest.java | 2 +- .../cache/GridCacheDataStructuresLoadTest.java | 2 +- .../loadtests/cache/GridCacheLoadTest.java | 2 +- .../startup/GridRandomCommandLineLoader.java | 2 +- .../ignite/startup/GridVmNodesStarter.java | 2 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../junits/logger/GridTestLog4jLogger.java | 6 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../ignite/logger/log4j/IgniteLog4jLogger.java | 6 +- .../http/jetty/GridJettyRestProtocol.java | 14 +-- .../processors/schedule/ScheduleFutureImpl.java | 4 +- .../ignite/internal/GridFactorySelfTest.java | 2 +- .../util/nodestart/GridNodeCallableImpl.java | 4 +- .../scala/org/apache/ignite/visor/visor.scala | 8 +- .../testsuites/VisorConsoleSelfTestSuite.scala | 2 +- 84 files changed, 283 insertions(+), 285 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java index 86fc506..7d3bb12 100644 --- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java +++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java @@ -34,7 +34,7 @@ public class IgniteExamplesSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - System.setProperty(GG_OVERRIDE_MCAST_GRP, + System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(IgniteExamplesSelfTestSuite.class)); TestSuite suite = new TestSuite("Ignite Examples Test Suite"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala ---------------------------------------------------------------------- diff --git a/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala b/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala index ead0554..150f196 100644 --- a/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala +++ b/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala @@ -33,6 +33,6 @@ class ScalarExamplesSelfTestSuite extends Suites( new ScalarExamplesSelfTest, new ScalarExamplesMultiNodeSelfTest ) { - System.setProperty(GG_OVERRIDE_MCAST_GRP, + System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(classOf[ScalarExamplesSelfTest])) } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java index ac37190..d6c1210 100644 --- a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java +++ b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java @@ -45,7 +45,7 @@ public class IgniteAopSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(ExternalNonSpringAopSelfTest.class)); // Examples - System.setProperty(GG_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(IgniteAopSelfTestSuite.class)); + System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(IgniteAopSelfTestSuite.class)); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java index 0e9b1d2..0161c16 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java @@ -54,7 +54,7 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - System.setProperty(GG_JETTY_PORT, String.valueOf(HTTP_PORT)); + System.setProperty(IGNITE_JETTY_PORT, String.valueOf(HTTP_PORT)); startGrid(); } @@ -63,7 +63,7 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { @Override protected void afterTestsStopped() throws Exception { stopGrid(); - System.clearProperty (GG_JETTY_PORT); + System.clearProperty (IGNITE_JETTY_PORT); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java index fe2b290..df61aec 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java @@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; public class ClientTopologyCacheSelfTest extends GridCommonAbstractTest { static { // Override default port. - System.setProperty(GG_JETTY_PORT, Integer.toString(8081)); + System.setProperty(IGNITE_JETTY_PORT, Integer.toString(8081)); } /** Host. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index 1a19139..2d45c68 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -101,11 +101,11 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - System.setProperty(GG_JETTY_PORT, Integer.toString(JETTY_PORT)); + System.setProperty(IGNITE_JETTY_PORT, Integer.toString(JETTY_PORT)); startGrid(); - System.clearProperty(GG_JETTY_PORT); + System.clearProperty(IGNITE_JETTY_PORT); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java index aef124b..d33bc29 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java @@ -207,13 +207,13 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @Override protected Ignite startGrid() throws Exception { - System.setProperty(GG_JETTY_PORT, Integer.toString(JETTY_PORT)); + System.setProperty(IGNITE_JETTY_PORT, Integer.toString(JETTY_PORT)); try { return super.startGrid(); } finally { - System.clearProperty(GG_JETTY_PORT); + System.clearProperty(IGNITE_JETTY_PORT); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java index b9e88c6..9660a38 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java @@ -58,13 +58,13 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest { */ public void testRouterFactory() throws Exception { try { - System.setProperty(GG_JETTY_PORT, String.valueOf(GRID_HTTP_PORT)); + System.setProperty(IGNITE_JETTY_PORT, String.valueOf(GRID_HTTP_PORT)); try { startGrid(); } finally { - System.clearProperty(GG_JETTY_PORT); + System.clearProperty(IGNITE_JETTY_PORT); } final int size = 20; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index 2163563..a29b0db 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -36,7 +36,7 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - System.setProperty(GG_JETTY_PORT, Integer.toString(restPort())); + System.setProperty(IGNITE_JETTY_PORT, Integer.toString(restPort())); super.beforeTestsStarted(); } @@ -45,7 +45,7 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS @Override protected void afterTestsStopped() throws Exception { super.afterTestsStopped(); - System.clearProperty(GG_JETTY_PORT); + System.clearProperty(IGNITE_JETTY_PORT); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index 1f15f1d..c52dedc 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -64,7 +64,7 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - System.setProperty(IgniteSystemProperties.GG_REST_MAX_TASK_RESULTS, String.valueOf(MAX_TASK_RESULTS)); + System.setProperty(IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS, String.valueOf(MAX_TASK_RESULTS)); startGrid(0); } @@ -73,7 +73,7 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest { @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); - System.clearProperty(IgniteSystemProperties.GG_REST_MAX_TASK_RESULTS); + System.clearProperty(IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java index 679be27..a4278ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java @@ -190,10 +190,10 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura 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); @@ -229,7 +229,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura 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/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 index 90d069e..6dead97 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -30,26 +30,26 @@ 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 = "IGNITE_LOG_GRID_NAME"; + public static final String IGNITE_LOG_GRID_NAME = "IGNITE_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 = "IGNITE_RESTART_CODE"; + public static final String IGNITE_RESTART_CODE = "IGNITE_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 = "IGNITE_DAEMON"; + public static final String IGNITE_DAEMON = "IGNITE_DAEMON"; /** Defines GridGain installation folder. */ - public static final String GG_HOME = "IGNITE_HOME"; + public static final String IGNITE_HOME = "IGNITE_HOME"; /** If this system property is set to {@code false} - no shutdown hook will be set. */ - public static final String GG_NO_SHUTDOWN_HOOK = "IGNITE_NO_SHUTDOWN_HOOK"; + public static final String IGNITE_NO_SHUTDOWN_HOOK = "IGNITE_NO_SHUTDOWN_HOOK"; /** * Name of the system property to disable requirement for proper node ordering @@ -59,7 +59,7 @@ public final class IgniteSystemProperties { * {@link org.apache.ignite.spi.discovery.DiscoverySpiOrderSupport @GridDiscoverySpiOrderSupport(true)} will * be allowed. */ - public static final String GG_NO_DISCO_ORDER = "IGNITE_NO_DISCO_ORDER"; + public static final String IGNITE_NO_DISCO_ORDER = "IGNITE_NO_DISCO_ORDER"; /** * If this system property is set to {@code false} - no checks for new versions will @@ -67,47 +67,47 @@ public final class IgniteSystemProperties { * 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 = "IGNITE_UPDATE_NOTIFIER"; + public static final String IGNITE_UPDATE_NOTIFIER = "IGNITE_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 = "IGNITE_STARVATION_CHECK_INTERVAL"; + public static final String IGNITE_STARVATION_CHECK_INTERVAL = "IGNITE_STARVATION_CHECK_INTERVAL"; /** * If this system property is present (any value) - no ASCII logo will * be printed. */ - public static final String GG_NO_ASCII = "IGNITE_NO_ASCII"; + public static final String IGNITE_NO_ASCII = "IGNITE_NO_ASCII"; /** * This property allows to override Jetty host for REST processor. */ - public static final String GG_JETTY_HOST = "IGNITE_JETTY_HOST"; + public static final String IGNITE_JETTY_HOST = "IGNITE_JETTY_HOST"; /** * This property allows to override Jetty local port for REST processor. */ - public static final String GG_JETTY_PORT = "IGNITE_JETTY_PORT"; + public static final String IGNITE_JETTY_PORT = "IGNITE_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 = "IGNITE_JETTY_LOG_NO_OVERRIDE"; + public static final String IGNITE_JETTY_LOG_NO_OVERRIDE = "IGNITE_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 = "IGNITE_REST_MAX_TASK_RESULTS"; + public static final String IGNITE_REST_MAX_TASK_RESULTS = "IGNITE_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 = "IGNITE_NEAR_GET_MAX_REMAPS"; + public static final String IGNITE_NEAR_GET_MAX_REMAPS = "IGNITE_NEAR_GET_MAX_REMAPS"; /** * Set to either {@code true} or {@code false} to enable or disable quiet mode @@ -117,27 +117,27 @@ public final class IgniteSystemProperties { * 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 = "IGNITE_QUIET"; + public static final String IGNITE_QUIET = "IGNITE_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 verbose mode (see {@link #IGNITE_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 = "IGNITE_CONSOLE_APPENDER"; + public static final String IGNITE_CONSOLE_APPENDER = "IGNITE_CONSOLE_APPENDER"; /** * Name of the system property defining name of command line program. */ - public static final String GG_PROG_NAME = "IGNITE_PROG_NAME"; + public static final String IGNITE_PROG_NAME = "IGNITE_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 = "IGNITE_SUCCESS_FILE"; + public static final String IGNITE_SUCCESS_FILE = "IGNITE_SUCCESS_FILE"; /** * Name of the system property or environment variable to set or override @@ -150,7 +150,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpHost() */ - public static final String GG_SMTP_HOST = "IGNITE_SMTP_HOST"; + public static final String IGNITE_SMTP_HOST = "IGNITE_SMTP_HOST"; /** * Name of the system property or environment variable to set or override @@ -164,7 +164,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPort() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_PORT */ - public static final String GG_SMTP_PORT = "IGNITE_SMTP_PORT"; + public static final String IGNITE_SMTP_PORT = "IGNITE_SMTP_PORT"; /** * Name of the system property or environment variable to set or override @@ -177,7 +177,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpUsername() */ - public static final String GG_SMTP_USERNAME = "IGNITE_SMTP_USERNAME"; + public static final String IGNITE_SMTP_USERNAME = "IGNITE_SMTP_USERNAME"; /** * Name of the system property or environment variable to set or override @@ -190,7 +190,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPassword() */ - public static final String GG_SMTP_PWD = "IGNITE_SMTP_PASSWORD"; + public static final String IGNITE_SMTP_PWD = "IGNITE_SMTP_PASSWORD"; /** * Name of the system property or environment variable to set or override @@ -204,7 +204,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpFromEmail() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_FROM_EMAIL */ - public static final String GG_SMTP_FROM = "IGNITE_SMTP_FROM"; + public static final String IGNITE_SMTP_FROM = "IGNITE_SMTP_FROM"; /** * Name of the system property or environment variable to set or override @@ -218,7 +218,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getAdminEmails() */ - public static final String GG_ADMIN_EMAILS = "IGNITE_ADMIN_EMAILS"; + public static final String IGNITE_ADMIN_EMAILS = "IGNITE_ADMIN_EMAILS"; /** * Name of the system property or environment variable to set or override @@ -233,7 +233,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpSsl() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_SSL */ - public static final String GG_SMTP_SSL = "IGNITE_SMTP_SSL"; + public static final String IGNITE_SMTP_SSL = "IGNITE_SMTP_SSL"; /** * Name of the system property or environment variable to set or override @@ -242,7 +242,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#isLifeCycleEmailNotification() */ - public static final String GG_LIFECYCLE_EMAIL_NOTIFY = "IGNITE_LIFECYCLE_EMAIL_NOTIFY"; + public static final String IGNITE_LIFECYCLE_EMAIL_NOTIFY = "IGNITE_LIFECYCLE_EMAIL_NOTIFY"; /** * Name of the system property or environment variable to set or override @@ -257,7 +257,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpStartTls() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_STARTTLS */ - public static final String GG_SMTP_STARTTLS = "IGNITE_SMTP_STARTTLS"; + public static final String IGNITE_SMTP_STARTTLS = "IGNITE_SMTP_STARTTLS"; /** * Name of system property to set system-wide local IP address or host. If provided it will @@ -267,7 +267,7 @@ public final class IgniteSystemProperties { * method. However, system properties have priority over configuration properties specified in * {@link org.apache.ignite.configuration.IgniteConfiguration}. */ - public static final String GG_LOCAL_HOST = "IGNITE_LOCAL_HOST"; + public static final String IGNITE_LOCAL_HOST = "IGNITE_LOCAL_HOST"; /** * Name of the system property or environment variable to activate synchronous @@ -277,7 +277,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.lang.IgniteFuture#syncNotify() */ - public static final String GG_FUT_SYNC_NOTIFICATION = "IGNITE_FUTURE_SYNC_NOTIFICATION"; + public static final String IGNITE_FUT_SYNC_NOTIFICATION = "IGNITE_FUTURE_SYNC_NOTIFICATION"; /** * Name of the system property or environment variable to activate concurrent @@ -287,7 +287,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.lang.IgniteFuture#concurrentNotify() */ - public static final String GG_FUT_CONCURRENT_NOTIFICATION = "IGNITE_FUTURE_CONCURRENT_NOTIFICATION"; + public static final String IGNITE_FUT_CONCURRENT_NOTIFICATION = "IGNITE_FUTURE_CONCURRENT_NOTIFICATION"; /** * System property to override deployment mode configuration parameter. @@ -296,165 +296,165 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteDeploymentMode * @see org.apache.ignite.configuration.IgniteConfiguration#getDeploymentMode() */ - public static final String GG_DEP_MODE_OVERRIDE = "IGNITE_DEPLOYMENT_MODE_OVERRIDE"; + public static final String IGNITE_DEP_MODE_OVERRIDE = "IGNITE_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 = "IGNITE_MAX_COMPLETED_TX_COUNT"; + public static final String IGNITE_MAX_COMPLETED_TX_COUNT = "IGNITE_MAX_COMPLETED_TX_COUNT"; /** * Concurrency level for all concurrent hash maps created by GridGain. */ - public static final String GG_MAP_CONCURRENCY_LEVEL = "IGNITE_MAP_CONCURRENCY_LEVEL"; + public static final String IGNITE_MAP_CONCURRENCY_LEVEL = "IGNITE_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 = "IGNITE_SLOW_TX_WARN_TIMEOUT"; + public static final String IGNITE_SLOW_TX_WARN_TIMEOUT = "IGNITE_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 = "IGNITE_TX_SALVAGE_TIMEOUT"; + public static final String IGNITE_TX_SALVAGE_TIMEOUT = "IGNITE_TX_SALVAGE_TIMEOUT"; /** * System property to override multicast group taken from configuration. * Used for testing purposes. */ - public static final String GG_OVERRIDE_MCAST_GRP = "IGNITE_OVERRIDE_MCAST_GRP"; + public static final String IGNITE_OVERRIDE_MCAST_GRP = "IGNITE_OVERRIDE_MCAST_GRP"; /** * System property to override default reflection cache size. Default value is {@code 128}. */ - public static final String GG_REFLECTION_CACHE_SIZE = "IGNITE_REFLECTION_CACHE_SIZE"; + public static final String IGNITE_REFLECTION_CACHE_SIZE = "IGNITE_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 = "IGNITE_JOBS_HISTORY_SIZE"; + public static final String IGNITE_JOBS_HISTORY_SIZE = "IGNITE_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 = "IGNITE_JOBS_METRICS_CONCURRENCY_LEVEL"; + public static final String IGNITE_JOBS_METRICS_CONCURRENCY_LEVEL = "IGNITE_JOBS_METRICS_CONCURRENCY_LEVEL"; /** * System property to hold optional configuration URL. */ - public static final String GG_CONFIG_URL = "IGNITE_CONFIG_URL"; + public static final String IGNITE_CONFIG_URL = "IGNITE_CONFIG_URL"; /** System property to hold SSH host for visor-started nodes. */ - public static final String GG_SSH_HOST = "IGNITE_SSH_HOST"; + public static final String IGNITE_SSH_HOST = "IGNITE_SSH_HOST"; /** System property to hold SSH user name for visor-started nodes. */ - public static final String GG_SSH_USER_NAME = "IGNITE_SSH_USER_NAME"; + public static final String IGNITE_SSH_USER_NAME = "IGNITE_SSH_USER_NAME"; /** System property to hold preload resend timeout for evicted partitions. */ - public static final String GG_PRELOAD_RESEND_TIMEOUT = "IGNITE_PRELOAD_RESEND_TIMEOUT"; + public static final String IGNITE_PRELOAD_RESEND_TIMEOUT = "IGNITE_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 = "IGNITE_MARSHAL_BUFFERS_RECHECK"; + public static final String IGNITE_MARSHAL_BUFFERS_RECHECK = "IGNITE_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 = "IGNITE_DISABLE_HOSTNAME_VERIFIER"; + public static final String IGNITE_DISABLE_HOSTNAME_VERIFIER = "IGNITE_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 = "IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT"; + public static final String IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT = "IGNITE_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 = "IGNITE_COMMUNICATION_BUF_RESIZE_RATIO"; + public static final String IGNITE_COMMUNICATION_BUF_RESIZE_RATIO = "IGNITE_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 = "IGNITE_OFFHEAP_SAFE_RELEASE"; + public static final String IGNITE_OFFHEAP_SAFE_RELEASE = "IGNITE_OFFHEAP_SAFE_RELEASE"; /** Maximum size for atomic cache queue delete history. */ - public static final String GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE = "IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE"; + public static final String IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE = "IGNITE_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 org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder}. */ - public static final String GG_TCP_DISCOVERY_ADDRESSES = "IGNITE_TCP_DISCOVERY_ADDRESSES"; + public static final String IGNITE_TCP_DISCOVERY_ADDRESSES = "IGNITE_TCP_DISCOVERY_ADDRESSES"; /** * Flag indicating whether performance suggestions output on start should be disabled. */ - public static final String GG_PERFORMANCE_SUGGESTIONS_DISABLED = "IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED"; + public static final String IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED = "IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED"; /** * Specifies log level for Visor client logging. */ - public static final String GG_VISOR_CLIENT_LOG_LEVEL = "IGNITE_VISOR_CLIENT_LOG_LEVEL"; + public static final String IGNITE_VISOR_CLIENT_LOG_LEVEL = "IGNITE_VISOR_CLIENT_LOG_LEVEL"; /** * Atomic cache deferred update response buffer size. */ - public static final String GG_ATOMIC_DEFERRED_ACK_BUFFER_SIZE = "IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE"; + public static final String IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE = "IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE"; /** * Atomic cache deferred update timeout. */ - public static final String GG_ATOMIC_DEFERRED_ACK_TIMEOUT = "IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT"; + public static final String IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT = "IGNITE_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 = "IGNITE_H2_DEBUG_CONSOLE"; + public static final String IGNITE_H2_DEBUG_CONSOLE = "IGNITE_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 = "IGNITE_IPC_SHMEM_SPACE_DEBUG"; + public static final String IGNITE_IPC_SHMEM_SPACE_DEBUG = "IGNITE_IPC_SHMEM_SPACE_DEBUG"; /** * Portable object array initial capacity. */ - public static final String GG_PORTABLE_ARRAY_INITIAL_CAPACITY = "IGNITE_PORTABLE_ARRAY_INITIAL_CAPACITY"; + public static final String IGNITE_PORTABLE_ARRAY_INITIAL_CAPACITY = "IGNITE_PORTABLE_ARRAY_INITIAL_CAPACITY"; /** * Property allowing to skip configuration consistency checks. */ - public static final String GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK = + public static final String IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK = "IGNITE_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 = "IGNITE_CACHE_KEY_VALIDATION_DISABLED"; + public static final String IGNITE_CACHE_KEY_VALIDATION_DISABLED = "IGNITE_CACHE_KEY_VALIDATION_DISABLED"; /** * Environment variable to override logging directory that has been set in logger configuration. */ - public static final String GG_LOG_DIR = "IGNITE_LOG_DIR"; + public static final String IGNITE_LOG_DIR = "IGNITE_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 = "IGNITE_WORK_DIR"; + public static final String IGNITE_WORK_DIR = "IGNITE_WORK_DIR"; /** * If this property is set to {@code true} then GridGain will append @@ -466,7 +466,7 @@ public final class IgniteSystemProperties { * <p> * Default is {@code false}. */ - public static final String GG_MBEAN_APPEND_JVM_ID = "IGNITE_MBEAN_APPEND_JVM_ID"; + public static final String IGNITE_MBEAN_APPEND_JVM_ID = "IGNITE_MBEAN_APPEND_JVM_ID"; /** * Enforces singleton. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java index c11f769..d85b036 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java @@ -165,12 +165,12 @@ public class ClientConnectionConfiguration { * accessing GridGain APIs remotely. * <p> * If not provided, Jetty instance with default configuration will be started picking - * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT} + * {@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT} * as host and port respectively. * * @return Path to {@code JETTY} XML configuration file. - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT */ public String getRestJettyPath() { return jettyPath; @@ -189,8 +189,8 @@ public class ClientConnectionConfiguration { * Gets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled. * * @return Secret key. - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT */ @Nullable public String getRestSecretKey() { return restSecretKey; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/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 7b120c5..ec8bb19 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 @@ -693,7 +693,7 @@ public class IgniteConfiguration { * * @return Whether or not to use SSL fot SMTP. * @see #DFLT_SMTP_SSL - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_SSL + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_SSL */ public boolean isSmtpSsl() { return smtpSsl; @@ -712,7 +712,7 @@ public class IgniteConfiguration { * * @return Whether or not to use STARTTLS fot SMTP. * @see #DFLT_SMTP_STARTTLS - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_STARTTLS + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_STARTTLS */ public boolean isSmtpStartTls() { return smtpStartTls; @@ -730,7 +730,7 @@ public class IgniteConfiguration { * configuration property. * * @return SMTP host name or {@code null} if SMTP is not configured. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_HOST + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_HOST */ public String getSmtpHost() { return smtpHost; @@ -749,7 +749,7 @@ public class IgniteConfiguration { * * @return SMTP port. * @see #DFLT_SMTP_PORT - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PORT + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_PORT */ public int getSmtpPort() { return smtpPort; @@ -767,7 +767,7 @@ public class IgniteConfiguration { * configuration property. * * @return SMTP username or {@code null}. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_USERNAME + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_USERNAME */ public String getSmtpUsername() { return smtpUsername; @@ -785,7 +785,7 @@ public class IgniteConfiguration { * configuration property. * * @return SMTP password or {@code null}. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PWD + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_PWD */ public String getSmtpPassword() { return smtpPwd; @@ -802,7 +802,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.apache.ignite.IgniteSystemProperties#GG_ADMIN_EMAILS + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_ADMIN_EMAILS */ public String[] getAdminEmails() { return adminEmails; @@ -815,7 +815,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.apache.ignite.IgniteSystemProperties#GG_SMTP_FROM + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_FROM */ public String getSmtpFromEmail() { return smtpFromEmail; @@ -834,7 +834,7 @@ public class IgniteConfiguration { * Sets whether or not to enable lifecycle email notifications. * * @param lifeCycleEmailNtf {@code True} to enable lifecycle email notifications. - * @see org.apache.ignite.IgniteSystemProperties#GG_LIFECYCLE_EMAIL_NOTIFY + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_LIFECYCLE_EMAIL_NOTIFY */ public void setLifeCycleEmailNotification(boolean lifeCycleEmailNtf) { this.lifeCycleEmailNtf = lifeCycleEmailNtf; @@ -852,7 +852,7 @@ public class IgniteConfiguration { * configuration property. * * @param smtpSsl Whether or not SMTP uses SSL. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_SSL + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_SSL */ public void setSmtpSsl(boolean smtpSsl) { this.smtpSsl = smtpSsl; @@ -870,7 +870,7 @@ public class IgniteConfiguration { * configuration property. * * @param smtpStartTls Whether or not SMTP uses STARTTLS. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_STARTTLS + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_STARTTLS */ public void setSmtpStartTls(boolean smtpStartTls) { this.smtpStartTls = smtpStartTls; @@ -888,7 +888,7 @@ public class IgniteConfiguration { * configuration property. * * @param smtpHost SMTP host to set or {@code null} to disable sending emails. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_HOST + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_HOST */ public void setSmtpHost(String smtpHost) { this.smtpHost = smtpHost; @@ -907,7 +907,7 @@ public class IgniteConfiguration { * * @param smtpPort SMTP port to set. * @see #DFLT_SMTP_PORT - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PORT + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_PORT */ public void setSmtpPort(int smtpPort) { this.smtpPort = smtpPort; @@ -925,7 +925,7 @@ public class IgniteConfiguration { * configuration property. * * @param smtpUsername SMTP username or {@code null}. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_USERNAME + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_USERNAME */ public void setSmtpUsername(String smtpUsername) { this.smtpUsername = smtpUsername; @@ -943,7 +943,7 @@ public class IgniteConfiguration { * configuration property. * * @param smtpPwd SMTP password or {@code null}. - * @see org.apache.ignite.IgniteSystemProperties#GG_SMTP_PWD + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_PWD */ public void setSmtpPassword(String smtpPwd) { this.smtpPwd = smtpPwd; @@ -960,7 +960,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.apache.ignite.IgniteSystemProperties#GG_ADMIN_EMAILS + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_ADMIN_EMAILS */ public void setAdminEmails(String[] adminEmails) { this.adminEmails = adminEmails; @@ -973,7 +973,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.apache.ignite.IgniteSystemProperties#GG_SMTP_FROM + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_SMTP_FROM */ public void setSmtpFromEmail(String smtpFromEmail) { this.smtpFromEmail = smtpFromEmail; @@ -1354,7 +1354,7 @@ public class IgniteConfiguration { * * @return GridGain installation home or {@code null} to make the system attempt to * infer it automatically. - * @see org.apache.ignite.IgniteSystemProperties#GG_HOME + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME */ public String getGridGainHome() { return ggHome; @@ -1365,7 +1365,7 @@ public class IgniteConfiguration { * * @param ggHome {@code GridGain} installation folder. * @see IgniteConfiguration#getGridGainHome() - * @see org.apache.ignite.IgniteSystemProperties#GG_HOME + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME */ public void setGridGainHome(String ggHome) { this.ggHome = ggHome; @@ -1380,7 +1380,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.apache.ignite.IgniteSystemProperties#GG_HOME + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME */ public String getWorkDirectory() { return ggWork; @@ -2333,12 +2333,12 @@ public class IgniteConfiguration { * accessing GridGain APIs remotely. * <p> * If not provided, Jetty instance with default configuration will be started picking - * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT} + * {@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT} * as host and port respectively. * * @return Path to {@code JETTY} XML configuration file. - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT * @deprecated Use {@link ClientConnectionConfiguration#getRestJettyPath()}. */ @Deprecated @@ -2362,8 +2362,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.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT * @deprecated Use {@link ClientConnectionConfiguration}. */ @Deprecated @@ -2863,8 +2863,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.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST + * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT * @deprecated Use {@link ClientConnectionConfiguration#getRestSecretKey()}. */ @Deprecated http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java index 53d4d63..8c4a9b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java @@ -346,7 +346,7 @@ public class GridGainEx { * @see org.apache.ignite.Ignition#RESTART_EXIT_CODE */ public static void restart(boolean cancel) { - String file = System.getProperty(GG_SUCCESS_FILE); + String file = System.getProperty(IGNITE_SUCCESS_FILE); if (file == null) U.warn(null, "Cannot restart node when restart not enabled."); @@ -364,7 +364,7 @@ public class GridGainEx { // Set the exit code so that shell process can recognize it and loop // the start up sequence again. - System.setProperty(GG_RESTART_CODE, Integer.toString(Ignition.RESTART_EXIT_CODE)); + System.setProperty(IGNITE_RESTART_CODE, Integer.toString(Ignition.RESTART_EXIT_CODE)); stopAll(cancel); @@ -1369,7 +1369,7 @@ public class GridGainEx { // Set configuration URL, if any, into system property. if (startCtx.configUrl() != null) - System.setProperty(GG_CONFIG_URL, startCtx.configUrl().toString()); + System.setProperty(IGNITE_CONFIG_URL, startCtx.configUrl().toString()); myCfg.setGridName(cfg.getGridName()); @@ -1458,13 +1458,13 @@ public class GridGainEx { clientCfg = new ClientConnectionConfiguration(clientCfg); - String ntfStr = IgniteSystemProperties.getString(GG_LIFECYCLE_EMAIL_NOTIFY); + String ntfStr = IgniteSystemProperties.getString(IGNITE_LIFECYCLE_EMAIL_NOTIFY); if (ntfStr != null) myCfg.setLifeCycleEmailNotification(Boolean.parseBoolean(ntfStr)); // Local host. - String locHost = IgniteSystemProperties.getString(GG_LOCAL_HOST); + String locHost = IgniteSystemProperties.getString(IGNITE_LOCAL_HOST); myCfg.setLocalHost(F.isEmpty(locHost) ? cfg.getLocalHost() : locHost); @@ -1473,7 +1473,7 @@ public class GridGainEx { myCfg.setDaemon(true); // Check for deployment mode override. - String depModeName = IgniteSystemProperties.getString(GG_DEP_MODE_OVERRIDE); + String depModeName = IgniteSystemProperties.getString(IGNITE_DEP_MODE_OVERRIDE); if (!F.isEmpty(depModeName)) { if (!F.isEmpty(cfg.getCacheConfiguration())) { @@ -1490,7 +1490,7 @@ public class GridGainEx { catch (IllegalArgumentException e) { throw new IgniteCheckedException("Failed to override deployment mode using system property " + "(are there any misspellings?)" + - "[name=" + GG_DEP_MODE_OVERRIDE + ", value=" + depModeName + ']', e); + "[name=" + IGNITE_DEP_MODE_OVERRIDE + ", value=" + depModeName + ']', e); } } } @@ -1818,34 +1818,34 @@ public class GridGainEx { // Override SMTP configuration from system properties // and environment variables, if specified. - String fromEmail = IgniteSystemProperties.getString(GG_SMTP_FROM); + String fromEmail = IgniteSystemProperties.getString(IGNITE_SMTP_FROM); if (fromEmail != null) myCfg.setSmtpFromEmail(fromEmail); - String smtpHost = IgniteSystemProperties.getString(GG_SMTP_HOST); + String smtpHost = IgniteSystemProperties.getString(IGNITE_SMTP_HOST); if (smtpHost != null) myCfg.setSmtpHost(smtpHost); - String smtpUsername = IgniteSystemProperties.getString(GG_SMTP_USERNAME); + String smtpUsername = IgniteSystemProperties.getString(IGNITE_SMTP_USERNAME); if (smtpUsername != null) myCfg.setSmtpUsername(smtpUsername); - String smtpPwd = IgniteSystemProperties.getString(GG_SMTP_PWD); + String smtpPwd = IgniteSystemProperties.getString(IGNITE_SMTP_PWD); if (smtpPwd != null) myCfg.setSmtpPassword(smtpPwd); - int smtpPort = IgniteSystemProperties.getInteger(GG_SMTP_PORT, -1); + int smtpPort = IgniteSystemProperties.getInteger(IGNITE_SMTP_PORT, -1); if(smtpPort != -1) myCfg.setSmtpPort(smtpPort); - myCfg.setSmtpSsl(IgniteSystemProperties.getBoolean(GG_SMTP_SSL)); + myCfg.setSmtpSsl(IgniteSystemProperties.getBoolean(IGNITE_SMTP_SSL)); - String adminEmails = IgniteSystemProperties.getString(GG_ADMIN_EMAILS); + String adminEmails = IgniteSystemProperties.getString(IGNITE_ADMIN_EMAILS); if (adminEmails != null) myCfg.setAdminEmails(adminEmails.split(",")); @@ -1966,7 +1966,7 @@ public class GridGainEx { } // Do NOT set it up only if IGNITE_NO_SHUTDOWN_HOOK=TRUE is provided. - if (!IgniteSystemProperties.getBoolean(GG_NO_SHUTDOWN_HOOK, false)) { + if (!IgniteSystemProperties.getBoolean(IGNITE_NO_SHUTDOWN_HOOK, false)) { try { Runtime.getRuntime().addShutdownHook(shutdownHook = new Thread() { @Override public void run() { @@ -1989,7 +1989,7 @@ public class GridGainEx { else { if (log.isDebugEnabled()) log.debug("Shutdown hook has not been installed because environment " + - "or system property " + GG_NO_SHUTDOWN_HOOK + " is set."); + "or system property " + IGNITE_NO_SHUTDOWN_HOOK + " is set."); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java index 83fe9fa..cfec550 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java @@ -617,7 +617,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe // Run background network diagnostics. GridDiagnostic.runBackgroundCheck(gridName, cfg.getExecutorService(), log); - boolean notifyEnabled = IgniteSystemProperties.getBoolean(GG_UPDATE_NOTIFIER, true); + boolean notifyEnabled = IgniteSystemProperties.getBoolean(IGNITE_UPDATE_NOTIFIER, true); GridUpdateNotifier verChecker0 = null; @@ -869,7 +869,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe }, PERIODIC_VER_CHECK_DELAY, PERIODIC_VER_CHECK_DELAY); } - String intervalStr = IgniteSystemProperties.getString(GG_STARVATION_CHECK_INTERVAL); + String intervalStr = IgniteSystemProperties.getString(IGNITE_STARVATION_CHECK_INTERVAL); // Start starvation checker if enabled. boolean starveCheck = !isDaemon() && !"0".equals(intervalStr); @@ -1659,7 +1659,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe assert log != null; if (log.isInfoEnabled()) - log.info("Config URL: " + System.getProperty(GG_CONFIG_URL, "n/a")); + log.info("Config URL: " + System.getProperty(IGNITE_CONFIG_URL, "n/a")); } /** @@ -1693,7 +1693,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe String fileName = log.fileName(); - if (System.getProperty(GG_NO_ASCII) == null) { + if (System.getProperty(IGNITE_NO_ASCII) == null) { String ver = "ver. " + ACK_VER; // Big thanks to: http://patorjk.com/software/taag @@ -2204,7 +2204,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe private boolean isDaemon() { assert cfg != null; - return cfg.isDaemon() || "true".equalsIgnoreCase(System.getProperty(GG_DAEMON)); + return cfg.isDaemon() || "true".equalsIgnoreCase(System.getProperty(IGNITE_DAEMON)); } /** @@ -2229,7 +2229,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe * @see org.apache.ignite.Ignition#restart(boolean) */ @Override public boolean isRestartEnabled() { - return System.getProperty(GG_SUCCESS_FILE) != null; + return System.getProperty(IGNITE_SUCCESS_FILE) != null; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 8bb0085..ca92a9d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -773,7 +773,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** {@inheritDoc} */ @Override public boolean isDaemon() { - return config().isDaemon() || "true".equalsIgnoreCase(System.getProperty(GG_DAEMON)); + return config().isDaemon() || "true".equalsIgnoreCase(System.getProperty(IGNITE_DAEMON)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java index 042e3ec..459e840 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java @@ -58,7 +58,7 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz private Object ctgr; /** Whether or not to log grid name. */ - private static final boolean logGridName = System.getProperty(GG_LOG_GRID_NAME) != null; + private static final boolean logGridName = System.getProperty(IGNITE_LOG_GRID_NAME) != null; /** * No-arg constructor is required by externalization. @@ -162,7 +162,7 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz } /** - * Enriches the log message with grid name if {@link org.apache.ignite.IgniteSystemProperties#GG_LOG_GRID_NAME} + * Enriches the log message with grid name if {@link org.apache.ignite.IgniteSystemProperties#IGNITE_LOG_GRID_NAME} * system property is set. * * @param m Message to enrich. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java index ea9a40f..3bf9dfc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPerformanceSuggestions.java @@ -31,7 +31,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; */ public class GridPerformanceSuggestions { /** */ - private static final boolean disabled = Boolean.getBoolean(GG_PERFORMANCE_SUGGESTIONS_DISABLED); + private static final boolean disabled = Boolean.getBoolean(IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED); /** */ private final Collection<String> perfs = !disabled ? new LinkedHashSet<String>() : null; @@ -71,7 +71,7 @@ public class GridPerformanceSuggestions { if (!F.isEmpty(perfs) && !suppressed.containsAll(perfs)) { U.quietAndInfo(log, "Performance suggestions for grid " + (gridName == null ? "" : '\'' + gridName + '\'') + " (fix if possible)"); - U.quietAndInfo(log, "To disable, set -D" + GG_PERFORMANCE_SUGGESTIONS_DISABLED + "=true"); + U.quietAndInfo(log, "To disable, set -D" + IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED + "=true"); for (String s : perfs) if (!suppressed.contains(s)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 4e44e14..2c917af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -113,7 +113,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, }; /** */ - protected boolean keyCheck = !Boolean.getBoolean(GG_CACHE_KEY_VALIDATION_DISABLED); + protected boolean keyCheck = !Boolean.getBoolean(IGNITE_CACHE_KEY_VALIDATION_DISABLED); /** */ private boolean valCheck = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index c1ab90b..c5997b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -56,7 +56,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana private AtomicReference<ResendTimeoutObject> pendingResend = new AtomicReference<>(); /** Partition resend timeout after eviction. */ - private final long partResendTimeout = getLong(GG_PRELOAD_RESEND_TIMEOUT, DFLT_PRELOAD_RESEND_TIMEOUT); + private final long partResendTimeout = getLong(IGNITE_PRELOAD_RESEND_TIMEOUT, DFLT_PRELOAD_RESEND_TIMEOUT); /** Latch which completes after local exchange future is created. */ private GridFutureAdapter<?> locExchFut; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index a893ef3..64b9c24 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1269,7 +1269,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (locTxCfg.isTxSerializableEnabled() != txCfg.isTxSerializableEnabled()) throw new IgniteCheckedException("Serializable transactions enabled mismatch " + - "(fix txSerializableEnabled property or set -D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true " + + "(fix txSerializableEnabled property or set -D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true " + "system property) [rmtNodeId=" + rmt.id() + ", locTxSerializableEnabled=" + locTxCfg.isTxSerializableEnabled() + ", rmtTxSerializableEnabled=" + txCfg.isTxSerializableEnabled() + ']'); @@ -1330,7 +1330,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (ctx.config().isDaemon()) return; - if (!getBoolean(GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) { + if (!getBoolean(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) { for (ClusterNode n : ctx.discovery().remoteNodes()) checkCache(n); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 129dc54..657553c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1423,7 +1423,7 @@ public class GridCacheUtils { if (!F.eq(locVal, rmtVal)) { if (fail) { throw new IgniteCheckedException(attrMsg + " mismatch (fix " + attrMsg.toLowerCase() + " in cache " + - "configuration or set -D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true " + + "configuration or set -D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true " + "system property) [cacheName=" + cfgName + ", local" + capitalize(attrName) + "=" + locVal + ", remote" + capitalize(attrName) + "=" + rmtVal + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index 394c8ac..713d7f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -44,7 +44,7 @@ import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDh */ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalPartition> { /** Maximum size for delete queue. */ - private static final int MAX_DELETE_QUEUE_SIZE = Integer.getInteger(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, + private static final int MAX_DELETE_QUEUE_SIZE = Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, 200_000); /** Static logger to avoid re-creation. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index b16d913..902fb78 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -51,7 +51,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>(); /** Maximum number of attempts to remap key to the same primary node. */ - private static final int MAX_REMAP_CNT = IgniteSystemProperties.getInteger(GG_NEAR_GET_MAX_REMAPS, + private static final int MAX_REMAP_CNT = IgniteSystemProperties.getInteger(IGNITE_NEAR_GET_MAX_REMAPS, DFLT_MAX_REMAP_CNT); /** Context. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 683b7b9..d1baafa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -67,11 +67,11 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** Deferred update response buffer size. */ private static final int DEFERRED_UPDATE_RESPONSE_BUFFER_SIZE = - Integer.getInteger(GG_ATOMIC_DEFERRED_ACK_BUFFER_SIZE, 256); + Integer.getInteger(IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE, 256); /** Deferred update response timeout. */ private static final int DEFERRED_UPDATE_RESPONSE_TIMEOUT = - Integer.getInteger(GG_ATOMIC_DEFERRED_ACK_TIMEOUT, 500); + Integer.getInteger(IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT, 500); /** Unsafe instance. */ private static final Unsafe UNSAFE = GridUnsafe.unsafe(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index d25225f..65ffb15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -68,7 +68,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { public GridNearAtomicCache(GridCacheContext<K, V> ctx) { super(ctx); - int size = Integer.getInteger(GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, 1_000_000); + int size = Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, 1_000_000); rmvQueue = new GridCircularBuffer<>(U.ceilPow2(size / 10)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index f2e564b..f889c41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -55,7 +55,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>(); /** Maximum number of attempts to remap key to the same primary node. */ - private static final int MAX_REMAP_CNT = getInteger(GG_NEAR_GET_MAX_REMAPS, DFLT_MAX_REMAP_CNT); + private static final int MAX_REMAP_CNT = getInteger(IGNITE_NEAR_GET_MAX_REMAPS, DFLT_MAX_REMAP_CNT); /** Context. */ private GridCacheContext<K, V> cctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index b6db5b1..e48a1a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -56,10 +56,10 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { private static final int DFLT_MAX_COMPLETED_TX_CNT = 262144; // 2^18 /** Slow tx warn timeout (initialized to 0). */ - private static final int SLOW_TX_WARN_TIMEOUT = Integer.getInteger(GG_SLOW_TX_WARN_TIMEOUT, 0); + private static final int SLOW_TX_WARN_TIMEOUT = Integer.getInteger(IGNITE_SLOW_TX_WARN_TIMEOUT, 0); /** Tx salvage timeout (default 3s). */ - private static final int TX_SALVAGE_TIMEOUT = Integer.getInteger(GG_TX_SALVAGE_TIMEOUT, 100); + private static final int TX_SALVAGE_TIMEOUT = Integer.getInteger(IGNITE_TX_SALVAGE_TIMEOUT, 100); /** Committing transactions. */ private final ThreadLocal<IgniteTxEx> threadCtx = new GridThreadLocalEx<>(); @@ -88,11 +88,11 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { /** Committed local transactions. */ private final GridBoundedConcurrentOrderedSet<GridCacheVersion> committedVers = - new GridBoundedConcurrentOrderedSet<>(Integer.getInteger(GG_MAX_COMPLETED_TX_COUNT, DFLT_MAX_COMPLETED_TX_CNT)); + new GridBoundedConcurrentOrderedSet<>(Integer.getInteger(IGNITE_MAX_COMPLETED_TX_COUNT, DFLT_MAX_COMPLETED_TX_CNT)); /** Rolled back local transactions. */ private final NavigableSet<GridCacheVersion> rolledbackVers = - new GridBoundedConcurrentOrderedSet<>(Integer.getInteger(GG_MAX_COMPLETED_TX_COUNT, DFLT_MAX_COMPLETED_TX_CNT)); + new GridBoundedConcurrentOrderedSet<>(Integer.getInteger(IGNITE_MAX_COMPLETED_TX_COUNT, DFLT_MAX_COMPLETED_TX_CNT)); /** Pessimistic commit buffer. */ private GridCacheTxCommitBuffer<K, V> pessimisticRecoveryBuf; @@ -1177,7 +1177,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { uncommitTx(tx); throw new IgniteException("Missing commit version (consider increasing " + - GG_MAX_COMPLETED_TX_COUNT + " system property) [ver=" + tx.xidVersion() + ", firstVer=" + + IGNITE_MAX_COMPLETED_TX_COUNT + " system property) [ver=" + tx.xidVersion() + ", firstVer=" + committedVers.firstx() + ", lastVer=" + committedVers.lastx() + ", tx=" + tx.xid() + ']'); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java index cc21789..a3fbd0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java @@ -148,7 +148,7 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter { if (ctx.config().isDaemon()) return; - if (!getBoolean(GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) { + if (!getBoolean(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) { for (ClusterNode n : ctx.discovery().remoteNodes()) checkGgfsOnRemoteNode(n); } @@ -405,7 +405,7 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter { if (F.eq(rmtAttr.metaCacheName(), locAttr.metaCacheName())) throw new IgniteCheckedException("Meta cache names should be different for different GGFS instances " + "configuration (fix configuration or set " + - "-D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " + + "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " + "property) [metaCacheName=" + rmtAttr.metaCacheName() + ", locNodeId=" + ctx.localNodeId() + ", rmtNodeId=" + rmtNode.id() + @@ -415,7 +415,7 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter { if (F.eq(rmtAttr.dataCacheName(), locAttr.dataCacheName())) throw new IgniteCheckedException("Data cache names should be different for different GGFS instances " + "configuration (fix configuration or set " + - "-D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " + + "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " + "property)[dataCacheName=" + rmtAttr.dataCacheName() + ", locNodeId=" + ctx.localNodeId() + ", rmtNodeId=" + rmtNode.id() + @@ -454,7 +454,7 @@ public class IgniteFsProcessor extends IgniteFsProcessorAdapter { if (!F.eq(rmtVal, locVal)) throw new IgniteCheckedException(name + " should be the same on all nodes in grid for GGFS configuration " + "(fix configuration or set " + - "-D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " + + "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " + "property ) [rmtNodeId=" + rmtNodeId + ", rmt" + propName + "=" + rmtVal + ", loc" + propName + "=" + locVal + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index 93026e8..ec58518 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java @@ -54,7 +54,7 @@ import static org.jdk8.backport.ConcurrentLinkedHashMap.QueuePolicy.*; */ public class GridJobProcessor extends GridProcessorAdapter { /** */ - private static final int FINISHED_JOBS_COUNT = Integer.getInteger(GG_JOBS_HISTORY_SIZE, 10240); + private static final int FINISHED_JOBS_COUNT = Integer.getInteger(IGNITE_JOBS_HISTORY_SIZE, 10240); /** */ private final IgniteMarshaller marsh; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db4b1d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java index aaa8ef8..76568c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java @@ -34,7 +34,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; */ public class GridJobMetricsProcessor extends GridProcessorAdapter { /** */ - private static final int CONCURRENCY_LEVEL = Integer.getInteger(GG_JOBS_METRICS_CONCURRENCY_LEVEL, 64); + private static final int CONCURRENCY_LEVEL = Integer.getInteger(IGNITE_JOBS_METRICS_CONCURRENCY_LEVEL, 64); /** Time to live. */ private final long expireTime;
