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:43 UTC
[01/11] incubator-ignite git commit: # Renaming
Repository: incubator-ignite
Updated Branches:
refs/heads/master d128011cf -> 76094f009
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 09d04d2..1601127 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Grid performance suggestions.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 52eebc6..e855f53 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.GridSystemProperties.*;
+import static org.gridgain.grid.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/f84f598a/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 5dc2c3c..fc58035 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.GridSystemProperties.*;
+import static org.gridgain.grid.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/f84f598a/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 ee6edee..2a44ba3 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.GridSystemProperties.*;
+import static org.gridgain.grid.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/f84f598a/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 5666c95..e5a6e07 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.GridSystemProperties.*;
+import static org.gridgain.grid.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/f84f598a/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 8f4a19d..e7330d1 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.GridSystemProperties.*;
+import static org.gridgain.grid.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/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 75ada8f..5139c89 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.processors.cache.distributed.dht.GridDhtPartitionState.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 6544f3e..116d880 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -28,7 +28,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Colocated get future.
@@ -45,7 +45,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 = GridSystemProperties.getInteger(GG_NEAR_GET_MAX_REMAPS,
+ private static final int MAX_REMAP_CNT = IgniteSystemProperties.getInteger(GG_NEAR_GET_MAX_REMAPS,
DFLT_MAX_REMAP_CNT);
/** Context. */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 96d8308..1fc068d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -38,7 +38,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
import static org.gridgain.grid.cache.GridCachePeekMode.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
index 23f3cc7..ff72387 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheFlag.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
index bc4d077..51476dd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -29,7 +29,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
index 335b05c..a1b6d97 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.*;
import java.util.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.apache.ignite.fs.IgniteFsMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
index b031865..a6bcc4e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
@@ -37,7 +37,7 @@ import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.GridTopic.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
index c9bff1b..18d7b1a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
@@ -19,7 +19,7 @@ import org.jdk8.backport.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Processes job metrics.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
index b599a48..c153427 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.GridTopic.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
index efecb67..0c6f5be 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.*;
import javax.management.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.processors.license.GridLicenseSubsystem.*;
import static org.gridgain.grid.kernal.GridNodeAttributes.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java
index 76053eb..2c4dd4c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java
@@ -18,7 +18,7 @@ import java.io.*;
import java.util.*;
import static java.lang.System.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
index 9d7e52d..f6c99f0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
@@ -15,7 +15,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import static java.lang.System.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
index 743d136..272f31e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
index 88e7120..9e248f4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
import static java.lang.System.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
index b8fc789..026125f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
@@ -32,7 +32,7 @@ import java.nio.*;
import java.text.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.apache.ignite.events.IgniteEventType.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index feb41c4..0975395 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -42,7 +42,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.apache.ignite.events.IgniteEventType.*;
/**
@@ -399,7 +399,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
private int minBufferedMsgCnt = Integer.getInteger(GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT, 512);
/** Buffer size ratio. */
- private double bufSizeRatio = GridSystemProperties.getDouble(GG_COMMUNICATION_BUF_RESIZE_RATIO, 0.8);
+ private double bufSizeRatio = IgniteSystemProperties.getDouble(GG_COMMUNICATION_BUF_RESIZE_RATIO, 0.8);
/** Dual socket connection flag. */
private boolean dualSockConn = DFLT_DUAL_SOCKET_CONNECTION;
@@ -962,7 +962,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
* Sets the minimum number of messages for this SPI, that are buffered
* prior to sending.
* <p>
- * Defaults to either {@code 512} or {@link GridSystemProperties#GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT}
+ * Defaults to either {@code 512} or {@link org.gridgain.grid.IgniteSystemProperties#GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT}
* system property (if specified).
*
* @param minBufferedMsgCnt Minimum buffered message count.
@@ -981,7 +981,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
* Sets the buffer size ratio for this SPI. As messages are sent,
* the buffer size is adjusted using this ratio.
* <p>
- * Defaults to either {@code 0.8} or {@link GridSystemProperties#GG_COMMUNICATION_BUF_RESIZE_RATIO}
+ * Defaults to either {@code 0.8} or {@link org.gridgain.grid.IgniteSystemProperties#GG_COMMUNICATION_BUF_RESIZE_RATIO}
* system property (if specified).
*
* @param bufSizeRatio Buffer size ratio.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index 3f40cf9..19f9295 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -26,7 +26,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.spi.GridPortProtocol.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
index 4906f2c..8af6f7f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
@@ -21,7 +21,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* IP Finder which works only with pre-configured list of IP addresses specified
@@ -50,7 +50,7 @@ public class GridTcpDiscoveryVmIpFinder extends GridTcpDiscoveryIpFinderAdapter
* Initialize from system property.
*/
{
- String ips = GridSystemProperties.getString(GG_TCP_DISCOVERY_ADDRESSES);
+ String ips = IgniteSystemProperties.getString(GG_TCP_DISCOVERY_ADDRESSES);
if (!F.isEmpty(ips)) {
Collection<InetSocketAddress> addrsList = new LinkedHashSet<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java b/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
index 35f9209..2453708 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
@@ -14,14 +14,14 @@ import org.jdk8.backport.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Concurrent map factory.
*/
public class GridConcurrentFactory {
/** Default concurrency level. */
- private static final int CONCURRENCY_LEVEL = GridSystemProperties.getInteger(GG_MAP_CONCURRENCY_LEVEL, 256);
+ private static final int CONCURRENCY_LEVEL = IgniteSystemProperties.getInteger(GG_MAP_CONCURRENCY_LEVEL, 256);
/**
* Ensure singleton.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java b/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
index 9c86331..9cb6bad 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
@@ -18,7 +18,7 @@ import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Reflection field and method cache for classes.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index fc1a530..c5765df 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -65,7 +65,7 @@ import java.util.logging.*;
import java.util.regex.*;
import java.util.zip.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.GridNodeAttributes.*;
@@ -1484,7 +1484,7 @@ public abstract class GridUtils {
private static synchronized InetAddress resetLocalHost() throws IOException {
locHost = null;
- String sysLocHost = GridSystemProperties.getString(GG_LOCAL_HOST);
+ String sysLocHost = IgniteSystemProperties.getString(GG_LOCAL_HOST);
if (sysLocHost != null)
sysLocHost = sysLocHost.trim();
@@ -2223,7 +2223,7 @@ public abstract class GridUtils {
assert Thread.holdsLock(GridUtils.class);
// Resolve GridGain home via environment variables.
- String ggHome0 = GridSystemProperties.getString(GG_HOME);
+ String ggHome0 = IgniteSystemProperties.getString(GG_HOME);
if (!F.isEmpty(ggHome0))
return ggHome0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
index cc00b39..9bbd9f2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Future that is completed at creation time.
@@ -28,7 +28,7 @@ public class GridFinishedFuture<T> implements IgniteFuture<T>, Externalizable {
private static final long serialVersionUID = 0L;
/** Synchronous notification flag. */
- private static final boolean SYNC_NOTIFY = GridSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
+ private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
/** Complete value. */
private T t;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
index 03d07bb..826d465 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
@@ -23,7 +23,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Future adapter.
@@ -39,10 +39,10 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements
protected static IgniteLogger log;
/** Synchronous notification flag. */
- private static final boolean SYNC_NOTIFY = GridSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
+ private static final boolean SYNC_NOTIFY = IgniteSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
/** Concurrent notification flag. */
- private static final boolean CONCUR_NOTIFY = GridSystemProperties.getBoolean(GG_FUT_CONCURRENT_NOTIFICATION, false);
+ private static final boolean CONCUR_NOTIFY = IgniteSystemProperties.getBoolean(GG_FUT_CONCURRENT_NOTIFICATION, false);
/** Initial state. */
private static final int INIT = 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
index dee3026..be3719f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
@@ -16,7 +16,7 @@ import sun.misc.*;
import java.io.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Data input based on {@code Unsafe} operations.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
index 6344227..f39a21d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
@@ -15,7 +15,7 @@ import sun.misc.*;
import java.io.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Data output based on {@code Unsafe} operations.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
index 9180c1d..a786559 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
@@ -18,7 +18,7 @@ import java.nio.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java b/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
index 9334a15..8d40249 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
@@ -19,7 +19,7 @@ import sun.misc.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.util.offheap.GridOffHeapEvent.*;
/**
@@ -39,7 +39,7 @@ public class GridUnsafeMemory {
private static final int ADDR_SIZE = UNSAFE.addressSize();
/** Safe offheap release flag. */
- private static final boolean SAFE_RELEASE = GridSystemProperties.getBoolean(GG_OFFHEAP_SAFE_RELEASE);
+ private static final boolean SAFE_RELEASE = IgniteSystemProperties.getBoolean(GG_OFFHEAP_SAFE_RELEASE);
/** Total size. */
@GridToStringInclude
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java b/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
index 0db285c..c63e1f9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
@@ -51,7 +51,7 @@ public class GridJmxPortFinder {
return;
}
- int jmxPort = GridSystemProperties.getInteger(GG_JMX_PORT, -1);
+ int jmxPort = IgniteSystemProperties.getInteger(GG_JMX_PORT, -1);
if (jmxPort != -1) {
System.out.println(jmxPort);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java b/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
index dc620ec..f32de6d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
@@ -21,7 +21,7 @@ import java.lang.reflect.*;
import java.sql.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Defines global scope.
@@ -185,7 +185,7 @@ public final class X {
* @return Value of the system property or environment variable.
* Returns the default value if neither can be found for given name.
* @deprecated This method will be removed in the next major release.
- * Use {@link GridSystemProperties#getString(String)} instead.
+ * Use {@link org.gridgain.grid.IgniteSystemProperties#getString(String)} instead.
*/
@Deprecated
@Nullable public static String getSystemOrEnv(String name, String dflt) {
@@ -901,7 +901,7 @@ public final class X {
* @throws GridException If GridGain home folder was not set.
*/
public static String resolveGridGainHome() throws GridException {
- String var = GridSystemProperties.getString(GG_HOME);
+ String var = IgniteSystemProperties.getString(GG_HOME);
if (var != null)
return var;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
index f72498b..6c20d50 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
@@ -13,7 +13,7 @@ import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
index dea0508..0ee6a3a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
@@ -18,7 +18,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.concurrent.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
index 0a2c103..7a8ce0a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
@@ -14,7 +14,7 @@ import org.apache.ignite.product.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Tests version methods.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 5e20a54..9c5e2fc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Tests that removes are not lost when topology changes.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
index 2b9cda9..57a76be 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
@@ -20,7 +20,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
index 4f6c646..db8d0cf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
@@ -11,7 +11,6 @@ package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.spi.discovery.tcp.*;
@@ -23,7 +22,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Test to check slow TX warning timeout defined by
- * {@link GridSystemProperties#GG_SLOW_TX_WARN_TIMEOUT}
+ * {@link org.gridgain.grid.IgniteSystemProperties#GG_SLOW_TX_WARN_TIMEOUT}
* system property.
*/
public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index 57015e1..53188e5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -17,7 +17,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index 2f7af88..af5c406 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -25,7 +25,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.*;
import static org.apache.ignite.IgniteState.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
import static org.apache.ignite.events.IgniteEventType.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 347fdfa..380f61b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -25,7 +25,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
index c1dd2e0..1328035 100644
--- a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
@@ -49,7 +49,7 @@ public final class GridSingleExecutionTest {
*/
@SuppressWarnings({"CallToSystemExit"})
public static void main(String[] args) throws Exception {
- System.setProperty(GridSystemProperties.GG_UPDATE_NOTIFIER, "false");
+ System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
System.out.println("Starting master node [params=" + Arrays.toString(args) + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
index 2224e80..1990ef4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
@@ -23,7 +23,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.util.GridUtils.*;
/**
@@ -62,7 +62,7 @@ public class GridStartupWithSpecifiedWorkDirectorySelfTest extends TestCase {
private IgniteConfiguration getConfiguration(IgniteLogger log) {
// We can't use U.getGridGainHome() here because
// it will initialize cached value which is forbidden to override.
- String ggHome = GridSystemProperties.getString(GG_HOME);
+ String ggHome = IgniteSystemProperties.getString(GG_HOME);
assert ggHome != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
index 7163494..1955700 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
@@ -20,7 +20,7 @@ import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.util.GridUtils.*;
/**
@@ -54,7 +54,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase {
// We can't use U.getGridGainHome() here because
// it will initialize cached value which is forbidden to override.
- String ggHome = GridSystemProperties.getString(GG_HOME);
+ String ggHome = IgniteSystemProperties.getString(GG_HOME);
assert ggHome != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
index bd7b525..ccaafed 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
@@ -11,7 +11,7 @@ package org.gridgain.grid.util.io;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Test for {@link GridUnsafeDataOutput}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
index 4dcba49..abf1c53 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
@@ -48,7 +48,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testBasicOperations() throws Exception {
- File tokFile = new File(GridSystemProperties.getString("java.io.tmpdir"), UUID.randomUUID().toString());
+ File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), UUID.randomUUID().toString());
assert tokFile.createNewFile();
@@ -138,7 +138,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testForceClose() throws Exception {
- File tokFile = new File(GridSystemProperties.getString("java.io.tmpdir"), getTestGridName());
+ File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName());
assert tokFile.createNewFile() || tokFile.exists();
@@ -179,7 +179,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testReadAfterClose() throws Exception {
- File tokFile = new File(GridSystemProperties.getString("java.io.tmpdir"), getTestGridName());
+ File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName());
assert tokFile.createNewFile() || tokFile.exists();
@@ -217,7 +217,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testWriteAfterClose() throws Exception {
- File tokFile = new File(GridSystemProperties.getString("java.io.tmpdir"), getTestGridName());
+ File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName());
assert tokFile.createNewFile() || tokFile.exists();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
index 478a00c..0ae1f8b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
@@ -44,7 +44,7 @@ public class GridIpcSharedMemoryUtilsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testIdsGet() throws Exception {
- File tokFile = new File(GridSystemProperties.getString("java.io.tmpdir"), getTestGridName());
+ File tokFile = new File(IgniteSystemProperties.getString("java.io.tmpdir"), getTestGridName());
assert tokFile.createNewFile() || tokFile.exists();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
index 8b834a2..0c1d5c8 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java
@@ -295,7 +295,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
* @throws GridException In case of error.
*/
public static void main(String[] args) throws GridException {
- System.setProperty(GridSystemProperties.GG_UPDATE_NOTIFIER, "false");
+ System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
System.out.println("Starting master node [params=" + Arrays.toString(args) + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
index 0afdac8..737a0f1 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
@@ -128,7 +128,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
* @throws Exception If fails.
*/
public static void main(String[] args) throws Exception {
- System.setProperty(GridSystemProperties.GG_UPDATE_NOTIFIER, "false");
+ System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
System.out.println("Starting master node [params=" + Arrays.toString(args) + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
index 50b8a1c..cf9a8fb 100644
--- a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
+++ b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
@@ -148,7 +148,7 @@ public final class GridRandomCommandLineLoader {
*/
@SuppressWarnings({"BusyWait"})
public static void main(String[] args) {
- System.setProperty(GridSystemProperties.GG_UPDATE_NOTIFIER, "false");
+ System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
logo();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java b/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
index bfc7e86..4603d1d 100644
--- a/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
+++ b/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
@@ -26,7 +26,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* This class
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
index 9e1660b..6b6cd6f 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
@@ -87,7 +87,7 @@ public abstract class GridAbstractTest extends TestCase {
private static long ts = System.currentTimeMillis();
static {
- System.setProperty(GridSystemProperties.GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000");
+ System.setProperty(IgniteSystemProperties.GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000");
}
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
index 041b460..ef414f4 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
@@ -82,7 +82,7 @@ public class GridLog4jRollingFileAppender extends RollingFileAppender implements
fileName = U.nodeIdLogFileName(nodeId, baseFileName);
}
else {
- String tmpDir = GridSystemProperties.getString("java.io.tmpdir");
+ String tmpDir = IgniteSystemProperties.getString("java.io.tmpdir");
if (tmpDir != null) {
baseFileName = new File(tmpDir, "gridgain.log").getAbsolutePath();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
index f0c05dc..670709d 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
@@ -27,7 +27,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Log4j-based implementation for logging. This logger should be used
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/test/java/org/gridgain/testsuites/GridLoadersSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridLoadersSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridLoadersSelfTestSuite.java
index 080162c..5ace761 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/GridLoadersSelfTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/GridLoadersSelfTestSuite.java
@@ -10,7 +10,7 @@
package org.gridgain.testsuites;
import junit.framework.*;
-import org.gridgain.grid.startup.cmdline.*;
+import org.apache.ignite.startup.cmdline.*;
/**
* Loaders self-test suite.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
index 9826363..0611518 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
@@ -127,11 +127,11 @@ public class GridHadoopCommandLineTest extends GridCommonAbstractTest {
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
- hiveHome = GridSystemProperties.getString("HIVE_HOME");
+ hiveHome = IgniteSystemProperties.getString("HIVE_HOME");
assertFalse("HIVE_HOME hasn't been set.", F.isEmpty(hiveHome));
- hadoopHome = GridSystemProperties.getString("HADOOP_HOME");
+ hadoopHome = IgniteSystemProperties.getString("HADOOP_HOME");
assertFalse("HADOOP_HOME hasn't been set.", F.isEmpty(hadoopHome));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java b/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
index ef42b72..dc1d69b 100644
--- a/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
+++ b/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
@@ -120,7 +120,7 @@ public class GridHadoopTestSuite extends TestSuite {
* @throws Exception If failed.
*/
public static void downloadHive() throws Exception {
- String ver = GridSystemProperties.getString("hive.version", "0.13.1");
+ String ver = IgniteSystemProperties.getString("hive.version", "0.13.1");
X.println("Will use Hive version: " + ver);
@@ -133,7 +133,7 @@ public class GridHadoopTestSuite extends TestSuite {
* @throws Exception If failed.
*/
public static void downloadHadoop() throws Exception {
- String ver = GridSystemProperties.getString("hadoop.version", "2.4.1");
+ String ver = IgniteSystemProperties.getString("hadoop.version", "2.4.1");
X.println("Will use Hadoop version: " + ver);
@@ -153,7 +153,7 @@ public class GridHadoopTestSuite extends TestSuite {
*/
private static void download(String appName, String homeVariable, String downloadPath, String destName)
throws Exception {
- String homeVal = GridSystemProperties.getString(homeVariable);
+ String homeVal = IgniteSystemProperties.getString(homeVariable);
if (!F.isEmpty(homeVal) && new File(homeVal).isDirectory()) {
X.println(homeVariable + " is set to: " + homeVal);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
index 68e8cbe..f25b86f 100644
--- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
+++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
@@ -44,7 +44,7 @@ import java.text.*;
import java.util.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.spi.indexing.GridIndexType.*;
import static org.gridgain.grid.spi.indexing.h2.opt.GridH2AbstractKeyValueRow.*;
import static org.h2.result.SortOrder.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
index 87502ab..d7bc09b 100644
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
@@ -27,7 +27,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Log4j-based implementation for logging. This logger should be used
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
index 1b8afce..0ed9d0b 100644
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
@@ -44,7 +44,7 @@ class IgniteLog4jNodeIdFilePath implements IgniteClosure<String, String> {
if (oldPath != null) // fileName could be null if GRIDGAIN_HOME is not defined.
return U.nodeIdLogFileName(nodeId, oldPath);
- String tmpDir = GridSystemProperties.getString("java.io.tmpdir");
+ String tmpDir = IgniteSystemProperties.getString("java.io.tmpdir");
if (tmpDir != null)
return U.nodeIdLogFileName(nodeId, new File(tmpDir, "gridgain.log").getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
index d1a267e..6a2b801 100644
--- a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
+++ b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
@@ -28,7 +28,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.spi.GridPortProtocol.*;
/**
@@ -39,7 +39,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
*
*/
static {
- if (!GridSystemProperties.getBoolean(GG_JETTY_LOG_NO_OVERRIDE)) {
+ if (!IgniteSystemProperties.getBoolean(GG_JETTY_LOG_NO_OVERRIDE)) {
Properties p = new Properties();
p.setProperty("org.eclipse.jetty.LEVEL", "WARN");
@@ -164,7 +164,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
}
/**
- * Checks {@link GridSystemProperties#GG_JETTY_PORT} system property
+ * Checks {@link org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT} system property
* and overrides default connector port if it present.
* Then initializes {@code port} with the found value.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
index ab88b2c..06ce01b 100644
--- a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.*;
import java.util.regex.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Implementation of {@link org.apache.ignite.scheduler.SchedulerFuture} interface.
@@ -105,10 +105,10 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule
private int lastLsnrExecCnt;
/** Synchronous notification flag. */
- private volatile boolean syncNotify = GridSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
+ private volatile boolean syncNotify = IgniteSystemProperties.getBoolean(GG_FUT_SYNC_NOTIFICATION, true);
/** Concurrent notification flag. */
- private volatile boolean concurNotify = GridSystemProperties.getBoolean(GG_FUT_CONCURRENT_NOTIFICATION, false);
+ private volatile boolean concurNotify = IgniteSystemProperties.getBoolean(GG_FUT_CONCURRENT_NOTIFICATION, false);
/** Mutex. */
private final Object mux = new Object();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index 190b632..f19d117 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -44,7 +44,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.IgniteState.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Tests for {@link org.apache.ignite.Ignition}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
index 77257b1..7d0c4f1 100644
--- a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
+++ b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
@@ -21,7 +21,7 @@ import java.io.*;
import java.text.*;
import java.util.*;
-import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* SSH-based node starter.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
index 4e58ea5..89abf99 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
@@ -106,7 +106,7 @@ class VisorVvmCommand {
else {
val argLst = parseArgs(args)
- val vvmHome = argValue("home", argLst) getOrElse GridSystemProperties.getString("VVM_HOME")
+ val vvmHome = argValue("home", argLst) getOrElse IgniteSystemProperties.getString("VVM_HOME")
val id8 = argValue("id8", argLst).orNull
val id = argValue("id", argLst).orNull
@@ -144,7 +144,7 @@ class VisorVvmCommand {
}
if (vvmCmd == null || vvmCmd.isEmpty)
- vvmCmd = GridSystemProperties.getString("JAVA_HOME") + fs + "bin" + fs + "jvisualvm" + ext
+ vvmCmd = IgniteSystemProperties.getString("JAVA_HOME") + fs + "bin" + fs + "jvisualvm" + ext
if (!new File(vvmCmd).exists)
warn(
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
index c3b07ec..6080998 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
@@ -26,7 +26,7 @@ import java.text._
import java.util.concurrent._
import java.util.{HashSet => JHashSet, _}
-import org.gridgain.grid.GridSystemProperties._
+import org.gridgain.grid.IgniteSystemProperties._
import IgniteEventType._
import org.gridgain.grid.kernal.GridComponentType._
import org.gridgain.grid.kernal.GridNodeAttributes._
@@ -1505,7 +1505,7 @@ object visor extends VisorTag {
val cfg = cfgs.iterator().next()
// Setting up 'Config URL' for properly print in console.
- System.setProperty(GridSystemProperties.GG_CONFIG_URL, url.getPath)
+ System.setProperty(IgniteSystemProperties.GG_CONFIG_URL, url.getPath)
var cpuCnt = Runtime.getRuntime.availableProcessors
@@ -1576,7 +1576,7 @@ object visor extends VisorTag {
def open(cfg: IgniteConfiguration, cfgPath: String) {
val daemon = Ignition.isDaemon
- val shutdownHook = GridSystemProperties.getString(GG_NO_SHUTDOWN_HOOK, "false")
+ val shutdownHook = IgniteSystemProperties.getString(GG_NO_SHUTDOWN_HOOK, "false")
// Make sure Visor console starts as daemon node.
Ignition.setDaemon(true)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
index 34d5d6d..f7bed0b 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
@@ -13,7 +13,7 @@ package org.gridgain.visor.testsuites
import java.net.{InetAddress, UnknownHostException}
-import org.gridgain.grid.GridSystemProperties._
+import org.gridgain.grid.IgniteSystemProperties._
import org.gridgain.visor.commands.VisorArgListSpec
import org.gridgain.visor.commands.ack.VisorAckCommandSpec
import org.gridgain.visor.commands.alert.VisorAlertCommandSpec
[10/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/c59f1bb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c59f1bb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c59f1bb1
Branch: refs/heads/master
Commit: c59f1bb171d9719aac2c0592f7f77b7bcbe3809a
Parents: 503efc8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:24:32 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:24:32 2014 +0300
----------------------------------------------------------------------
.../ClientConnectionConfiguration.java | 8 ++---
.../configuration/IgniteConfiguration.java | 10 +++---
.../gridgain/grid/ClientMessageInterceptor.java | 37 ++++++++++++++++++++
.../grid/GridClientMessageInterceptor.java | 37 --------------------
.../processors/rest/GridRestProcessor.java | 10 +++---
.../grid/kernal/GridLifecycleAwareSelfTest.java | 2 +-
6 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/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 59c1ae4..30f53b0 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
@@ -102,7 +102,7 @@ public class ClientConnectionConfiguration {
private boolean restSvcShutdown = true;
/** Client message interceptor. */
- private GridClientMessageInterceptor clientMsgInterceptor;
+ private ClientMessageInterceptor clientMsgInterceptor;
/**
* Creates client connection configuration with all default values.
@@ -547,10 +547,10 @@ public class ClientConnectionConfiguration {
* <p>
* Default value is {@code null}.
*
- * @see GridClientMessageInterceptor
+ * @see org.gridgain.grid.ClientMessageInterceptor
* @return Interceptor.
*/
- @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
+ @Nullable public ClientMessageInterceptor getClientMessageInterceptor() {
return clientMsgInterceptor;
}
@@ -564,7 +564,7 @@ public class ClientConnectionConfiguration {
*
* @param interceptor Interceptor.
*/
- public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+ public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) {
clientMsgInterceptor = interceptor;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/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 7f5fab0..6b0c951 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
@@ -508,7 +508,7 @@ public class IgniteConfiguration {
private IgniteFsConfiguration[] ggfsCfg;
/** Client message interceptor. */
- private GridClientMessageInterceptor clientMsgInterceptor;
+ private ClientMessageInterceptor clientMsgInterceptor;
/** Streamer configuration. */
private GridStreamerConfiguration[] streamerCfg;
@@ -2953,12 +2953,12 @@ public class IgniteConfiguration {
* <p>
* Default value is {@code null}.
*
- * @see GridClientMessageInterceptor
+ * @see org.gridgain.grid.ClientMessageInterceptor
* @return Interceptor.
* @deprecated Use {@link ClientConnectionConfiguration#getClientMessageInterceptor()}.
*/
@Deprecated
- public GridClientMessageInterceptor getClientMessageInterceptor() {
+ public ClientMessageInterceptor getClientMessageInterceptor() {
return clientMsgInterceptor;
}
@@ -2971,10 +2971,10 @@ public class IgniteConfiguration {
* access them from java code directly.
*
* @param interceptor Interceptor.
- * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(GridClientMessageInterceptor)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(org.gridgain.grid.ClientMessageInterceptor)}.
*/
@Deprecated
- public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+ public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) {
clientMsgInterceptor = interceptor;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java b/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
new file mode 100644
index 0000000..9f86807
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
@@ -0,0 +1,37 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Interface for user-defined object interceptors.
+ * <p>
+ * Interceptors allow user to transform objects send and received via REST protocols.
+ * For example they could be used for customized multi-language marshalling by
+ * converting binary object representation received from client to java object.
+ */
+public interface ClientMessageInterceptor {
+ /**
+ * Intercepts received objects.
+ *
+ * @param obj Original incoming object.
+ * @return Object which should replace original in later processing.
+ */
+ @Nullable public Object onReceive(@Nullable Object obj);
+
+ /**
+ * Intercepts received objects.
+ *
+ * @param obj Original incoming object.
+ * @return Object which should be send to remote client instead of original.
+ */
+ @Nullable public Object onSend(Object obj);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java b/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java
deleted file mode 100644
index 065049d..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridClientMessageInterceptor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Interface for user-defined object interceptors.
- * <p>
- * Interceptors allow user to transform objects send and received via REST protocols.
- * For example they could be used for customized multi-language marshalling by
- * converting binary object representation received from client to java object.
- */
-public interface GridClientMessageInterceptor {
- /**
- * Intercepts received objects.
- *
- * @param obj Original incoming object.
- * @return Object which should replace original in later processing.
- */
- @Nullable public Object onReceive(@Nullable Object obj);
-
- /**
- * Intercepts received objects.
- *
- * @param obj Original incoming object.
- * @return Object which should be send to remote client instead of original.
- */
- @Nullable public Object onSend(Object obj);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
index d024d0a..7c9579a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
@@ -321,14 +321,14 @@ public class GridRestProcessor extends GridProcessorAdapter {
}
/**
- * Applies {@link GridClientMessageInterceptor}
+ * Applies {@link org.gridgain.grid.ClientMessageInterceptor}
* from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user parameters in the request.
*
* @param req Client request.
*/
private void interceptRequest(GridRestRequest req) {
- GridClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
+ ClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
if (interceptor == null)
return;
@@ -368,7 +368,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
}
/**
- * Applies {@link GridClientMessageInterceptor} from
+ * Applies {@link org.gridgain.grid.ClientMessageInterceptor} from
* {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user objects in the response.
*
@@ -376,7 +376,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
* @param req Request.
*/
private void interceptResponse(GridRestResponse res, GridRestRequest req) {
- GridClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
+ ClientMessageInterceptor interceptor = config().getClientMessageInterceptor();
if (interceptor != null && res.getResponse() != null) {
switch (req.command()) {
@@ -420,7 +420,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
* @param interceptor Interceptor to apply.
* @return Intercepted object.
*/
- private static Object interceptSendObject(Object obj, GridClientMessageInterceptor interceptor) {
+ private static Object interceptSendObject(Object obj, ClientMessageInterceptor interceptor) {
if (obj instanceof Map) {
Map<Object, Object> original = (Map<Object, Object>)obj;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c59f1bb1/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index f6d78f0..8bde51f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -28,7 +28,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
/**
*/
private static class TestClientMessageInterceptor extends TestLifecycleAware
- implements GridClientMessageInterceptor {
+ implements ClientMessageInterceptor {
/**
*/
TestClientMessageInterceptor() {
[11/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/76094f00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/76094f00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/76094f00
Branch: refs/heads/master
Commit: 76094f009213dc390bb1b32a2b45305c4ca6abde
Parents: c59f1bb
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:29:30 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:29:30 2014 +0300
----------------------------------------------------------------------
.../ClientConnectionConfiguration.java | 3 +-
.../configuration/ClientMessageInterceptor.java | 37 ++++++++++++++++++++
.../configuration/IgniteConfiguration.java | 4 +--
.../gridgain/grid/ClientMessageInterceptor.java | 37 --------------------
.../processors/rest/GridRestProcessor.java | 4 +--
5 files changed, 42 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/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 30f53b0..3a0d9c3 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
@@ -10,7 +10,6 @@
package org.apache.ignite.configuration;
import org.gridgain.client.ssl.*;
-import org.gridgain.grid.*;
import org.jetbrains.annotations.*;
import java.net.*;
@@ -547,7 +546,7 @@ public class ClientConnectionConfiguration {
* <p>
* Default value is {@code null}.
*
- * @see org.gridgain.grid.ClientMessageInterceptor
+ * @see ClientMessageInterceptor
* @return Interceptor.
*/
@Nullable public ClientMessageInterceptor getClientMessageInterceptor() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java
new file mode 100644
index 0000000..137d872
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientMessageInterceptor.java
@@ -0,0 +1,37 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Interface for user-defined object interceptors.
+ * <p>
+ * Interceptors allow user to transform objects send and received via REST protocols.
+ * For example they could be used for customized multi-language marshalling by
+ * converting binary object representation received from client to java object.
+ */
+public interface ClientMessageInterceptor {
+ /**
+ * Intercepts received objects.
+ *
+ * @param obj Original incoming object.
+ * @return Object which should replace original in later processing.
+ */
+ @Nullable public Object onReceive(@Nullable Object obj);
+
+ /**
+ * Intercepts received objects.
+ *
+ * @param obj Original incoming object.
+ * @return Object which should be send to remote client instead of original.
+ */
+ @Nullable public Object onSend(Object obj);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/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 6b0c951..81bfc48 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
@@ -2953,7 +2953,7 @@ public class IgniteConfiguration {
* <p>
* Default value is {@code null}.
*
- * @see org.gridgain.grid.ClientMessageInterceptor
+ * @see ClientMessageInterceptor
* @return Interceptor.
* @deprecated Use {@link ClientConnectionConfiguration#getClientMessageInterceptor()}.
*/
@@ -2971,7 +2971,7 @@ public class IgniteConfiguration {
* access them from java code directly.
*
* @param interceptor Interceptor.
- * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(org.gridgain.grid.ClientMessageInterceptor)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(ClientMessageInterceptor)}.
*/
@Deprecated
public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java b/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
deleted file mode 100644
index 9f86807..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/ClientMessageInterceptor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Interface for user-defined object interceptors.
- * <p>
- * Interceptors allow user to transform objects send and received via REST protocols.
- * For example they could be used for customized multi-language marshalling by
- * converting binary object representation received from client to java object.
- */
-public interface ClientMessageInterceptor {
- /**
- * Intercepts received objects.
- *
- * @param obj Original incoming object.
- * @return Object which should replace original in later processing.
- */
- @Nullable public Object onReceive(@Nullable Object obj);
-
- /**
- * Intercepts received objects.
- *
- * @param obj Original incoming object.
- * @return Object which should be send to remote client instead of original.
- */
- @Nullable public Object onSend(Object obj);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76094f00/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
index 7c9579a..764ca67 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
@@ -321,7 +321,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
}
/**
- * Applies {@link org.gridgain.grid.ClientMessageInterceptor}
+ * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor}
* from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user parameters in the request.
*
@@ -368,7 +368,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
}
/**
- * Applies {@link org.gridgain.grid.ClientMessageInterceptor} from
+ * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor} from
* {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user objects in the response.
*
[02/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/f84f598a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f84f598a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f84f598a
Branch: refs/heads/master
Commit: f84f598a9f0f80182c821ca442f715f1b5ae933a
Parents: d128011
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:15:57 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:15:59 2014 +0300
----------------------------------------------------------------------
.../testsuites/GridExamplesSelfTestSuite.java | 2 +-
.../ScalarExamplesSelfTestSuite.scala | 2 +-
.../testsuites/GridAopSelfTestSuite.java | 2 +-
.../configuration/IgniteConfiguration.java | 54 +-
.../org/apache/ignite/lang/IgniteFuture.java | 8 +-
.../ignite/logger/java/IgniteJavaLogger.java | 2 +-
.../resources/IgniteLocalHostResource.java | 3 +-
.../startup/cmdline/CommandLineStartup.java | 6 +-
.../gridgain/grid/GridBasicWarmupClosure.java | 6 +-
.../grid/GridClientConnectionConfiguration.java | 10 +-
.../org/gridgain/grid/GridSystemProperties.java | 603 -------------------
.../gridgain/grid/IgniteSystemProperties.java | 603 +++++++++++++++++++
.../org/gridgain/grid/kernal/GridGainEx.java | 24 +-
.../org/gridgain/grid/kernal/GridKernal.java | 6 +-
.../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 | 4 +-
.../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 | 8 +-
.../GridTcpDiscoveryMulticastIpFinder.java | 2 +-
.../ipfinder/vm/GridTcpDiscoveryVmIpFinder.java | 4 +-
.../grid/util/GridConcurrentFactory.java | 4 +-
.../gridgain/grid/util/GridReflectionCache.java | 2 +-
.../java/org/gridgain/grid/util/GridUtils.java | 6 +-
.../grid/util/future/GridFinishedFuture.java | 4 +-
.../grid/util/future/GridFutureAdapter.java | 6 +-
.../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 | 6 +-
.../grid/kernal/GridHomePathSelfTest.java | 2 +-
.../grid/kernal/GridStartStopSelfTest.java | 2 +-
.../grid/kernal/GridVersionSelfTest.java | 2 +-
.../GridCacheAbstractRemoveFailureTest.java | 2 +-
.../GridCacheMissingCommitVersionSelfTest.java | 2 +-
.../cache/GridCacheSlowTxWarnTest.java | 3 +-
...idCacheValueConsistencyAbstractSelfTest.java | 2 +-
.../GridCacheNodeFailureAbstractTest.java | 2 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 2 +-
.../grid/loadtest/GridSingleExecutionTest.java | 2 +-
...artupWithSpecifiedWorkDirectorySelfTest.java | 4 +-
...tartupWithUndefinedGridGainHomeSelfTest.java | 4 +-
...GridUnsafeDataOutputArraySizingSelfTest.java | 2 +-
.../shmem/GridIpcSharedMemorySpaceSelfTest.java | 8 +-
.../shmem/GridIpcSharedMemoryUtilsSelfTest.java | 2 +-
.../cache/GridCacheDataStructuresLoadTest.java | 2 +-
.../loadtests/cache/GridCacheLoadTest.java | 2 +-
.../startup/GridRandomCommandLineLoader.java | 2 +-
.../gridgain/startup/GridVmNodesStarter.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../logger/GridLog4jRollingFileAppender.java | 2 +-
.../junits/logger/GridTestLog4jLogger.java | 2 +-
.../testsuites/GridLoadersSelfTestSuite.java | 2 +-
.../hadoop/GridHadoopCommandLineTest.java | 4 +-
.../testsuites/bamboo/GridHadoopTestSuite.java | 6 +-
.../grid/spi/indexing/h2/GridH2IndexingSpi.java | 2 +-
.../ignite/logger/log4j/IgniteLog4jLogger.java | 2 +-
.../logger/log4j/IgniteLog4jNodeIdFilePath.java | 2 +-
.../http/jetty/GridJettyRestProtocol.java | 6 +-
.../processors/schedule/ScheduleFutureImpl.java | 6 +-
.../grid/kernal/GridFactorySelfTest.java | 2 +-
.../util/nodestart/GridNodeCallableImpl.java | 2 +-
.../visor/commands/vvm/VisorVvmCommand.scala | 4 +-
.../main/scala/org/gridgain/visor/visor.scala | 6 +-
.../testsuites/VisorConsoleSelfTestSuite.scala | 2 +-
86 files changed, 767 insertions(+), 769 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 3b5b1d5..a2888d4 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Examples test suite.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 53ef92d..a513281 100644
--- a/examples/src/test/scala/org/gridgain/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
+++ b/examples/src/test/scala/org/gridgain/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
@@ -16,7 +16,7 @@ import org.gridgain.scalar.tests._
import examples.{ScalarExamplesMultiNodeSelfTest, ScalarExamplesSelfTest}
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-import org.gridgain.grid.GridSystemProperties._
+import org.gridgain.grid.IgniteSystemProperties._
import org.gridgain.testframework.GridTestUtils
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 056de49..e40dec0 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* AOP test suite.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 d0927ea..fe473de 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 GridSystemProperties#GG_SMTP_SSL
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_STARTTLS
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_HOST
+ * @see org.gridgain.grid.IgniteSystemProperties#GG_SMTP_HOST
*/
public String getSmtpHost() {
return smtpHost;
@@ -766,7 +766,7 @@ public class IgniteConfiguration {
*
* @return SMTP port.
* @see #DFLT_SMTP_PORT
- * @see GridSystemProperties#GG_SMTP_PORT
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_USERNAME
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_PWD
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_ADMIN_EMAILS
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_FROM
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_LIFECYCLE_EMAIL_NOTIFY
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_SSL
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_STARTTLS
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_HOST
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_PORT
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_USERNAME
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_PWD
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_ADMIN_EMAILS
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_SMTP_FROM
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_HOME
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_HOME
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_HOME
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_JETTY_HOST} and {@link GridSystemProperties#GG_JETTY_PORT}
+ * {@link org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT}
* as host and port respectively.
*
* @return Path to {@code JETTY} XML configuration file.
- * @see GridSystemProperties#GG_JETTY_HOST
- * @see GridSystemProperties#GG_JETTY_PORT
+ * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_JETTY_HOST
- * @see GridSystemProperties#GG_JETTY_PORT
+ * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST
+ * @see org.gridgain.grid.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 GridSystemProperties#GG_JETTY_HOST
- * @see GridSystemProperties#GG_JETTY_PORT
+ * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_HOST
+ * @see org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT
* @deprecated Use {@link GridClientConnectionConfiguration#getRestSecretKey()}.
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 3804b0f..fd6e66f 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 GridSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
+ * {@link org.gridgain.grid.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 GridSystemProperties#GG_FUT_SYNC_NOTIFICATION} system property to {@code true}.
+ * {@link org.gridgain.grid.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 GridSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
+ * {@link org.gridgain.grid.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 GridSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system property to {@code true}.
+ * {@link org.gridgain.grid.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/f84f598a/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 57b6ff9..6d9d99a 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
* Logger to use with Java logging. Implementation simply delegates to Java Logging.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 2ec64cf..f11374e 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
@@ -9,7 +9,6 @@
package org.apache.ignite.resources;
-import org.gridgain.grid.*;
import org.gridgain.grid.spi.*;
import java.lang.annotation.*;
@@ -17,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 GridSystemProperties#GG_LOCAL_HOST} system or environment property.
+ * via {@link org.gridgain.grid.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/f84f598a/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 6b52625..95a2acc 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.GridProductImpl.*;
/**
@@ -54,7 +54,7 @@ public final class CommandLineStartup {
* Static initializer.
*/
static {
- String quiteStr = System.getProperty(GridSystemProperties.GG_QUIET);
+ String quiteStr = System.getProperty(IgniteSystemProperties.GG_QUIET);
boolean quite = true;
@@ -65,7 +65,7 @@ public final class CommandLineStartup {
if ("false".equalsIgnoreCase(quiteStr))
quite = false;
else if (!"true".equalsIgnoreCase(quiteStr)) {
- System.err.println("Invalid value for '" + GridSystemProperties.GG_QUIET +
+ System.err.println("Invalid value for '" + IgniteSystemProperties.GG_QUIET +
"' VM parameter (must be {true|false}): " + quiteStr);
quite = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
index 43720d0..127142b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
@@ -183,10 +183,10 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
Collection<Ignite> ignites = new LinkedList<>();
- String old = System.getProperty(GridSystemProperties.GG_UPDATE_NOTIFIER);
+ String old = System.getProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER);
try {
- System.setProperty(GridSystemProperties.GG_UPDATE_NOTIFIER, "false");
+ System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
@@ -222,7 +222,7 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
if (old == null)
old = "false";
- System.setProperty(GridSystemProperties.GG_UPDATE_NOTIFIER, old);
+ System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, old);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 e03b05c..cfe7997 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 GridSystemProperties#GG_JETTY_HOST} and {@link GridSystemProperties#GG_JETTY_PORT}
+ * {@link IgniteSystemProperties#GG_JETTY_HOST} and {@link IgniteSystemProperties#GG_JETTY_PORT}
* as host and port respectively.
*
* @return Path to {@code JETTY} XML configuration file.
- * @see GridSystemProperties#GG_JETTY_HOST
- * @see GridSystemProperties#GG_JETTY_PORT
+ * @see IgniteSystemProperties#GG_JETTY_HOST
+ * @see 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 GridSystemProperties#GG_JETTY_HOST
- * @see GridSystemProperties#GG_JETTY_PORT
+ * @see IgniteSystemProperties#GG_JETTY_HOST
+ * @see IgniteSystemProperties#GG_JETTY_PORT
*/
@Nullable public String getRestSecretKey() {
return restSecretKey;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/modules/core/src/main/java/org/gridgain/grid/GridSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridSystemProperties.java b/modules/core/src/main/java/org/gridgain/grid/GridSystemProperties.java
deleted file mode 100644
index c0f6b97..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridSystemProperties.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 GridSystemProperties {
- /**
- * 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 GridSystemProperties() {
- // 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/f84f598a/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
new file mode 100644
index 0000000..dedea19
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/IgniteSystemProperties.java
@@ -0,0 +1,603 @@
+/* @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/f84f598a/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 95a4254..a456a13 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -1414,13 +1414,13 @@ public class GridGainEx {
clientCfg = new GridClientConnectionConfiguration(clientCfg);
- String ntfStr = GridSystemProperties.getString(GG_LIFECYCLE_EMAIL_NOTIFY);
+ String ntfStr = IgniteSystemProperties.getString(GG_LIFECYCLE_EMAIL_NOTIFY);
if (ntfStr != null)
myCfg.setLifeCycleEmailNotification(Boolean.parseBoolean(ntfStr));
// Local host.
- String locHost = GridSystemProperties.getString(GG_LOCAL_HOST);
+ String locHost = IgniteSystemProperties.getString(GG_LOCAL_HOST);
myCfg.setLocalHost(F.isEmpty(locHost) ? cfg.getLocalHost() : locHost);
@@ -1429,7 +1429,7 @@ public class GridGainEx {
myCfg.setDaemon(true);
// Check for deployment mode override.
- String depModeName = GridSystemProperties.getString(GG_DEP_MODE_OVERRIDE);
+ String depModeName = IgniteSystemProperties.getString(GG_DEP_MODE_OVERRIDE);
if (!F.isEmpty(depModeName)) {
if (!F.isEmpty(cfg.getCacheConfiguration())) {
@@ -1774,34 +1774,34 @@ public class GridGainEx {
// Override SMTP configuration from system properties
// and environment variables, if specified.
- String fromEmail = GridSystemProperties.getString(GG_SMTP_FROM);
+ String fromEmail = IgniteSystemProperties.getString(GG_SMTP_FROM);
if (fromEmail != null)
myCfg.setSmtpFromEmail(fromEmail);
- String smtpHost = GridSystemProperties.getString(GG_SMTP_HOST);
+ String smtpHost = IgniteSystemProperties.getString(GG_SMTP_HOST);
if (smtpHost != null)
myCfg.setSmtpHost(smtpHost);
- String smtpUsername = GridSystemProperties.getString(GG_SMTP_USERNAME);
+ String smtpUsername = IgniteSystemProperties.getString(GG_SMTP_USERNAME);
if (smtpUsername != null)
myCfg.setSmtpUsername(smtpUsername);
- String smtpPwd = GridSystemProperties.getString(GG_SMTP_PWD);
+ String smtpPwd = IgniteSystemProperties.getString(GG_SMTP_PWD);
if (smtpPwd != null)
myCfg.setSmtpPassword(smtpPwd);
- int smtpPort = GridSystemProperties.getInteger(GG_SMTP_PORT,-1);
+ int smtpPort = IgniteSystemProperties.getInteger(GG_SMTP_PORT, -1);
if(smtpPort != -1)
myCfg.setSmtpPort(smtpPort);
- myCfg.setSmtpSsl(GridSystemProperties.getBoolean(GG_SMTP_SSL));
+ myCfg.setSmtpSsl(IgniteSystemProperties.getBoolean(GG_SMTP_SSL));
- String adminEmails = GridSystemProperties.getString(GG_ADMIN_EMAILS);
+ String adminEmails = IgniteSystemProperties.getString(GG_ADMIN_EMAILS);
if (adminEmails != null)
myCfg.setAdminEmails(adminEmails.split(","));
@@ -1922,7 +1922,7 @@ public class GridGainEx {
}
// Do NOT set it up only if GRIDGAIN_NO_SHUTDOWN_HOOK=TRUE is provided.
- if (GridSystemProperties.getBoolean(GG_NO_SHUTDOWN_HOOK)) {
+ if (IgniteSystemProperties.getBoolean(GG_NO_SHUTDOWN_HOOK)) {
try {
Runtime.getRuntime().addShutdownHook(shutdownHook = new Thread() {
@Override public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 2d59610..ad342de 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.GridComponentType.*;
import static org.gridgain.grid.kernal.GridKernalState.*;
import static org.gridgain.grid.kernal.GridNodeAttributes.*;
@@ -610,7 +610,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
// Run background network diagnostics.
GridDiagnostic.runBackgroundCheck(gridName, cfg.getExecutorService(), log);
- boolean notifyEnabled = GridSystemProperties.getBoolean(GG_UPDATE_NOTIFIER, true);
+ boolean notifyEnabled = IgniteSystemProperties.getBoolean(GG_UPDATE_NOTIFIER, true);
GridUpdateNotifier verChecker0 = null;
@@ -859,7 +859,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
}, PERIODIC_VER_CHECK_DELAY, PERIODIC_VER_CHECK_DELAY);
}
- String intervalStr = GridSystemProperties.getString(GG_STARVATION_CHECK_INTERVAL);
+ String intervalStr = IgniteSystemProperties.getString(GG_STARVATION_CHECK_INTERVAL);
// Start starvation checker if enabled.
boolean starveCheck = !isDaemon() && !"0".equals(intervalStr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f84f598a/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 4f0f734..6f79728 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.GridSystemProperties.*;
+import static org.gridgain.grid.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/f84f598a/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 2ac9916..df34618 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.GridSystemProperties.*;
+import static org.gridgain.grid.IgniteSystemProperties.*;
/**
*
@@ -157,7 +157,7 @@ public class GridLoggerProxy extends GridMetadataAwareAdapter implements IgniteL
}
/**
- * Enriches the log message with grid name if {@link GridSystemProperties#GG_LOG_GRID_NAME}
+ * Enriches the log message with grid name if {@link org.gridgain.grid.IgniteSystemProperties#GG_LOG_GRID_NAME}
* system property is set.
*
* @param m Message to enrich.
[08/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/1a9e7c21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a9e7c21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a9e7c21
Branch: refs/heads/master
Commit: 1a9e7c21a867b1feed7ce3b0dae65e0f351119d8
Parents: 4f92f24
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:22:10 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:22:10 2014 +0300
----------------------------------------------------------------------
.../ClientConnectionConfiguration.java | 570 +++++++++++++++++++
.../GridClientConnectionConfiguration.java | 570 -------------------
.../configuration/IgniteConfiguration.java | 86 +--
.../org/gridgain/grid/kernal/GridGainEx.java | 6 +-
.../org/gridgain/grid/kernal/GridKernal.java | 2 +-
.../processors/rest/GridRestProcessor.java | 6 +-
.../rest/protocols/GridRestProtocolAdapter.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 4 +-
.../node/VisorExecutorServiceConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 2 +-
.../grid/kernal/GridLifecycleAwareSelfTest.java | 2 +-
11 files changed, 626 insertions(+), 626 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/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
new file mode 100644
index 0000000..59c1ae4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
@@ -0,0 +1,570 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+import org.gridgain.client.ssl.*;
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+import java.net.*;
+import java.util.concurrent.*;
+
+/**
+ * REST access configuration.
+ */
+public class ClientConnectionConfiguration {
+ /** Default TCP server port. */
+ public static final int DFLT_TCP_PORT = 11211;
+
+ /** Default TCP_NODELAY flag. */
+ public static final boolean DFLT_TCP_NODELAY = true;
+
+ /** Default TCP direct buffer flag. */
+ public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
+
+ /** Default REST idle timeout. */
+ public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
+
+ /** Default rest port range. */
+ public static final int DFLT_REST_PORT_RANGE = 100;
+
+ /** Default size of REST thread pool. */
+ public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+ /** Default max size of REST thread pool. */
+ public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+ /** Default max queue capacity of REST thread pool. */
+ public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
+
+ /** Default socket send and receive buffer size. */
+ public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
+
+ /** Jetty XML configuration path. */
+ private String jettyPath;
+
+ /** REST secret key. */
+ private String restSecretKey;
+
+ /** TCP host. */
+ private String restTcpHost;
+
+ /** TCP port. */
+ private int restTcpPort = DFLT_TCP_PORT;
+
+ /** TCP no delay flag. */
+ private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
+
+ /** REST TCP direct buffer flag. */
+ private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
+
+ /** REST TCP send buffer size. */
+ private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
+
+ /** REST TCP receive buffer size. */
+ private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
+
+ /** REST TCP send queue limit. */
+ private int restTcpSndQueueLimit;
+
+ /** REST TCP selector count. */
+ private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
+
+ /** Idle timeout. */
+ private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
+
+ /** SSL enable flag, default is disabled. */
+ private boolean restTcpSslEnabled;
+
+ /** SSL need client auth flag. */
+ private boolean restTcpSslClientAuth;
+
+ /** SSL context factory for rest binary server. */
+ private GridSslContextFactory restTcpSslCtxFactory;
+
+ /** Port range */
+ private int restPortRange = DFLT_REST_PORT_RANGE;
+
+ /** Folders accessible by REST. */
+ private String[] restAccessibleFolders;
+
+ /** REST requests executor service. */
+ private ExecutorService restExecSvc;
+
+ /** REST executor service shutdown flag. */
+ private boolean restSvcShutdown = true;
+
+ /** Client message interceptor. */
+ private GridClientMessageInterceptor clientMsgInterceptor;
+
+ /**
+ * Creates client connection configuration with all default values.
+ */
+ public ClientConnectionConfiguration() {
+ // No-op.
+ }
+
+ /**
+ * Creates client connection configuration by copying all properties from
+ * given configuration.
+ *
+ * @param cfg Client configuration.
+ */
+ public ClientConnectionConfiguration(ClientConnectionConfiguration cfg) {
+ assert cfg != null;
+
+ clientMsgInterceptor = cfg.getClientMessageInterceptor();
+ restAccessibleFolders = cfg.getRestAccessibleFolders();
+ restExecSvc = cfg.getRestExecutorService();
+ restSvcShutdown = cfg.isRestExecutorServiceShutdown();
+ restIdleTimeout = cfg.getRestIdleTimeout();
+ jettyPath = cfg.getRestJettyPath();
+ restPortRange = cfg.getRestPortRange();
+ restSecretKey = cfg.getRestSecretKey();
+ restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
+ restTcpHost = cfg.getRestTcpHost();
+ restTcpNoDelay = cfg.isRestTcpNoDelay();
+ restTcpPort = cfg.getRestTcpPort();
+ restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
+ restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
+ restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
+ restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
+ restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
+ restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
+ restTcpSslEnabled = cfg.isRestTcpSslEnabled();
+ }
+
+ /**
+ * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
+ * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
+ * accessing GridGain APIs remotely.
+ *
+ * @param jettyPath Path to {@code JETTY} XML configuration file.
+ */
+ public void setRestJettyPath(String jettyPath) {
+ this.jettyPath = jettyPath;
+ }
+
+ /**
+ * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
+ * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
+ * 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}
+ * 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
+ */
+ public String getRestJettyPath() {
+ return jettyPath;
+ }
+
+ /**
+ * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
+ *
+ * @param restSecretKey REST secret key.
+ */
+ public void setRestSecretKey(@Nullable String restSecretKey) {
+ this.restSecretKey = restSecretKey;
+ }
+
+ /**
+ * 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
+ */
+ @Nullable public String getRestSecretKey() {
+ return restSecretKey;
+ }
+
+ /**
+ * Gets host for TCP binary protocol server. This can be either an
+ * IP address or a domain name.
+ * <p>
+ * If not defined, system-wide local address will be used
+ * (see {@link IgniteConfiguration#getLocalHost()}.
+ * <p>
+ * You can also use {@code 0.0.0.0} value to bind to all
+ * locally-available IP addresses.
+ *
+ * @return TCP host.
+ */
+ public String getRestTcpHost() {
+ return restTcpHost;
+ }
+
+ /**
+ * Sets host for TCP binary protocol server.
+ *
+ * @param restTcpHost TCP host.
+ */
+ public void setRestTcpHost(String restTcpHost) {
+ this.restTcpHost = restTcpHost;
+ }
+
+ /**
+ * Gets port for TCP binary protocol server.
+ * <p>
+ * Default is {@link #DFLT_TCP_PORT}.
+ *
+ * @return TCP port.
+ */
+ public int getRestTcpPort() {
+ return restTcpPort;
+ }
+
+ /**
+ * Sets port for TCP binary protocol server.
+ *
+ * @param restTcpPort TCP port.
+ */
+ public void setRestTcpPort(int restTcpPort) {
+ this.restTcpPort = restTcpPort;
+ }
+
+ /**
+ * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
+ * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
+ * For more information, see {@link Socket#setTcpNoDelay(boolean)}
+ * <p/>
+ * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
+ *
+ * @return Whether {@code TCP_NODELAY} option should be enabled.
+ */
+ public boolean isRestTcpNoDelay() {
+ return restTcpNoDelay;
+ }
+
+ /**
+ * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
+ *
+ * @param restTcpNoDelay {@code True} if option should be enabled.
+ * @see #isRestTcpNoDelay()
+ */
+ public void setRestTcpNoDelay(boolean restTcpNoDelay) {
+ this.restTcpNoDelay = restTcpNoDelay;
+ }
+
+ /**
+ * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
+ * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
+ * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
+ * size).
+ *
+ * @return Whether direct buffer should be used.
+ */
+ public boolean isRestTcpDirectBuffer() {
+ return restTcpDirectBuf;
+ }
+
+ /**
+ * Sets whether to use direct buffer for REST TCP server.
+ *
+ * @param restTcpDirectBuf {@code True} if option should be enabled.
+ * @see #isRestTcpDirectBuffer()
+ */
+ public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
+ this.restTcpDirectBuf = restTcpDirectBuf;
+ }
+
+ /**
+ * Gets REST TCP server send buffer size.
+ *
+ * @return REST TCP server send buffer size (0 for default).
+ */
+ public int getRestTcpSendBufferSize() {
+ return restTcpSndBufSize;
+ }
+
+ /**
+ * Sets REST TCP server send buffer size.
+ *
+ * @param restTcpSndBufSize Send buffer size.
+ * @see #getRestTcpSendBufferSize()
+ */
+ public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
+ this.restTcpSndBufSize = restTcpSndBufSize;
+ }
+
+ /**
+ * Gets REST TCP server receive buffer size.
+ *
+ * @return REST TCP server receive buffer size (0 for default).
+ */
+ public int getRestTcpReceiveBufferSize() {
+ return restTcpRcvBufSize;
+ }
+
+ /**
+ * Sets REST TCP server receive buffer size.
+ *
+ * @param restTcpRcvBufSize Receive buffer size.
+ * @see #getRestTcpReceiveBufferSize()
+ */
+ public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
+ this.restTcpRcvBufSize = restTcpRcvBufSize;
+ }
+
+ /**
+ * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
+ * block until the queue has enough capacity.
+ *
+ * @return REST TCP server send queue limit (0 for unlimited).
+ */
+ public int getRestTcpSendQueueLimit() {
+ return restTcpSndQueueLimit;
+ }
+
+ /**
+ * Sets REST TCP server send queue limit.
+ *
+ * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
+ * @see #getRestTcpSendQueueLimit()
+ */
+ public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
+ this.restTcpSndQueueLimit = restTcpSndQueueLimit;
+ }
+
+ /**
+ * Gets number of selector threads in REST TCP server. Higher value for this parameter
+ * may increase throughput, but also increases context switching.
+ *
+ * @return Number of selector threads for REST TCP server.
+ */
+ public int getRestTcpSelectorCount() {
+ return restTcpSelectorCnt;
+ }
+
+ /**
+ * Sets number of selector threads for REST TCP server.
+ *
+ * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
+ * @see #getRestTcpSelectorCount()
+ */
+ public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
+ this.restTcpSelectorCnt = restTcpSelectorCnt;
+ }
+
+ /**
+ * Gets idle timeout for REST server.
+ * <p>
+ * This setting is used to reject half-opened sockets. If no packets
+ * come within idle timeout, the connection is closed.
+ *
+ * @return Idle timeout in milliseconds.
+ */
+ public long getRestIdleTimeout() {
+ return restIdleTimeout;
+ }
+
+ /**
+ * Sets idle timeout for REST server.
+ *
+ * @param restIdleTimeout Idle timeout in milliseconds.
+ * @see #getRestIdleTimeout()
+ */
+ public void setRestIdleTimeout(long restIdleTimeout) {
+ this.restIdleTimeout = restIdleTimeout;
+ }
+
+ /**
+ * Whether secure socket layer should be enabled on binary rest server.
+ * <p>
+ * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
+ * should be provided, otherwise binary rest protocol will fail to start.
+ *
+ * @return {@code True} if SSL should be enabled.
+ */
+ public boolean isRestTcpSslEnabled() {
+ return restTcpSslEnabled;
+ }
+
+ /**
+ * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
+ * <p/>
+ * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
+ * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
+ *
+ * @param restTcpSslEnabled {@code True} if SSL should be enabled.
+ */
+ public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
+ this.restTcpSslEnabled = restTcpSslEnabled;
+ }
+
+ /**
+ * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
+ * validity will be verified with trust manager.
+ *
+ * @return Whether or not client authentication is required.
+ */
+ public boolean isRestTcpSslClientAuth() {
+ return restTcpSslClientAuth;
+ }
+
+ /**
+ * Sets flag indicating whether or not SSL client authentication is required.
+ *
+ * @param needClientAuth Whether or not client authentication is required.
+ */
+ public void setRestTcpSslClientAuth(boolean needClientAuth) {
+ restTcpSslClientAuth = needClientAuth;
+ }
+
+ /**
+ * Gets context factory that will be used for creating a secure socket layer of rest binary server.
+ *
+ * @return SslContextFactory instance.
+ * @see GridSslContextFactory
+ */
+ public GridSslContextFactory getRestTcpSslContextFactory() {
+ return restTcpSslCtxFactory;
+ }
+
+ /**
+ * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
+ * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
+ * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
+ *
+ * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
+ */
+ public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
+ this.restTcpSslCtxFactory = restTcpSslCtxFactory;
+ }
+
+ /**
+ * Gets number of ports to try if configured port is already in use.
+ *
+ * @return Number of ports to try.
+ */
+ public int getRestPortRange() {
+ return restPortRange;
+ }
+
+ /**
+ * Sets number of ports to try if configured one is in use.
+ *
+ * @param restPortRange Port range.
+ */
+ public void setRestPortRange(int restPortRange) {
+ this.restPortRange = restPortRange;
+ }
+
+ /**
+ * Gets list of folders that are accessible for log reading command. When remote client requests
+ * a log file, file path is checked against this list. If requested file is not located in any
+ * sub-folder of these folders, request is not processed.
+ * <p>
+ * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
+ * could not be detected and property is not specified, no restrictions applied.
+ *
+ * @return Array of folders that are allowed be read by remote clients.
+ */
+ public String[] getRestAccessibleFolders() {
+ return restAccessibleFolders;
+ }
+
+ /**
+ * Sets array of folders accessible by REST processor for log reading command.
+ *
+ * @param restAccessibleFolders Array of folder paths.
+ */
+ public void setRestAccessibleFolders(String... restAccessibleFolders) {
+ this.restAccessibleFolders = restAccessibleFolders;
+ }
+
+ /**
+ * Should return an instance of fully configured thread pool to be used for
+ * processing of client messages (REST requests).
+ * <p>
+ * If not provided, new executor service will be created using the following
+ * configuration:
+ * <ul>
+ * <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
+ * <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
+ * <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
+ * </ul>
+ *
+ * @return Thread pool implementation to be used for processing of client
+ * messages.
+ */
+ public ExecutorService getRestExecutorService() {
+ return restExecSvc;
+ }
+
+ /**
+ * Sets thread pool to use for processing of client messages (REST requests).
+ *
+ * @param restExecSvc Thread pool to use for processing of client messages.
+ * @see IgniteConfiguration#getRestExecutorService()
+ */
+ public void setRestExecutorService(ExecutorService restExecSvc) {
+ this.restExecSvc = restExecSvc;
+ }
+
+ /**
+ * Sets REST executor service shutdown flag.
+ *
+ * @param restSvcShutdown REST executor service shutdown flag.
+ * @see IgniteConfiguration#getRestExecutorService()
+ */
+ public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
+ this.restSvcShutdown = restSvcShutdown;
+ }
+
+ /**
+ * Shutdown flag for REST executor service.
+ * <p>
+ * If not provided, default value {@code true} will be used which will shutdown
+ * executor service when GridGain stops regardless whether it was started before GridGain
+ * or by GridGain.
+ *
+ * @return REST executor service shutdown flag.
+ */
+ public boolean isRestExecutorServiceShutdown() {
+ return restSvcShutdown;
+ }
+
+ /**
+ * Gets interceptor for objects, moving to and from remote clients.
+ * If this method returns {@code null} then no interception will be applied.
+ * <p>
+ * Setting interceptor allows to transform all objects exchanged via REST protocol.
+ * For example if you use custom serialisation on client you can write interceptor
+ * to transform binary representations received from client to Java objects and later
+ * access them from java code directly.
+ * <p>
+ * Default value is {@code null}.
+ *
+ * @see GridClientMessageInterceptor
+ * @return Interceptor.
+ */
+ @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
+ return clientMsgInterceptor;
+ }
+
+ /**
+ * Sets client message interceptor.
+ * <p>
+ * Setting interceptor allows to transform all objects exchanged via REST protocol.
+ * For example if you use custom serialisation on client you can write interceptor
+ * to transform binary representations received from client to Java objects and later
+ * access them from java code directly.
+ *
+ * @param interceptor Interceptor.
+ */
+ public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+ clientMsgInterceptor = interceptor;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
deleted file mode 100644
index b17d3a3..0000000
--- a/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.configuration;
-
-import org.gridgain.client.ssl.*;
-import org.gridgain.grid.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.concurrent.*;
-
-/**
- * REST access configuration.
- */
-public class GridClientConnectionConfiguration {
- /** Default TCP server port. */
- public static final int DFLT_TCP_PORT = 11211;
-
- /** Default TCP_NODELAY flag. */
- public static final boolean DFLT_TCP_NODELAY = true;
-
- /** Default TCP direct buffer flag. */
- public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
-
- /** Default REST idle timeout. */
- public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
-
- /** Default rest port range. */
- public static final int DFLT_REST_PORT_RANGE = 100;
-
- /** Default size of REST thread pool. */
- public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
- /** Default max size of REST thread pool. */
- public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
- /** Default max queue capacity of REST thread pool. */
- public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
-
- /** Default socket send and receive buffer size. */
- public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
-
- /** Jetty XML configuration path. */
- private String jettyPath;
-
- /** REST secret key. */
- private String restSecretKey;
-
- /** TCP host. */
- private String restTcpHost;
-
- /** TCP port. */
- private int restTcpPort = DFLT_TCP_PORT;
-
- /** TCP no delay flag. */
- private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
-
- /** REST TCP direct buffer flag. */
- private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
-
- /** REST TCP send buffer size. */
- private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
-
- /** REST TCP receive buffer size. */
- private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
-
- /** REST TCP send queue limit. */
- private int restTcpSndQueueLimit;
-
- /** REST TCP selector count. */
- private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
-
- /** Idle timeout. */
- private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
-
- /** SSL enable flag, default is disabled. */
- private boolean restTcpSslEnabled;
-
- /** SSL need client auth flag. */
- private boolean restTcpSslClientAuth;
-
- /** SSL context factory for rest binary server. */
- private GridSslContextFactory restTcpSslCtxFactory;
-
- /** Port range */
- private int restPortRange = DFLT_REST_PORT_RANGE;
-
- /** Folders accessible by REST. */
- private String[] restAccessibleFolders;
-
- /** REST requests executor service. */
- private ExecutorService restExecSvc;
-
- /** REST executor service shutdown flag. */
- private boolean restSvcShutdown = true;
-
- /** Client message interceptor. */
- private GridClientMessageInterceptor clientMsgInterceptor;
-
- /**
- * Creates client connection configuration with all default values.
- */
- public GridClientConnectionConfiguration() {
- // No-op.
- }
-
- /**
- * Creates client connection configuration by copying all properties from
- * given configuration.
- *
- * @param cfg Client configuration.
- */
- public GridClientConnectionConfiguration(GridClientConnectionConfiguration cfg) {
- assert cfg != null;
-
- clientMsgInterceptor = cfg.getClientMessageInterceptor();
- restAccessibleFolders = cfg.getRestAccessibleFolders();
- restExecSvc = cfg.getRestExecutorService();
- restSvcShutdown = cfg.isRestExecutorServiceShutdown();
- restIdleTimeout = cfg.getRestIdleTimeout();
- jettyPath = cfg.getRestJettyPath();
- restPortRange = cfg.getRestPortRange();
- restSecretKey = cfg.getRestSecretKey();
- restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
- restTcpHost = cfg.getRestTcpHost();
- restTcpNoDelay = cfg.isRestTcpNoDelay();
- restTcpPort = cfg.getRestTcpPort();
- restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
- restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
- restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
- restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
- restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
- restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
- restTcpSslEnabled = cfg.isRestTcpSslEnabled();
- }
-
- /**
- * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
- * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
- * accessing GridGain APIs remotely.
- *
- * @param jettyPath Path to {@code JETTY} XML configuration file.
- */
- public void setRestJettyPath(String jettyPath) {
- this.jettyPath = jettyPath;
- }
-
- /**
- * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
- * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
- * 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}
- * 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
- */
- public String getRestJettyPath() {
- return jettyPath;
- }
-
- /**
- * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
- *
- * @param restSecretKey REST secret key.
- */
- public void setRestSecretKey(@Nullable String restSecretKey) {
- this.restSecretKey = restSecretKey;
- }
-
- /**
- * 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
- */
- @Nullable public String getRestSecretKey() {
- return restSecretKey;
- }
-
- /**
- * Gets host for TCP binary protocol server. This can be either an
- * IP address or a domain name.
- * <p>
- * If not defined, system-wide local address will be used
- * (see {@link IgniteConfiguration#getLocalHost()}.
- * <p>
- * You can also use {@code 0.0.0.0} value to bind to all
- * locally-available IP addresses.
- *
- * @return TCP host.
- */
- public String getRestTcpHost() {
- return restTcpHost;
- }
-
- /**
- * Sets host for TCP binary protocol server.
- *
- * @param restTcpHost TCP host.
- */
- public void setRestTcpHost(String restTcpHost) {
- this.restTcpHost = restTcpHost;
- }
-
- /**
- * Gets port for TCP binary protocol server.
- * <p>
- * Default is {@link #DFLT_TCP_PORT}.
- *
- * @return TCP port.
- */
- public int getRestTcpPort() {
- return restTcpPort;
- }
-
- /**
- * Sets port for TCP binary protocol server.
- *
- * @param restTcpPort TCP port.
- */
- public void setRestTcpPort(int restTcpPort) {
- this.restTcpPort = restTcpPort;
- }
-
- /**
- * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
- * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
- * For more information, see {@link Socket#setTcpNoDelay(boolean)}
- * <p/>
- * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
- *
- * @return Whether {@code TCP_NODELAY} option should be enabled.
- */
- public boolean isRestTcpNoDelay() {
- return restTcpNoDelay;
- }
-
- /**
- * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
- *
- * @param restTcpNoDelay {@code True} if option should be enabled.
- * @see #isRestTcpNoDelay()
- */
- public void setRestTcpNoDelay(boolean restTcpNoDelay) {
- this.restTcpNoDelay = restTcpNoDelay;
- }
-
- /**
- * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
- * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
- * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
- * size).
- *
- * @return Whether direct buffer should be used.
- */
- public boolean isRestTcpDirectBuffer() {
- return restTcpDirectBuf;
- }
-
- /**
- * Sets whether to use direct buffer for REST TCP server.
- *
- * @param restTcpDirectBuf {@code True} if option should be enabled.
- * @see #isRestTcpDirectBuffer()
- */
- public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
- this.restTcpDirectBuf = restTcpDirectBuf;
- }
-
- /**
- * Gets REST TCP server send buffer size.
- *
- * @return REST TCP server send buffer size (0 for default).
- */
- public int getRestTcpSendBufferSize() {
- return restTcpSndBufSize;
- }
-
- /**
- * Sets REST TCP server send buffer size.
- *
- * @param restTcpSndBufSize Send buffer size.
- * @see #getRestTcpSendBufferSize()
- */
- public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
- this.restTcpSndBufSize = restTcpSndBufSize;
- }
-
- /**
- * Gets REST TCP server receive buffer size.
- *
- * @return REST TCP server receive buffer size (0 for default).
- */
- public int getRestTcpReceiveBufferSize() {
- return restTcpRcvBufSize;
- }
-
- /**
- * Sets REST TCP server receive buffer size.
- *
- * @param restTcpRcvBufSize Receive buffer size.
- * @see #getRestTcpReceiveBufferSize()
- */
- public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
- this.restTcpRcvBufSize = restTcpRcvBufSize;
- }
-
- /**
- * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
- * block until the queue has enough capacity.
- *
- * @return REST TCP server send queue limit (0 for unlimited).
- */
- public int getRestTcpSendQueueLimit() {
- return restTcpSndQueueLimit;
- }
-
- /**
- * Sets REST TCP server send queue limit.
- *
- * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
- * @see #getRestTcpSendQueueLimit()
- */
- public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
- this.restTcpSndQueueLimit = restTcpSndQueueLimit;
- }
-
- /**
- * Gets number of selector threads in REST TCP server. Higher value for this parameter
- * may increase throughput, but also increases context switching.
- *
- * @return Number of selector threads for REST TCP server.
- */
- public int getRestTcpSelectorCount() {
- return restTcpSelectorCnt;
- }
-
- /**
- * Sets number of selector threads for REST TCP server.
- *
- * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
- * @see #getRestTcpSelectorCount()
- */
- public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
- this.restTcpSelectorCnt = restTcpSelectorCnt;
- }
-
- /**
- * Gets idle timeout for REST server.
- * <p>
- * This setting is used to reject half-opened sockets. If no packets
- * come within idle timeout, the connection is closed.
- *
- * @return Idle timeout in milliseconds.
- */
- public long getRestIdleTimeout() {
- return restIdleTimeout;
- }
-
- /**
- * Sets idle timeout for REST server.
- *
- * @param restIdleTimeout Idle timeout in milliseconds.
- * @see #getRestIdleTimeout()
- */
- public void setRestIdleTimeout(long restIdleTimeout) {
- this.restIdleTimeout = restIdleTimeout;
- }
-
- /**
- * Whether secure socket layer should be enabled on binary rest server.
- * <p>
- * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
- * should be provided, otherwise binary rest protocol will fail to start.
- *
- * @return {@code True} if SSL should be enabled.
- */
- public boolean isRestTcpSslEnabled() {
- return restTcpSslEnabled;
- }
-
- /**
- * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
- * <p/>
- * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
- * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
- *
- * @param restTcpSslEnabled {@code True} if SSL should be enabled.
- */
- public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
- this.restTcpSslEnabled = restTcpSslEnabled;
- }
-
- /**
- * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
- * validity will be verified with trust manager.
- *
- * @return Whether or not client authentication is required.
- */
- public boolean isRestTcpSslClientAuth() {
- return restTcpSslClientAuth;
- }
-
- /**
- * Sets flag indicating whether or not SSL client authentication is required.
- *
- * @param needClientAuth Whether or not client authentication is required.
- */
- public void setRestTcpSslClientAuth(boolean needClientAuth) {
- restTcpSslClientAuth = needClientAuth;
- }
-
- /**
- * Gets context factory that will be used for creating a secure socket layer of rest binary server.
- *
- * @return SslContextFactory instance.
- * @see GridSslContextFactory
- */
- public GridSslContextFactory getRestTcpSslContextFactory() {
- return restTcpSslCtxFactory;
- }
-
- /**
- * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
- * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
- * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
- *
- * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
- */
- public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
- this.restTcpSslCtxFactory = restTcpSslCtxFactory;
- }
-
- /**
- * Gets number of ports to try if configured port is already in use.
- *
- * @return Number of ports to try.
- */
- public int getRestPortRange() {
- return restPortRange;
- }
-
- /**
- * Sets number of ports to try if configured one is in use.
- *
- * @param restPortRange Port range.
- */
- public void setRestPortRange(int restPortRange) {
- this.restPortRange = restPortRange;
- }
-
- /**
- * Gets list of folders that are accessible for log reading command. When remote client requests
- * a log file, file path is checked against this list. If requested file is not located in any
- * sub-folder of these folders, request is not processed.
- * <p>
- * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
- * could not be detected and property is not specified, no restrictions applied.
- *
- * @return Array of folders that are allowed be read by remote clients.
- */
- public String[] getRestAccessibleFolders() {
- return restAccessibleFolders;
- }
-
- /**
- * Sets array of folders accessible by REST processor for log reading command.
- *
- * @param restAccessibleFolders Array of folder paths.
- */
- public void setRestAccessibleFolders(String... restAccessibleFolders) {
- this.restAccessibleFolders = restAccessibleFolders;
- }
-
- /**
- * Should return an instance of fully configured thread pool to be used for
- * processing of client messages (REST requests).
- * <p>
- * If not provided, new executor service will be created using the following
- * configuration:
- * <ul>
- * <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
- * <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
- * <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
- * </ul>
- *
- * @return Thread pool implementation to be used for processing of client
- * messages.
- */
- public ExecutorService getRestExecutorService() {
- return restExecSvc;
- }
-
- /**
- * Sets thread pool to use for processing of client messages (REST requests).
- *
- * @param restExecSvc Thread pool to use for processing of client messages.
- * @see IgniteConfiguration#getRestExecutorService()
- */
- public void setRestExecutorService(ExecutorService restExecSvc) {
- this.restExecSvc = restExecSvc;
- }
-
- /**
- * Sets REST executor service shutdown flag.
- *
- * @param restSvcShutdown REST executor service shutdown flag.
- * @see IgniteConfiguration#getRestExecutorService()
- */
- public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
- this.restSvcShutdown = restSvcShutdown;
- }
-
- /**
- * Shutdown flag for REST executor service.
- * <p>
- * If not provided, default value {@code true} will be used which will shutdown
- * executor service when GridGain stops regardless whether it was started before GridGain
- * or by GridGain.
- *
- * @return REST executor service shutdown flag.
- */
- public boolean isRestExecutorServiceShutdown() {
- return restSvcShutdown;
- }
-
- /**
- * Gets interceptor for objects, moving to and from remote clients.
- * If this method returns {@code null} then no interception will be applied.
- * <p>
- * Setting interceptor allows to transform all objects exchanged via REST protocol.
- * For example if you use custom serialisation on client you can write interceptor
- * to transform binary representations received from client to Java objects and later
- * access them from java code directly.
- * <p>
- * Default value is {@code null}.
- *
- * @see GridClientMessageInterceptor
- * @return Interceptor.
- */
- @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
- return clientMsgInterceptor;
- }
-
- /**
- * Sets client message interceptor.
- * <p>
- * Setting interceptor allows to transform all objects exchanged via REST protocol.
- * For example if you use custom serialisation on client you can write interceptor
- * to transform binary representations received from client to Java objects and later
- * access them from java code directly.
- *
- * @param interceptor Interceptor.
- */
- public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
- clientMsgInterceptor = interceptor;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/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 75dbb5c..7f5fab0 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
@@ -532,7 +532,7 @@ public class IgniteConfiguration {
private GridHadoopConfiguration hadoopCfg;
/** Client access configuration. */
- private GridClientConnectionConfiguration clientCfg;
+ private ClientConnectionConfiguration clientCfg;
/** Portable configuration. */
private PortableConfiguration portableCfg;
@@ -2341,7 +2341,7 @@ public class IgniteConfiguration {
* accessing GridGain APIs remotely.
*
* @param jettyPath Path to {@code JETTY} XML configuration file.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestJettyPath(String)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestJettyPath(String)}.
*/
@Deprecated
public void setRestJettyPath(String jettyPath) {
@@ -2360,7 +2360,7 @@ public class IgniteConfiguration {
* @return Path to {@code JETTY} XML configuration file.
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestJettyPath()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestJettyPath()}.
*/
@Deprecated
public String getRestJettyPath() {
@@ -2371,7 +2371,7 @@ public class IgniteConfiguration {
* Sets flag indicating whether external {@code REST} access is enabled or not.
*
* @param restEnabled Flag indicating whether external {@code REST} access is enabled or not.
- * @deprecated Use {@link GridClientConnectionConfiguration}.
+ * @deprecated Use {@link ClientConnectionConfiguration}.
*/
@Deprecated
public void setRestEnabled(boolean restEnabled) {
@@ -2385,7 +2385,7 @@ public class IgniteConfiguration {
* @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
- * @deprecated Use {@link GridClientConnectionConfiguration}.
+ * @deprecated Use {@link ClientConnectionConfiguration}.
*/
@Deprecated
public boolean isRestEnabled() {
@@ -2403,7 +2403,7 @@ public class IgniteConfiguration {
* locally-available IP addresses.
*
* @return TCP host.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpHost()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpHost()}.
*/
@Deprecated
public String getRestTcpHost() {
@@ -2414,7 +2414,7 @@ public class IgniteConfiguration {
* Sets host for TCP binary protocol server.
*
* @param restTcpHost TCP host.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpHost(String)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpHost(String)}.
*/
@Deprecated
public void setRestTcpHost(String restTcpHost) {
@@ -2427,7 +2427,7 @@ public class IgniteConfiguration {
* Default is {@link #DFLT_TCP_PORT}.
*
* @return TCP port.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpPort()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpPort()}.
*/
@Deprecated
public int getRestTcpPort() {
@@ -2438,7 +2438,7 @@ public class IgniteConfiguration {
* Sets port for TCP binary protocol server.
*
* @param restTcpPort TCP port.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpPort(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpPort(int)}.
*/
@Deprecated
public void setRestTcpPort(int restTcpPort) {
@@ -2453,7 +2453,7 @@ public class IgniteConfiguration {
* If not specified, default value is {@link #DFLT_TCP_NODELAY}.
*
* @return Whether {@code TCP_NODELAY} option should be enabled.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpNoDelay()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpNoDelay()}.
*/
@Deprecated
public boolean isRestTcpNoDelay() {
@@ -2465,7 +2465,7 @@ public class IgniteConfiguration {
*
* @param restTcpNoDelay {@code True} if option should be enabled.
* @see #isRestTcpNoDelay()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpNoDelay(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpNoDelay(boolean)}.
*/
@Deprecated
public void setRestTcpNoDelay(boolean restTcpNoDelay) {
@@ -2479,7 +2479,7 @@ public class IgniteConfiguration {
* size).
*
* @return Whether direct buffer should be used.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpDirectBuffer()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpDirectBuffer()}.
*/
@Deprecated
public boolean isRestTcpDirectBuffer() {
@@ -2491,7 +2491,7 @@ public class IgniteConfiguration {
*
* @param restTcpDirectBuf {@code True} if option should be enabled.
* @see #isRestTcpDirectBuffer()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpDirectBuffer(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpDirectBuffer(boolean)}.
*/
@Deprecated
public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
@@ -2502,7 +2502,7 @@ public class IgniteConfiguration {
* Gets REST TCP server send buffer size.
*
* @return REST TCP server send buffer size (0 for default).
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSendBufferSize()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSendBufferSize()}.
*/
@Deprecated
public int getRestTcpSendBufferSize() {
@@ -2514,7 +2514,7 @@ public class IgniteConfiguration {
*
* @param restTcpSndBufSize Send buffer size.
* @see #getRestTcpSendBufferSize()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSendBufferSize(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSendBufferSize(int)}.
*/
@Deprecated
public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
@@ -2525,7 +2525,7 @@ public class IgniteConfiguration {
* Gets REST TCP server receive buffer size.
*
* @return REST TCP server receive buffer size (0 for default).
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpReceiveBufferSize()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpReceiveBufferSize()}.
*/
@Deprecated
public int getRestTcpReceiveBufferSize() {
@@ -2537,7 +2537,7 @@ public class IgniteConfiguration {
*
* @param restTcpRcvBufSize Receive buffer size.
* @see #getRestTcpReceiveBufferSize()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpReceiveBufferSize(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpReceiveBufferSize(int)}.
*/
@Deprecated
public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
@@ -2549,7 +2549,7 @@ public class IgniteConfiguration {
* block until the queue has enough capacity.
*
* @return REST TCP server send queue limit (0 for unlimited).
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSendQueueLimit()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSendQueueLimit()}.
*/
@Deprecated
public int getRestTcpSendQueueLimit() {
@@ -2561,7 +2561,7 @@ public class IgniteConfiguration {
*
* @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
* @see #getRestTcpSendQueueLimit()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSendQueueLimit(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSendQueueLimit(int)}.
*/
@Deprecated
public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
@@ -2573,7 +2573,7 @@ public class IgniteConfiguration {
* may increase throughput, but also increases context switching.
*
* @return Number of selector threads for REST TCP server.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSelectorCount()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSelectorCount()}.
*/
@Deprecated
public int getRestTcpSelectorCount() {
@@ -2585,7 +2585,7 @@ public class IgniteConfiguration {
*
* @param restTcpSelectorCnt Number of selector threads for REST TCP server.
* @see #getRestTcpSelectorCount()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSelectorCount(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSelectorCount(int)}.
*/
@Deprecated
public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
@@ -2599,7 +2599,7 @@ public class IgniteConfiguration {
* come within idle timeout, the connection is closed.
*
* @return Idle timeout in milliseconds.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestIdleTimeout()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestIdleTimeout()}.
*/
@Deprecated
public long getRestIdleTimeout() {
@@ -2611,7 +2611,7 @@ public class IgniteConfiguration {
*
* @param restIdleTimeout Idle timeout in milliseconds.
* @see #getRestIdleTimeout()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestIdleTimeout(long)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestIdleTimeout(long)}.
*/
@Deprecated
public void setRestIdleTimeout(long restIdleTimeout) {
@@ -2625,7 +2625,7 @@ public class IgniteConfiguration {
* should be provided, otherwise binary rest protocol will fail to start.
*
* @return {@code True} if SSL should be enabled.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpSslEnabled()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpSslEnabled()}.
*/
@Deprecated
public boolean isRestTcpSslEnabled() {
@@ -2639,7 +2639,7 @@ public class IgniteConfiguration {
* should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
*
* @param restTcpSslEnabled {@code True} if SSL should be enabled.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSslEnabled(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslEnabled(boolean)}.
*/
@Deprecated
public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
@@ -2651,7 +2651,7 @@ public class IgniteConfiguration {
* validity will be verified with trust manager.
*
* @return Whether or not client authentication is required.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpSslClientAuth()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpSslClientAuth()}.
*/
@Deprecated
public boolean isRestTcpSslClientAuth() {
@@ -2662,7 +2662,7 @@ public class IgniteConfiguration {
* Sets flag indicating whether or not SSL client authentication is required.
*
* @param needClientAuth Whether or not client authentication is required.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSslClientAuth(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslClientAuth(boolean)}.
*/
@Deprecated
public void setRestTcpSslClientAuth(boolean needClientAuth) {
@@ -2674,7 +2674,7 @@ public class IgniteConfiguration {
*
* @return SslContextFactory instance.
* @see GridSslContextFactory
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSslContextFactory()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSslContextFactory()}.
*/
@Deprecated
public GridSslContextFactory getRestTcpSslContextFactory() {
@@ -2687,7 +2687,7 @@ public class IgniteConfiguration {
* {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
*
* @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSslContextFactory(GridSslContextFactory)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslContextFactory(GridSslContextFactory)}.
*/
@Deprecated
public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
@@ -2698,7 +2698,7 @@ public class IgniteConfiguration {
* Gets number of ports to try if configured port is already in use.
*
* @return Number of ports to try.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestPortRange()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestPortRange()}.
*/
@Deprecated
public int getRestPortRange() {
@@ -2709,7 +2709,7 @@ public class IgniteConfiguration {
* Sets number of ports to try if configured one is in use.
*
* @param restPortRange Port range.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestPortRange(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestPortRange(int)}.
*/
@Deprecated
public void setRestPortRange(int restPortRange) {
@@ -2725,7 +2725,7 @@ public class IgniteConfiguration {
* could not be detected and property is not specified, no restrictions applied.
*
* @return Array of folders that are allowed be read by remote clients.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestAccessibleFolders()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestAccessibleFolders()}.
*/
@Deprecated
public String[] getRestAccessibleFolders() {
@@ -2736,7 +2736,7 @@ public class IgniteConfiguration {
* Sets array of folders accessible by REST processor for log reading command.
*
* @param restAccessibleFolders Array of folder paths.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestAccessibleFolders(String...)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestAccessibleFolders(String...)}.
*/
@Deprecated
public void setRestAccessibleFolders(String... restAccessibleFolders) {
@@ -2757,7 +2757,7 @@ public class IgniteConfiguration {
*
* @return Thread pool implementation to be used for processing of client
* messages.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestExecutorService()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestExecutorService()}.
*/
@Deprecated
public ExecutorService getRestExecutorService() {
@@ -2769,7 +2769,7 @@ public class IgniteConfiguration {
*
* @param restExecSvc Thread pool to use for processing of client messages.
* @see IgniteConfiguration#getRestExecutorService()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestExecutorService(ExecutorService)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestExecutorService(ExecutorService)}.
*/
@Deprecated
public void setRestExecutorService(ExecutorService restExecSvc) {
@@ -2781,7 +2781,7 @@ public class IgniteConfiguration {
*
* @param restSvcShutdown REST executor service shutdown flag.
* @see IgniteConfiguration#getRestExecutorService()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestExecutorServiceShutdown(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestExecutorServiceShutdown(boolean)}.
*/
@Deprecated
public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
@@ -2796,7 +2796,7 @@ public class IgniteConfiguration {
* or by GridGain.
*
* @return REST executor service shutdown flag.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestExecutorServiceShutdown()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestExecutorServiceShutdown()}.
*/
@Deprecated
public boolean getRestExecutorServiceShutdown() {
@@ -2873,7 +2873,7 @@ public class IgniteConfiguration {
* Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
*
* @param restSecretKey REST secret key.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestSecretKey(String)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestSecretKey(String)}.
*/
@Deprecated
public void setRestSecretKey(String restSecretKey) {
@@ -2886,7 +2886,7 @@ public class IgniteConfiguration {
* @return Secret key.
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestSecretKey()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestSecretKey()}.
*/
@Deprecated
public String getRestSecretKey() {
@@ -2955,7 +2955,7 @@ public class IgniteConfiguration {
*
* @see GridClientMessageInterceptor
* @return Interceptor.
- * @deprecated Use {@link GridClientConnectionConfiguration#getClientMessageInterceptor()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getClientMessageInterceptor()}.
*/
@Deprecated
public GridClientMessageInterceptor getClientMessageInterceptor() {
@@ -2971,7 +2971,7 @@ public class IgniteConfiguration {
* access them from java code directly.
*
* @param interceptor Interceptor.
- * @deprecated Use {@link GridClientConnectionConfiguration#setClientMessageInterceptor(GridClientMessageInterceptor)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(GridClientMessageInterceptor)}.
*/
@Deprecated
public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
@@ -3113,14 +3113,14 @@ public class IgniteConfiguration {
/**
* @return Client connection configuration.
*/
- public GridClientConnectionConfiguration getClientConnectionConfiguration() {
+ public ClientConnectionConfiguration getClientConnectionConfiguration() {
return clientCfg;
}
/**
* @param clientCfg Client connection configuration.
*/
- public void setClientConnectionConfiguration(GridClientConnectionConfiguration clientCfg) {
+ public void setClientConnectionConfiguration(ClientConnectionConfiguration clientCfg) {
this.clientCfg = clientCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/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 632cd10..3401187 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
@@ -1383,12 +1383,12 @@ public class GridGainEx {
myCfg.setPluginConfigurations(cfg.getPluginConfigurations());
myCfg.setTransactionsConfiguration(new GridTransactionsConfiguration(cfg.getTransactionsConfiguration()));
- GridClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
+ ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
if (clientCfg == null) {
// If client config is not provided then create config copying values from GridConfiguration.
if (cfg.isRestEnabled()) {
- clientCfg = new GridClientConnectionConfiguration();
+ clientCfg = new ClientConnectionConfiguration();
clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor());
clientCfg.setRestAccessibleFolders(cfg.getRestAccessibleFolders());
@@ -1412,7 +1412,7 @@ public class GridGainEx {
}
}
else
- clientCfg = new GridClientConnectionConfiguration(clientCfg);
+ clientCfg = new ClientConnectionConfiguration(clientCfg);
String ntfStr = IgniteSystemProperties.getString(GG_LIFECYCLE_EMAIL_NOTIFY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/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 6a76027..274e589 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
@@ -1463,7 +1463,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
mgmtExecSvcMBean = registerExecutorMBean(cfg.getManagementExecutorService(), "GridManagementExecutor");
p2PExecSvcMBean = registerExecutorMBean(cfg.getPeerClassLoadingExecutorService(), "GridClassLoadingExecutor");
- GridClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
+ ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
if (clientCfg != null) {
restExecSvcMBean = clientCfg.getRestExecutorService() != null ?
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
index f3d5c69..d024d0a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
@@ -322,7 +322,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* Applies {@link GridClientMessageInterceptor}
- * from {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
+ * from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user parameters in the request.
*
* @param req Client request.
@@ -369,7 +369,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* Applies {@link GridClientMessageInterceptor} from
- * {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
+ * {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user objects in the response.
*
* @param res Response.
@@ -659,7 +659,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* @return Client configuration.
*/
- private GridClientConnectionConfiguration config() {
+ private ClientConnectionConfiguration config() {
return ctx.config().getClientConnectionConfiguration();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
index b2c662c..48ff406 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
@@ -137,7 +137,7 @@ public abstract class GridRestProtocolAdapter implements GridRestProtocol {
/**
* @return Client configuration.
*/
- protected GridClientConnectionConfiguration config() {
+ protected ClientConnectionConfiguration config() {
return ctx.config().getClientConnectionConfiguration();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 640c4ec..f3365b4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -146,7 +146,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
@Override public void start(final GridRestProtocolHandler hnd) throws GridException {
assert hnd != null;
- GridClientConnectionConfiguration cfg = ctx.config().getClientConnectionConfiguration();
+ ClientConnectionConfiguration cfg = ctx.config().getClientConnectionConfiguration();
assert cfg != null;
@@ -251,7 +251,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
* server was unable to start.
*/
private boolean startTcpServer(InetAddress hostAddr, int port, GridNioServerListener<GridClientMessage> lsnr,
- GridNioParser parser, @Nullable SSLContext sslCtx, GridClientConnectionConfiguration cfg) {
+ GridNioParser parser, @Nullable SSLContext sslCtx, ClientConnectionConfiguration cfg) {
try {
GridNioFilter codec = new GridNioCodecFilter(parser, log, true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
index 5a9eb1c..54380bf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
@@ -63,7 +63,7 @@ public class VisorExecutorServiceConfiguration implements Serializable {
cfg.p2pExecutorService(compactClass(c.getPeerClassLoadingExecutorService()));
cfg.p2pExecutorServiceShutdown(c.getSystemExecutorServiceShutdown());
- GridClientConnectionConfiguration cc = c.getClientConnectionConfiguration();
+ ClientConnectionConfiguration cc = c.getClientConnectionConfiguration();
if (cc != null) {
cfg.restExecutorService(compactClass(cc.getRestExecutorService()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
index 9f8e460..82237c7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
@@ -60,7 +60,7 @@ public class VisorRestConfiguration implements Serializable {
public static VisorRestConfiguration from(IgniteConfiguration c) {
VisorRestConfiguration cfg = new VisorRestConfiguration();
- GridClientConnectionConfiguration clnCfg = c.getClientConnectionConfiguration();
+ ClientConnectionConfiguration clnCfg = c.getClientConnectionConfiguration();
boolean restEnabled = clnCfg != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index dacdecc..f6d78f0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -145,7 +145,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
TestClientMessageInterceptor interceptor = new TestClientMessageInterceptor();
- GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration();
+ ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration();
clientCfg.setClientMessageInterceptor(interceptor);
[07/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/4f92f248
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f92f248
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f92f248
Branch: refs/heads/master
Commit: 4f92f248f0c5bde92fdf4cf9ea00c4c8a96c6cb2
Parents: 5dc4b6c
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:20:59 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:20:59 2014 +0300
----------------------------------------------------------------------
.../clients/src/test/resources/spring-cache.xml | 2 +-
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../GridClientConnectionConfiguration.java | 570 +++++++++++++++++++
.../grid/GridClientConnectionConfiguration.java | 570 -------------------
.../processors/rest/GridRestProcessor.java | 5 +-
.../rest/protocols/GridRestProtocolAdapter.java | 1 +
.../node/VisorExecutorServiceConfiguration.java | 1 -
.../visor/node/VisorRestConfiguration.java | 1 -
9 files changed, 577 insertions(+), 577 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index fa4c2fa..cfdce6a 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -64,7 +64,7 @@
<!-- Client configuration. -->
<property name="clientConnectionConfiguration">
- <bean class="org.gridgain.grid.GridClientConnectionConfiguration"/>
+ <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration"/>
</property>
<property name="cacheConfiguration">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index a9c05f4..819b41a 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -92,7 +92,7 @@
<!-- Client configuration. -->
<property name="clientConnectionConfiguration">
- <bean class="org.gridgain.grid.GridClientConnectionConfiguration">
+ <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration">
<!-- Configure TCP rest protocol. -->
<property name="restTcpPort" value="10080"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index 3c0a688..ae9717f 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -62,7 +62,7 @@
<!-- Client configuration. -->
<property name="clientConnectionConfiguration">
- <bean class="org.gridgain.grid.GridClientConnectionConfiguration">
+ <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration">
<!-- Configure TCP+SSL rest protocol. -->
<property name="restTcpSslEnabled" value="true"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
new file mode 100644
index 0000000..b17d3a3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
@@ -0,0 +1,570 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+import org.gridgain.client.ssl.*;
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+import java.net.*;
+import java.util.concurrent.*;
+
+/**
+ * REST access configuration.
+ */
+public class GridClientConnectionConfiguration {
+ /** Default TCP server port. */
+ public static final int DFLT_TCP_PORT = 11211;
+
+ /** Default TCP_NODELAY flag. */
+ public static final boolean DFLT_TCP_NODELAY = true;
+
+ /** Default TCP direct buffer flag. */
+ public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
+
+ /** Default REST idle timeout. */
+ public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
+
+ /** Default rest port range. */
+ public static final int DFLT_REST_PORT_RANGE = 100;
+
+ /** Default size of REST thread pool. */
+ public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+ /** Default max size of REST thread pool. */
+ public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+ /** Default max queue capacity of REST thread pool. */
+ public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
+
+ /** Default socket send and receive buffer size. */
+ public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
+
+ /** Jetty XML configuration path. */
+ private String jettyPath;
+
+ /** REST secret key. */
+ private String restSecretKey;
+
+ /** TCP host. */
+ private String restTcpHost;
+
+ /** TCP port. */
+ private int restTcpPort = DFLT_TCP_PORT;
+
+ /** TCP no delay flag. */
+ private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
+
+ /** REST TCP direct buffer flag. */
+ private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
+
+ /** REST TCP send buffer size. */
+ private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
+
+ /** REST TCP receive buffer size. */
+ private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
+
+ /** REST TCP send queue limit. */
+ private int restTcpSndQueueLimit;
+
+ /** REST TCP selector count. */
+ private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
+
+ /** Idle timeout. */
+ private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
+
+ /** SSL enable flag, default is disabled. */
+ private boolean restTcpSslEnabled;
+
+ /** SSL need client auth flag. */
+ private boolean restTcpSslClientAuth;
+
+ /** SSL context factory for rest binary server. */
+ private GridSslContextFactory restTcpSslCtxFactory;
+
+ /** Port range */
+ private int restPortRange = DFLT_REST_PORT_RANGE;
+
+ /** Folders accessible by REST. */
+ private String[] restAccessibleFolders;
+
+ /** REST requests executor service. */
+ private ExecutorService restExecSvc;
+
+ /** REST executor service shutdown flag. */
+ private boolean restSvcShutdown = true;
+
+ /** Client message interceptor. */
+ private GridClientMessageInterceptor clientMsgInterceptor;
+
+ /**
+ * Creates client connection configuration with all default values.
+ */
+ public GridClientConnectionConfiguration() {
+ // No-op.
+ }
+
+ /**
+ * Creates client connection configuration by copying all properties from
+ * given configuration.
+ *
+ * @param cfg Client configuration.
+ */
+ public GridClientConnectionConfiguration(GridClientConnectionConfiguration cfg) {
+ assert cfg != null;
+
+ clientMsgInterceptor = cfg.getClientMessageInterceptor();
+ restAccessibleFolders = cfg.getRestAccessibleFolders();
+ restExecSvc = cfg.getRestExecutorService();
+ restSvcShutdown = cfg.isRestExecutorServiceShutdown();
+ restIdleTimeout = cfg.getRestIdleTimeout();
+ jettyPath = cfg.getRestJettyPath();
+ restPortRange = cfg.getRestPortRange();
+ restSecretKey = cfg.getRestSecretKey();
+ restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
+ restTcpHost = cfg.getRestTcpHost();
+ restTcpNoDelay = cfg.isRestTcpNoDelay();
+ restTcpPort = cfg.getRestTcpPort();
+ restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
+ restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
+ restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
+ restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
+ restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
+ restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
+ restTcpSslEnabled = cfg.isRestTcpSslEnabled();
+ }
+
+ /**
+ * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
+ * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
+ * accessing GridGain APIs remotely.
+ *
+ * @param jettyPath Path to {@code JETTY} XML configuration file.
+ */
+ public void setRestJettyPath(String jettyPath) {
+ this.jettyPath = jettyPath;
+ }
+
+ /**
+ * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
+ * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
+ * 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}
+ * 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
+ */
+ public String getRestJettyPath() {
+ return jettyPath;
+ }
+
+ /**
+ * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
+ *
+ * @param restSecretKey REST secret key.
+ */
+ public void setRestSecretKey(@Nullable String restSecretKey) {
+ this.restSecretKey = restSecretKey;
+ }
+
+ /**
+ * 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
+ */
+ @Nullable public String getRestSecretKey() {
+ return restSecretKey;
+ }
+
+ /**
+ * Gets host for TCP binary protocol server. This can be either an
+ * IP address or a domain name.
+ * <p>
+ * If not defined, system-wide local address will be used
+ * (see {@link IgniteConfiguration#getLocalHost()}.
+ * <p>
+ * You can also use {@code 0.0.0.0} value to bind to all
+ * locally-available IP addresses.
+ *
+ * @return TCP host.
+ */
+ public String getRestTcpHost() {
+ return restTcpHost;
+ }
+
+ /**
+ * Sets host for TCP binary protocol server.
+ *
+ * @param restTcpHost TCP host.
+ */
+ public void setRestTcpHost(String restTcpHost) {
+ this.restTcpHost = restTcpHost;
+ }
+
+ /**
+ * Gets port for TCP binary protocol server.
+ * <p>
+ * Default is {@link #DFLT_TCP_PORT}.
+ *
+ * @return TCP port.
+ */
+ public int getRestTcpPort() {
+ return restTcpPort;
+ }
+
+ /**
+ * Sets port for TCP binary protocol server.
+ *
+ * @param restTcpPort TCP port.
+ */
+ public void setRestTcpPort(int restTcpPort) {
+ this.restTcpPort = restTcpPort;
+ }
+
+ /**
+ * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
+ * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
+ * For more information, see {@link Socket#setTcpNoDelay(boolean)}
+ * <p/>
+ * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
+ *
+ * @return Whether {@code TCP_NODELAY} option should be enabled.
+ */
+ public boolean isRestTcpNoDelay() {
+ return restTcpNoDelay;
+ }
+
+ /**
+ * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
+ *
+ * @param restTcpNoDelay {@code True} if option should be enabled.
+ * @see #isRestTcpNoDelay()
+ */
+ public void setRestTcpNoDelay(boolean restTcpNoDelay) {
+ this.restTcpNoDelay = restTcpNoDelay;
+ }
+
+ /**
+ * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
+ * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
+ * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
+ * size).
+ *
+ * @return Whether direct buffer should be used.
+ */
+ public boolean isRestTcpDirectBuffer() {
+ return restTcpDirectBuf;
+ }
+
+ /**
+ * Sets whether to use direct buffer for REST TCP server.
+ *
+ * @param restTcpDirectBuf {@code True} if option should be enabled.
+ * @see #isRestTcpDirectBuffer()
+ */
+ public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
+ this.restTcpDirectBuf = restTcpDirectBuf;
+ }
+
+ /**
+ * Gets REST TCP server send buffer size.
+ *
+ * @return REST TCP server send buffer size (0 for default).
+ */
+ public int getRestTcpSendBufferSize() {
+ return restTcpSndBufSize;
+ }
+
+ /**
+ * Sets REST TCP server send buffer size.
+ *
+ * @param restTcpSndBufSize Send buffer size.
+ * @see #getRestTcpSendBufferSize()
+ */
+ public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
+ this.restTcpSndBufSize = restTcpSndBufSize;
+ }
+
+ /**
+ * Gets REST TCP server receive buffer size.
+ *
+ * @return REST TCP server receive buffer size (0 for default).
+ */
+ public int getRestTcpReceiveBufferSize() {
+ return restTcpRcvBufSize;
+ }
+
+ /**
+ * Sets REST TCP server receive buffer size.
+ *
+ * @param restTcpRcvBufSize Receive buffer size.
+ * @see #getRestTcpReceiveBufferSize()
+ */
+ public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
+ this.restTcpRcvBufSize = restTcpRcvBufSize;
+ }
+
+ /**
+ * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
+ * block until the queue has enough capacity.
+ *
+ * @return REST TCP server send queue limit (0 for unlimited).
+ */
+ public int getRestTcpSendQueueLimit() {
+ return restTcpSndQueueLimit;
+ }
+
+ /**
+ * Sets REST TCP server send queue limit.
+ *
+ * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
+ * @see #getRestTcpSendQueueLimit()
+ */
+ public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
+ this.restTcpSndQueueLimit = restTcpSndQueueLimit;
+ }
+
+ /**
+ * Gets number of selector threads in REST TCP server. Higher value for this parameter
+ * may increase throughput, but also increases context switching.
+ *
+ * @return Number of selector threads for REST TCP server.
+ */
+ public int getRestTcpSelectorCount() {
+ return restTcpSelectorCnt;
+ }
+
+ /**
+ * Sets number of selector threads for REST TCP server.
+ *
+ * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
+ * @see #getRestTcpSelectorCount()
+ */
+ public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
+ this.restTcpSelectorCnt = restTcpSelectorCnt;
+ }
+
+ /**
+ * Gets idle timeout for REST server.
+ * <p>
+ * This setting is used to reject half-opened sockets. If no packets
+ * come within idle timeout, the connection is closed.
+ *
+ * @return Idle timeout in milliseconds.
+ */
+ public long getRestIdleTimeout() {
+ return restIdleTimeout;
+ }
+
+ /**
+ * Sets idle timeout for REST server.
+ *
+ * @param restIdleTimeout Idle timeout in milliseconds.
+ * @see #getRestIdleTimeout()
+ */
+ public void setRestIdleTimeout(long restIdleTimeout) {
+ this.restIdleTimeout = restIdleTimeout;
+ }
+
+ /**
+ * Whether secure socket layer should be enabled on binary rest server.
+ * <p>
+ * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
+ * should be provided, otherwise binary rest protocol will fail to start.
+ *
+ * @return {@code True} if SSL should be enabled.
+ */
+ public boolean isRestTcpSslEnabled() {
+ return restTcpSslEnabled;
+ }
+
+ /**
+ * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
+ * <p/>
+ * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
+ * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
+ *
+ * @param restTcpSslEnabled {@code True} if SSL should be enabled.
+ */
+ public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
+ this.restTcpSslEnabled = restTcpSslEnabled;
+ }
+
+ /**
+ * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
+ * validity will be verified with trust manager.
+ *
+ * @return Whether or not client authentication is required.
+ */
+ public boolean isRestTcpSslClientAuth() {
+ return restTcpSslClientAuth;
+ }
+
+ /**
+ * Sets flag indicating whether or not SSL client authentication is required.
+ *
+ * @param needClientAuth Whether or not client authentication is required.
+ */
+ public void setRestTcpSslClientAuth(boolean needClientAuth) {
+ restTcpSslClientAuth = needClientAuth;
+ }
+
+ /**
+ * Gets context factory that will be used for creating a secure socket layer of rest binary server.
+ *
+ * @return SslContextFactory instance.
+ * @see GridSslContextFactory
+ */
+ public GridSslContextFactory getRestTcpSslContextFactory() {
+ return restTcpSslCtxFactory;
+ }
+
+ /**
+ * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
+ * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
+ * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
+ *
+ * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
+ */
+ public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
+ this.restTcpSslCtxFactory = restTcpSslCtxFactory;
+ }
+
+ /**
+ * Gets number of ports to try if configured port is already in use.
+ *
+ * @return Number of ports to try.
+ */
+ public int getRestPortRange() {
+ return restPortRange;
+ }
+
+ /**
+ * Sets number of ports to try if configured one is in use.
+ *
+ * @param restPortRange Port range.
+ */
+ public void setRestPortRange(int restPortRange) {
+ this.restPortRange = restPortRange;
+ }
+
+ /**
+ * Gets list of folders that are accessible for log reading command. When remote client requests
+ * a log file, file path is checked against this list. If requested file is not located in any
+ * sub-folder of these folders, request is not processed.
+ * <p>
+ * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
+ * could not be detected and property is not specified, no restrictions applied.
+ *
+ * @return Array of folders that are allowed be read by remote clients.
+ */
+ public String[] getRestAccessibleFolders() {
+ return restAccessibleFolders;
+ }
+
+ /**
+ * Sets array of folders accessible by REST processor for log reading command.
+ *
+ * @param restAccessibleFolders Array of folder paths.
+ */
+ public void setRestAccessibleFolders(String... restAccessibleFolders) {
+ this.restAccessibleFolders = restAccessibleFolders;
+ }
+
+ /**
+ * Should return an instance of fully configured thread pool to be used for
+ * processing of client messages (REST requests).
+ * <p>
+ * If not provided, new executor service will be created using the following
+ * configuration:
+ * <ul>
+ * <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
+ * <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
+ * <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
+ * </ul>
+ *
+ * @return Thread pool implementation to be used for processing of client
+ * messages.
+ */
+ public ExecutorService getRestExecutorService() {
+ return restExecSvc;
+ }
+
+ /**
+ * Sets thread pool to use for processing of client messages (REST requests).
+ *
+ * @param restExecSvc Thread pool to use for processing of client messages.
+ * @see IgniteConfiguration#getRestExecutorService()
+ */
+ public void setRestExecutorService(ExecutorService restExecSvc) {
+ this.restExecSvc = restExecSvc;
+ }
+
+ /**
+ * Sets REST executor service shutdown flag.
+ *
+ * @param restSvcShutdown REST executor service shutdown flag.
+ * @see IgniteConfiguration#getRestExecutorService()
+ */
+ public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
+ this.restSvcShutdown = restSvcShutdown;
+ }
+
+ /**
+ * Shutdown flag for REST executor service.
+ * <p>
+ * If not provided, default value {@code true} will be used which will shutdown
+ * executor service when GridGain stops regardless whether it was started before GridGain
+ * or by GridGain.
+ *
+ * @return REST executor service shutdown flag.
+ */
+ public boolean isRestExecutorServiceShutdown() {
+ return restSvcShutdown;
+ }
+
+ /**
+ * Gets interceptor for objects, moving to and from remote clients.
+ * If this method returns {@code null} then no interception will be applied.
+ * <p>
+ * Setting interceptor allows to transform all objects exchanged via REST protocol.
+ * For example if you use custom serialisation on client you can write interceptor
+ * to transform binary representations received from client to Java objects and later
+ * access them from java code directly.
+ * <p>
+ * Default value is {@code null}.
+ *
+ * @see GridClientMessageInterceptor
+ * @return Interceptor.
+ */
+ @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
+ return clientMsgInterceptor;
+ }
+
+ /**
+ * Sets client message interceptor.
+ * <p>
+ * Setting interceptor allows to transform all objects exchanged via REST protocol.
+ * For example if you use custom serialisation on client you can write interceptor
+ * to transform binary representations received from client to Java objects and later
+ * access them from java code directly.
+ *
+ * @param interceptor Interceptor.
+ */
+ public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+ clientMsgInterceptor = interceptor;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/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
deleted file mode 100644
index 1f02ecf..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.configuration.*;
-import org.gridgain.client.ssl.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.concurrent.*;
-
-/**
- * REST access configuration.
- */
-public class GridClientConnectionConfiguration {
- /** Default TCP server port. */
- public static final int DFLT_TCP_PORT = 11211;
-
- /** Default TCP_NODELAY flag. */
- public static final boolean DFLT_TCP_NODELAY = true;
-
- /** Default TCP direct buffer flag. */
- public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
-
- /** Default REST idle timeout. */
- public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
-
- /** Default rest port range. */
- public static final int DFLT_REST_PORT_RANGE = 100;
-
- /** Default size of REST thread pool. */
- public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
- /** Default max size of REST thread pool. */
- public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
- /** Default max queue capacity of REST thread pool. */
- public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
-
- /** Default socket send and receive buffer size. */
- public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
-
- /** Jetty XML configuration path. */
- private String jettyPath;
-
- /** REST secret key. */
- private String restSecretKey;
-
- /** TCP host. */
- private String restTcpHost;
-
- /** TCP port. */
- private int restTcpPort = DFLT_TCP_PORT;
-
- /** TCP no delay flag. */
- private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
-
- /** REST TCP direct buffer flag. */
- private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
-
- /** REST TCP send buffer size. */
- private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
-
- /** REST TCP receive buffer size. */
- private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
-
- /** REST TCP send queue limit. */
- private int restTcpSndQueueLimit;
-
- /** REST TCP selector count. */
- private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
-
- /** Idle timeout. */
- private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
-
- /** SSL enable flag, default is disabled. */
- private boolean restTcpSslEnabled;
-
- /** SSL need client auth flag. */
- private boolean restTcpSslClientAuth;
-
- /** SSL context factory for rest binary server. */
- private GridSslContextFactory restTcpSslCtxFactory;
-
- /** Port range */
- private int restPortRange = DFLT_REST_PORT_RANGE;
-
- /** Folders accessible by REST. */
- private String[] restAccessibleFolders;
-
- /** REST requests executor service. */
- private ExecutorService restExecSvc;
-
- /** REST executor service shutdown flag. */
- private boolean restSvcShutdown = true;
-
- /** Client message interceptor. */
- private GridClientMessageInterceptor clientMsgInterceptor;
-
- /**
- * Creates client connection configuration with all default values.
- */
- public GridClientConnectionConfiguration() {
- // No-op.
- }
-
- /**
- * Creates client connection configuration by copying all properties from
- * given configuration.
- *
- * @param cfg Client configuration.
- */
- public GridClientConnectionConfiguration(GridClientConnectionConfiguration cfg) {
- assert cfg != null;
-
- clientMsgInterceptor = cfg.getClientMessageInterceptor();
- restAccessibleFolders = cfg.getRestAccessibleFolders();
- restExecSvc = cfg.getRestExecutorService();
- restSvcShutdown = cfg.isRestExecutorServiceShutdown();
- restIdleTimeout = cfg.getRestIdleTimeout();
- jettyPath = cfg.getRestJettyPath();
- restPortRange = cfg.getRestPortRange();
- restSecretKey = cfg.getRestSecretKey();
- restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
- restTcpHost = cfg.getRestTcpHost();
- restTcpNoDelay = cfg.isRestTcpNoDelay();
- restTcpPort = cfg.getRestTcpPort();
- restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
- restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
- restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
- restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
- restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
- restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
- restTcpSslEnabled = cfg.isRestTcpSslEnabled();
- }
-
- /**
- * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
- * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
- * accessing GridGain APIs remotely.
- *
- * @param jettyPath Path to {@code JETTY} XML configuration file.
- */
- public void setRestJettyPath(String jettyPath) {
- this.jettyPath = jettyPath;
- }
-
- /**
- * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
- * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
- * 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}
- * 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
- */
- public String getRestJettyPath() {
- return jettyPath;
- }
-
- /**
- * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
- *
- * @param restSecretKey REST secret key.
- */
- public void setRestSecretKey(@Nullable String restSecretKey) {
- this.restSecretKey = restSecretKey;
- }
-
- /**
- * 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
- */
- @Nullable public String getRestSecretKey() {
- return restSecretKey;
- }
-
- /**
- * Gets host for TCP binary protocol server. This can be either an
- * IP address or a domain name.
- * <p>
- * If not defined, system-wide local address will be used
- * (see {@link IgniteConfiguration#getLocalHost()}.
- * <p>
- * You can also use {@code 0.0.0.0} value to bind to all
- * locally-available IP addresses.
- *
- * @return TCP host.
- */
- public String getRestTcpHost() {
- return restTcpHost;
- }
-
- /**
- * Sets host for TCP binary protocol server.
- *
- * @param restTcpHost TCP host.
- */
- public void setRestTcpHost(String restTcpHost) {
- this.restTcpHost = restTcpHost;
- }
-
- /**
- * Gets port for TCP binary protocol server.
- * <p>
- * Default is {@link #DFLT_TCP_PORT}.
- *
- * @return TCP port.
- */
- public int getRestTcpPort() {
- return restTcpPort;
- }
-
- /**
- * Sets port for TCP binary protocol server.
- *
- * @param restTcpPort TCP port.
- */
- public void setRestTcpPort(int restTcpPort) {
- this.restTcpPort = restTcpPort;
- }
-
- /**
- * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
- * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
- * For more information, see {@link Socket#setTcpNoDelay(boolean)}
- * <p/>
- * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
- *
- * @return Whether {@code TCP_NODELAY} option should be enabled.
- */
- public boolean isRestTcpNoDelay() {
- return restTcpNoDelay;
- }
-
- /**
- * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
- *
- * @param restTcpNoDelay {@code True} if option should be enabled.
- * @see #isRestTcpNoDelay()
- */
- public void setRestTcpNoDelay(boolean restTcpNoDelay) {
- this.restTcpNoDelay = restTcpNoDelay;
- }
-
- /**
- * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
- * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
- * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
- * size).
- *
- * @return Whether direct buffer should be used.
- */
- public boolean isRestTcpDirectBuffer() {
- return restTcpDirectBuf;
- }
-
- /**
- * Sets whether to use direct buffer for REST TCP server.
- *
- * @param restTcpDirectBuf {@code True} if option should be enabled.
- * @see #isRestTcpDirectBuffer()
- */
- public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
- this.restTcpDirectBuf = restTcpDirectBuf;
- }
-
- /**
- * Gets REST TCP server send buffer size.
- *
- * @return REST TCP server send buffer size (0 for default).
- */
- public int getRestTcpSendBufferSize() {
- return restTcpSndBufSize;
- }
-
- /**
- * Sets REST TCP server send buffer size.
- *
- * @param restTcpSndBufSize Send buffer size.
- * @see #getRestTcpSendBufferSize()
- */
- public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
- this.restTcpSndBufSize = restTcpSndBufSize;
- }
-
- /**
- * Gets REST TCP server receive buffer size.
- *
- * @return REST TCP server receive buffer size (0 for default).
- */
- public int getRestTcpReceiveBufferSize() {
- return restTcpRcvBufSize;
- }
-
- /**
- * Sets REST TCP server receive buffer size.
- *
- * @param restTcpRcvBufSize Receive buffer size.
- * @see #getRestTcpReceiveBufferSize()
- */
- public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
- this.restTcpRcvBufSize = restTcpRcvBufSize;
- }
-
- /**
- * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
- * block until the queue has enough capacity.
- *
- * @return REST TCP server send queue limit (0 for unlimited).
- */
- public int getRestTcpSendQueueLimit() {
- return restTcpSndQueueLimit;
- }
-
- /**
- * Sets REST TCP server send queue limit.
- *
- * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
- * @see #getRestTcpSendQueueLimit()
- */
- public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
- this.restTcpSndQueueLimit = restTcpSndQueueLimit;
- }
-
- /**
- * Gets number of selector threads in REST TCP server. Higher value for this parameter
- * may increase throughput, but also increases context switching.
- *
- * @return Number of selector threads for REST TCP server.
- */
- public int getRestTcpSelectorCount() {
- return restTcpSelectorCnt;
- }
-
- /**
- * Sets number of selector threads for REST TCP server.
- *
- * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
- * @see #getRestTcpSelectorCount()
- */
- public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
- this.restTcpSelectorCnt = restTcpSelectorCnt;
- }
-
- /**
- * Gets idle timeout for REST server.
- * <p>
- * This setting is used to reject half-opened sockets. If no packets
- * come within idle timeout, the connection is closed.
- *
- * @return Idle timeout in milliseconds.
- */
- public long getRestIdleTimeout() {
- return restIdleTimeout;
- }
-
- /**
- * Sets idle timeout for REST server.
- *
- * @param restIdleTimeout Idle timeout in milliseconds.
- * @see #getRestIdleTimeout()
- */
- public void setRestIdleTimeout(long restIdleTimeout) {
- this.restIdleTimeout = restIdleTimeout;
- }
-
- /**
- * Whether secure socket layer should be enabled on binary rest server.
- * <p>
- * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
- * should be provided, otherwise binary rest protocol will fail to start.
- *
- * @return {@code True} if SSL should be enabled.
- */
- public boolean isRestTcpSslEnabled() {
- return restTcpSslEnabled;
- }
-
- /**
- * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
- * <p/>
- * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
- * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
- *
- * @param restTcpSslEnabled {@code True} if SSL should be enabled.
- */
- public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
- this.restTcpSslEnabled = restTcpSslEnabled;
- }
-
- /**
- * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
- * validity will be verified with trust manager.
- *
- * @return Whether or not client authentication is required.
- */
- public boolean isRestTcpSslClientAuth() {
- return restTcpSslClientAuth;
- }
-
- /**
- * Sets flag indicating whether or not SSL client authentication is required.
- *
- * @param needClientAuth Whether or not client authentication is required.
- */
- public void setRestTcpSslClientAuth(boolean needClientAuth) {
- restTcpSslClientAuth = needClientAuth;
- }
-
- /**
- * Gets context factory that will be used for creating a secure socket layer of rest binary server.
- *
- * @return SslContextFactory instance.
- * @see GridSslContextFactory
- */
- public GridSslContextFactory getRestTcpSslContextFactory() {
- return restTcpSslCtxFactory;
- }
-
- /**
- * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
- * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
- * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
- *
- * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
- */
- public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
- this.restTcpSslCtxFactory = restTcpSslCtxFactory;
- }
-
- /**
- * Gets number of ports to try if configured port is already in use.
- *
- * @return Number of ports to try.
- */
- public int getRestPortRange() {
- return restPortRange;
- }
-
- /**
- * Sets number of ports to try if configured one is in use.
- *
- * @param restPortRange Port range.
- */
- public void setRestPortRange(int restPortRange) {
- this.restPortRange = restPortRange;
- }
-
- /**
- * Gets list of folders that are accessible for log reading command. When remote client requests
- * a log file, file path is checked against this list. If requested file is not located in any
- * sub-folder of these folders, request is not processed.
- * <p>
- * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
- * could not be detected and property is not specified, no restrictions applied.
- *
- * @return Array of folders that are allowed be read by remote clients.
- */
- public String[] getRestAccessibleFolders() {
- return restAccessibleFolders;
- }
-
- /**
- * Sets array of folders accessible by REST processor for log reading command.
- *
- * @param restAccessibleFolders Array of folder paths.
- */
- public void setRestAccessibleFolders(String... restAccessibleFolders) {
- this.restAccessibleFolders = restAccessibleFolders;
- }
-
- /**
- * Should return an instance of fully configured thread pool to be used for
- * processing of client messages (REST requests).
- * <p>
- * If not provided, new executor service will be created using the following
- * configuration:
- * <ul>
- * <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
- * <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
- * <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
- * </ul>
- *
- * @return Thread pool implementation to be used for processing of client
- * messages.
- */
- public ExecutorService getRestExecutorService() {
- return restExecSvc;
- }
-
- /**
- * Sets thread pool to use for processing of client messages (REST requests).
- *
- * @param restExecSvc Thread pool to use for processing of client messages.
- * @see IgniteConfiguration#getRestExecutorService()
- */
- public void setRestExecutorService(ExecutorService restExecSvc) {
- this.restExecSvc = restExecSvc;
- }
-
- /**
- * Sets REST executor service shutdown flag.
- *
- * @param restSvcShutdown REST executor service shutdown flag.
- * @see IgniteConfiguration#getRestExecutorService()
- */
- public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
- this.restSvcShutdown = restSvcShutdown;
- }
-
- /**
- * Shutdown flag for REST executor service.
- * <p>
- * If not provided, default value {@code true} will be used which will shutdown
- * executor service when GridGain stops regardless whether it was started before GridGain
- * or by GridGain.
- *
- * @return REST executor service shutdown flag.
- */
- public boolean isRestExecutorServiceShutdown() {
- return restSvcShutdown;
- }
-
- /**
- * Gets interceptor for objects, moving to and from remote clients.
- * If this method returns {@code null} then no interception will be applied.
- * <p>
- * Setting interceptor allows to transform all objects exchanged via REST protocol.
- * For example if you use custom serialisation on client you can write interceptor
- * to transform binary representations received from client to Java objects and later
- * access them from java code directly.
- * <p>
- * Default value is {@code null}.
- *
- * @see GridClientMessageInterceptor
- * @return Interceptor.
- */
- @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
- return clientMsgInterceptor;
- }
-
- /**
- * Sets client message interceptor.
- * <p>
- * Setting interceptor allows to transform all objects exchanged via REST protocol.
- * For example if you use custom serialisation on client you can write interceptor
- * to transform binary representations received from client to Java objects and later
- * access them from java code directly.
- *
- * @param interceptor Interceptor.
- */
- public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
- clientMsgInterceptor = interceptor;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
index a62c2bc..f3d5c69 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.rest;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
@@ -321,7 +322,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* Applies {@link GridClientMessageInterceptor}
- * from {@link GridClientConnectionConfiguration#getClientMessageInterceptor()}
+ * from {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user parameters in the request.
*
* @param req Client request.
@@ -368,7 +369,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* Applies {@link GridClientMessageInterceptor} from
- * {@link GridClientConnectionConfiguration#getClientMessageInterceptor()}
+ * {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user objects in the response.
*
* @param res Response.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
index b6617ba..b2c662c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
@@ -10,6 +10,7 @@
package org.gridgain.grid.kernal.processors.rest.protocols;
import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
index b18df29..5a9eb1c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
@@ -10,7 +10,6 @@
package org.gridgain.grid.kernal.visor.node;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
index 7df33b4..9f8e460 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
@@ -10,7 +10,6 @@
package org.gridgain.grid.kernal.visor.node;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
[06/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/5dc4b6c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5dc4b6c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5dc4b6c7
Branch: refs/heads/master
Commit: 5dc4b6c7bb5967a16bf541befbe6a746d1d9f006
Parents: 0b43b17
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:19:50 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:19:50 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteState.java | 2 +-
.../main/java/org/apache/ignite/Ignition.java | 3 +-
.../apache/ignite/lifecycle/IgniteListener.java | 29 ++++++++++++++++++++
.../startup/cmdline/CommandLineStartup.java | 2 +-
.../java/org/gridgain/grid/IgniteListener.java | 29 --------------------
.../org/gridgain/grid/kernal/GridGainEx.java | 3 +-
.../cmdline/GridCommandLineLoaderTest.java | 2 +-
.../grid/kernal/GridFactoryVmShutdownTest.java | 1 +
.../startup/GridRandomCommandLineLoader.java | 1 +
.../main/scala/org/gridgain/visor/visor.scala | 1 +
10 files changed, 39 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/core/src/main/java/org/apache/ignite/IgniteState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteState.java b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
index 347262a..5a067ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteState.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.*;
/**
* Possible states of {@link org.apache.ignite.Ignition}. You can register a listener for
- * state change notifications via {@link org.apache.ignite.Ignition#addListener(org.gridgain.grid.IgniteListener)}
+ * state change notifications via {@link org.apache.ignite.Ignition#addListener(org.apache.ignite.lifecycle.IgniteListener)}
* method.
*/
public enum IgniteState {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 18fa62d..9fc710f 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -10,6 +10,7 @@
package org.apache.ignite;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.lifecycle.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
import org.jetbrains.annotations.*;
@@ -398,7 +399,7 @@ public class Ignition {
}
/**
- * Removes lsnr added by {@link #addListener(org.gridgain.grid.IgniteListener)} method.
+ * Removes lsnr added by {@link #addListener(org.apache.ignite.lifecycle.IgniteListener)} method.
*
* @param lsnr Listener to remove.
* @return {@code true} if lsnr was added before, {@code false} otherwise.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/core/src/main/java/org/apache/ignite/lifecycle/IgniteListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/IgniteListener.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/IgniteListener.java
new file mode 100644
index 0000000..3914916
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/IgniteListener.java
@@ -0,0 +1,29 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.lifecycle;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+import java.util.*;
+
+/**
+ * Listener for gird state change notifications. Use
+ * {@link org.apache.ignite.Ignition#addListener(IgniteListener)} to register this
+ * listener with grid factory.
+ */
+public interface IgniteListener extends EventListener {
+ /**
+ * Listener for grid factory state change notifications.
+ *
+ * @param name Grid name ({@code null} for default un-named grid).
+ * @param state New state.
+ */
+ public void onStateChange(@Nullable String name, IgniteState state);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/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 0c21651..e3dc78d 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
@@ -10,7 +10,7 @@
package org.apache.ignite.startup.cmdline;
import org.apache.ignite.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.lifecycle.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.typedef.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java b/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
deleted file mode 100644
index 272fffb..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-import java.util.*;
-
-/**
- * Listener for gird state change notifications. Use
- * {@link org.apache.ignite.Ignition#addListener(IgniteListener)} to register this
- * listener with grid factory.
- */
-public interface IgniteListener extends EventListener {
- /**
- * Listener for grid factory state change notifications.
- *
- * @param name Grid name ({@code null} for default un-named grid).
- * @param state New state.
- */
- public void onStateChange(@Nullable String name, IgniteState state);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/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 6d9218b..632cd10 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
@@ -13,6 +13,7 @@ import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.lifecycle.*;
import org.apache.ignite.logger.*;
import org.apache.ignite.logger.java.*;
import org.apache.ignite.marshaller.*;
@@ -985,7 +986,7 @@ public class GridGainEx {
}
/**
- * Removes lsnr added by {@link #addListener(org.gridgain.grid.IgniteListener)} method.
+ * Removes lsnr added by {@link #addListener(org.apache.ignite.lifecycle.IgniteListener)} method.
*
* @param lsnr Listener to remove.
* @return {@code true} if lsnr was added before, {@code false} otherwise.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
index 86f054b..a87421e 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
@@ -10,7 +10,7 @@
package org.apache.ignite.startup.cmdline;
import org.apache.ignite.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.lifecycle.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
index 6f84500..6409886 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.kernal;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.lifecycle.*;
import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.*;
import org.jetbrains.annotations.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
index fccaa5e..6419869 100644
--- a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
+++ b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
@@ -12,6 +12,7 @@ package org.gridgain.startup;
import org.apache.commons.cli.*;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.lifecycle.*;
import org.apache.log4j.*;
import org.apache.log4j.varia.*;
import org.gridgain.grid.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc4b6c7/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
index 4cd093c..142db0c 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
@@ -11,6 +11,7 @@
package org.gridgain.visor
+import org.apache.ignite.lifecycle.IgniteListener
import org.apache.ignite.thread.IgniteThreadPoolExecutor
import org.apache.ignite.{IgniteSystemProperties, IgniteState, Ignition}
import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode}
[05/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/0b43b173
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b43b173
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b43b173
Branch: refs/heads/master
Commit: 0b43b1737de74af7935a8c990658f1c96ae742ff
Parents: 8229484
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:19:07 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:19:07 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteState.java | 2 +-
.../main/java/org/apache/ignite/Ignition.java | 6 ++--
.../startup/cmdline/CommandLineStartup.java | 2 +-
.../org/gridgain/grid/GridGainListener.java | 29 --------------------
.../java/org/gridgain/grid/IgniteListener.java | 29 ++++++++++++++++++++
.../org/gridgain/grid/kernal/GridGainEx.java | 10 +++----
.../cmdline/GridCommandLineLoaderTest.java | 2 +-
.../grid/kernal/GridFactoryVmShutdownTest.java | 2 +-
.../startup/GridRandomCommandLineLoader.java | 2 +-
.../grid/kernal/GridFactorySelfTest.java | 4 +--
.../main/scala/org/gridgain/visor/visor.scala | 4 +--
11 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/apache/ignite/IgniteState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteState.java b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
index 7e849c0..347262a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteState.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.*;
/**
* Possible states of {@link org.apache.ignite.Ignition}. You can register a listener for
- * state change notifications via {@link org.apache.ignite.Ignition#addListener(org.gridgain.grid.GridGainListener)}
+ * state change notifications via {@link org.apache.ignite.Ignition#addListener(org.gridgain.grid.IgniteListener)}
* method.
*/
public enum IgniteState {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 55bcd52..18fa62d 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -393,17 +393,17 @@ public class Ignition {
* @param lsnr Listener for grid life cycle events. If this listener was already added
* this method is no-op.
*/
- public static void addListener(GridGainListener lsnr) {
+ public static void addListener(IgniteListener lsnr) {
GridGainEx.addListener(lsnr);
}
/**
- * Removes lsnr added by {@link #addListener(GridGainListener)} method.
+ * Removes lsnr added by {@link #addListener(org.gridgain.grid.IgniteListener)} method.
*
* @param lsnr Listener to remove.
* @return {@code true} if lsnr was added before, {@code false} otherwise.
*/
- public static boolean removeListener(GridGainListener lsnr) {
+ public static boolean removeListener(IgniteListener lsnr) {
return GridGainEx.removeListener(lsnr);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/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 5f1dab0..0c21651 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
@@ -295,7 +295,7 @@ public final class CommandLineStartup {
// Exit latch for the grid loaded from the command line.
final CountDownLatch latch = new CountDownLatch(1);
- G.addListener(new GridGainListener() {
+ G.addListener(new IgniteListener() {
@Override public void onStateChange(String name, IgniteState state) {
// Skip all grids except loaded from the command line.
if (!F.eq(gridName, name))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java b/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java
deleted file mode 100644
index 498da87..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-import java.util.*;
-
-/**
- * Listener for gird state change notifications. Use
- * {@link org.apache.ignite.Ignition#addListener(GridGainListener)} to register this
- * listener with grid factory.
- */
-public interface GridGainListener extends EventListener {
- /**
- * Listener for grid factory state change notifications.
- *
- * @param name Grid name ({@code null} for default un-named grid).
- * @param state New state.
- */
- public void onStateChange(@Nullable String name, IgniteState state);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java b/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
new file mode 100644
index 0000000..272fffb
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
@@ -0,0 +1,29 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+import java.util.*;
+
+/**
+ * Listener for gird state change notifications. Use
+ * {@link org.apache.ignite.Ignition#addListener(IgniteListener)} to register this
+ * listener with grid factory.
+ */
+public interface IgniteListener extends EventListener {
+ /**
+ * Listener for grid factory state change notifications.
+ *
+ * @param name Grid name ({@code null} for default un-named grid).
+ * @param state New state.
+ */
+ public void onStateChange(@Nullable String name, IgniteState state);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/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 233f726..6d9218b 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
@@ -120,7 +120,7 @@ public class GridGainEx {
private static volatile IgniteState dfltGridState;
/** List of state listeners. */
- private static final Collection<GridGainListener> lsnrs = new GridConcurrentHashSet<>(4);
+ private static final Collection<IgniteListener> lsnrs = new GridConcurrentHashSet<>(4);
/** */
private static volatile boolean daemon;
@@ -978,19 +978,19 @@ public class GridGainEx {
* @param lsnr Listener for grid life cycle events. If this listener was already added
* this method is no-op.
*/
- public static void addListener(GridGainListener lsnr) {
+ public static void addListener(IgniteListener lsnr) {
A.notNull(lsnr, "lsnr");
lsnrs.add(lsnr);
}
/**
- * Removes lsnr added by {@link #addListener(GridGainListener)} method.
+ * Removes lsnr added by {@link #addListener(org.gridgain.grid.IgniteListener)} method.
*
* @param lsnr Listener to remove.
* @return {@code true} if lsnr was added before, {@code false} otherwise.
*/
- public static boolean removeListener(GridGainListener lsnr) {
+ public static boolean removeListener(IgniteListener lsnr) {
A.notNull(lsnr, "lsnr");
return lsnrs.remove(lsnr);
@@ -1006,7 +1006,7 @@ public class GridGainEx {
else
dfltGridState = state;
- for (GridGainListener lsnr : lsnrs)
+ for (IgniteListener lsnr : lsnrs)
lsnr.onStateChange(gridName, state);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
index acae15b..86f054b 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
@@ -42,7 +42,7 @@ public class GridCommandLineLoaderTest extends GridCommonAbstractTest {
info("Loading Grid from configuration file: " + path);
- G.addListener(new GridGainListener() {
+ G.addListener(new IgniteListener() {
@Override public void onStateChange(String name, IgniteState state) {
if (state == STARTED) {
info("Received started notification from grid: " + name);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
index d743c38..6f84500 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
@@ -37,7 +37,7 @@ public class GridFactoryVmShutdownTest {
public static void main(String[] args) throws Exception {
final ConcurrentMap<String, IgniteState> states = new ConcurrentHashMap<>();
- G.addListener(new GridGainListener() {
+ G.addListener(new IgniteListener() {
@Override public void onStateChange(@Nullable String name, IgniteState state) {
if (state == STARTED) {
IgniteState state0 = states.put(maskNull(name), STARTED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
index cf9a8fb..fccaa5e 100644
--- a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
+++ b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
@@ -216,7 +216,7 @@ public final class GridRandomCommandLineLoader {
System.out.println("Minimum TTL: " + minTtl);
System.out.println("Maximum TTL: " + maxTtl);
- G.addListener(new GridGainListener() {
+ G.addListener(new IgniteListener() {
@Override public void onStateChange(String name, IgniteState state) {
if (state == STOPPED && latch != null)
latch.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index c693d83..8ec6171 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -216,7 +216,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
final Object mux = new Object();
- GridGainListener factoryLsnr = new GridGainListener() {
+ IgniteListener factoryLsnr = new IgniteListener() {
@Override public void onStateChange(String name, IgniteState state) {
synchronized (mux) {
if ("grid-factory-test-1".equals(name))
@@ -349,7 +349,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
final AtomicInteger startedCnt = new AtomicInteger();
final AtomicInteger stoppedCnt = new AtomicInteger();
- GridGainListener lsnr = new GridGainListener() {
+ IgniteListener lsnr = new IgniteListener() {
@SuppressWarnings("StringEquality")
@Override public void onStateChange(@Nullable String name, IgniteState state) {
assert name == gridName;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
index 9f7e524..4cd093c 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
@@ -150,7 +150,7 @@ object visor extends VisorTag {
private var nodeSegLsnr: IgnitePredicate[IgniteEvent] = null
/** Node stop listener. */
- private var nodeStopLsnr: GridGainListener = null
+ private var nodeStopLsnr: IgniteListener = null
/** Visor copyright blurb. */
private final val COPYRIGHT = GridProductImpl.COPYRIGHT
@@ -1700,7 +1700,7 @@ object visor extends VisorTag {
grid.events().localListen(nodeSegLsnr, EVT_NODE_SEGMENTED)
- nodeStopLsnr = new GridGainListener {
+ nodeStopLsnr = new IgniteListener {
def onStateChange(name: String, state: IgniteState) {
if (name == grid.name && state == IgniteState.STOPPED) {
warn("Closing Visor console due to stopping of host grid instance.")
[03/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 5139c89..62f18ef 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-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.GridDhtPartitionState.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 116d880..9adb95c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -28,7 +28,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Colocated get future.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 1fc068d..87ef7c2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -38,7 +38,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
import static org.gridgain.grid.cache.GridCachePeekMode.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
index ff72387..7815538 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheFlag.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
index 51476dd..83a2350 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -29,7 +29,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
index a1b6d97..bdaacd6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.*;
import java.util.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.apache.ignite.fs.IgniteFsMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
index a6bcc4e..468f584 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
@@ -37,7 +37,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.GridTopic.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
index 18d7b1a..1edfd9b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/jobmetrics/GridJobMetricsProcessor.java
@@ -19,7 +19,7 @@ import org.jdk8.backport.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Processes job metrics.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
index c153427..1f2a7b5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -38,7 +38,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.GridTopic.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
index 0c6f5be..e02c194 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.*;
import javax.management.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.processors.license.GridLicenseSubsystem.*;
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/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java
index 2c4dd4c..629bcba 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorBasicConfiguration.java
@@ -18,7 +18,7 @@ import java.io.*;
import java.util.*;
import static java.lang.System.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
index f6c99f0..f165bba 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorEmailConfiguration.java
@@ -15,7 +15,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import static java.lang.System.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
index 272f31e..8255ad1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorLifecycleConfiguration.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
index 9e248f4..7df33b4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
import static java.lang.System.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
index 026125f..95b5591 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
@@ -32,7 +32,7 @@ import java.nio.*;
import java.text.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
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/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index 0975395..b2ef6d2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -42,7 +42,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.apache.ignite.events.IgniteEventType.*;
/**
@@ -962,7 +962,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
* Sets the minimum number of messages for this SPI, that are buffered
* prior to sending.
* <p>
- * Defaults to either {@code 512} or {@link org.gridgain.grid.IgniteSystemProperties#GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT}
+ * Defaults to either {@code 512} or {@link org.apache.ignite.IgniteSystemProperties#GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT}
* system property (if specified).
*
* @param minBufferedMsgCnt Minimum buffered message count.
@@ -981,7 +981,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
* Sets the buffer size ratio for this SPI. As messages are sent,
* the buffer size is adjusted using this ratio.
* <p>
- * Defaults to either {@code 0.8} or {@link org.gridgain.grid.IgniteSystemProperties#GG_COMMUNICATION_BUF_RESIZE_RATIO}
+ * Defaults to either {@code 0.8} or {@link org.apache.ignite.IgniteSystemProperties#GG_COMMUNICATION_BUF_RESIZE_RATIO}
* system property (if specified).
*
* @param bufSizeRatio Buffer size ratio.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index 19f9295..c611be4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -26,7 +26,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.spi.GridPortProtocol.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
index 8af6f7f..efc54e7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
@@ -21,7 +21,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* IP Finder which works only with pre-configured list of IP addresses specified
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java b/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
index 2453708..f47ede5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridConcurrentFactory.java
@@ -9,12 +9,12 @@
package org.gridgain.grid.util;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.jdk8.backport.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Concurrent map factory.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java b/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
index 9cb6bad..c6f3a94 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridReflectionCache.java
@@ -18,7 +18,7 @@ import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Reflection field and method cache for classes.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index c5765df..6573250 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -65,7 +65,7 @@ import java.util.logging.*;
import java.util.regex.*;
import java.util.zip.*;
-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.GridNodeAttributes.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
index 9bbd9f2..c38861a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFinishedFuture.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.util.future;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
@@ -18,7 +19,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Future that is completed at creation time.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
index 826d465..7d41038 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
@@ -23,7 +23,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Future adapter.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
index be3719f..f0dc78a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataInput.java
@@ -16,7 +16,7 @@ import sun.misc.*;
import java.io.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Data input based on {@code Unsafe} operations.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
index f39a21d..282ec1f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/io/GridUnsafeDataOutput.java
@@ -15,7 +15,7 @@ import sun.misc.*;
import java.io.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Data output based on {@code Unsafe} operations.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
index a786559..616ed99 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
@@ -18,7 +18,7 @@ import java.nio.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java b/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
index 8d40249..5d8f389 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafeMemory.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.util.offheap.unsafe;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.offheap.*;
@@ -19,7 +19,7 @@ import sun.misc.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.util.offheap.GridOffHeapEvent.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java b/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
index c63e1f9..39da13b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/portscanner/GridJmxPortFinder.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.util.portscanner;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import java.io.*;
import java.net.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java b/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
index f32de6d..b5b4c71 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/typedef/X.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.util.typedef;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.util.*;
@@ -21,7 +22,7 @@ import java.lang.reflect.*;
import java.sql.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Defines global scope.
@@ -185,7 +186,7 @@ public final class X {
* @return Value of the system property or environment variable.
* Returns the default value if neither can be found for given name.
* @deprecated This method will be removed in the next major release.
- * Use {@link org.gridgain.grid.IgniteSystemProperties#getString(String)} instead.
+ * Use {@link org.apache.ignite.IgniteSystemProperties#getString(String)} instead.
*/
@Deprecated
@Nullable public static String getSystemOrEnv(String name, String dflt) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
index 6c20d50..1ae3145 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridHomePathSelfTest.java
@@ -13,7 +13,7 @@ import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
index 0ee6a3a..856abfc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
@@ -18,7 +18,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.concurrent.*;
import static java.util.concurrent.TimeUnit.*;
-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.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
index 7a8ce0a..12fb483 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
@@ -14,7 +14,7 @@ import org.apache.ignite.product.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Tests version methods.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 9c5e2fc..654eafa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Tests that removes are not lost when topology changes.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
index 57a76be..7451bd5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
@@ -20,7 +20,7 @@ import org.gridgain.testframework.junits.common.*;
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.GridCacheMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
index db8d0cf..f449255 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
@@ -22,7 +22,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Test to check slow TX warning timeout defined by
- * {@link org.gridgain.grid.IgniteSystemProperties#GG_SLOW_TX_WARN_TIMEOUT}
+ * {@link org.apache.ignite.IgniteSystemProperties#GG_SLOW_TX_WARN_TIMEOUT}
* system property.
*/
public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index 53188e5..67f4501 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -17,7 +17,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.GridCacheAtomicWriteOrderMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index af5c406..3b8343b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -25,7 +25,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.*;
import static org.apache.ignite.IgniteState.*;
-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.GridCacheTxIsolation.*;
import static org.apache.ignite.events.IgniteEventType.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 380f61b..22ed2c8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -25,7 +25,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.*;
-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.GridCacheTxIsolation.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
index 1990ef4..3ed8536 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
@@ -13,7 +13,6 @@ import junit.framework.*;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.logger.java.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.spi.discovery.tcp.*;
import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
@@ -23,7 +22,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.util.GridUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
index 1955700..21c689f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
@@ -12,7 +12,6 @@ import junit.framework.*;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.logger.java.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.spi.discovery.tcp.*;
import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
@@ -20,7 +19,7 @@ import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.util.GridUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
index ccaafed..c4da694 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/io/GridUnsafeDataOutputArraySizingSelfTest.java
@@ -11,7 +11,7 @@ package org.gridgain.grid.util.io;
import org.gridgain.testframework.junits.common.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Test for {@link GridUnsafeDataOutput}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
index abf1c53..dc33cc2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.util.ipc.shmem;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.testframework.junits.common.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
index 0ae1f8b..26a3b47 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryUtilsSelfTest.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.util.ipc.shmem;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.testframework.junits.common.*;
import java.io.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java b/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
index 4603d1d..8399c95 100644
--- a/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
+++ b/modules/core/src/test/java/org/gridgain/startup/GridVmNodesStarter.java
@@ -26,7 +26,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.*;
/**
* This class
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
index ef414f4..1f8acb5 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
@@ -9,9 +9,9 @@
package org.gridgain.testframework.junits.logger;
+import org.apache.ignite.*;
import org.apache.ignite.logger.*;
import org.apache.log4j.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
index 670709d..b47edeb 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
@@ -27,7 +27,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Log4j-based implementation for logging. This logger should be used
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
index 0611518..9b276a5 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.hadoop;
import com.google.common.base.Joiner;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.ggfs.*;
import org.gridgain.grid.kernal.processors.hadoop.counter.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java b/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
index dc1d69b..1bbbd4a 100644
--- a/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
+++ b/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridHadoopTestSuite.java
@@ -12,8 +12,8 @@ package org.gridgain.testsuites.bamboo;
import junit.framework.*;
import org.apache.commons.compress.archivers.tar.*;
import org.apache.commons.compress.compressors.gzip.*;
+import org.apache.ignite.*;
import org.gridgain.client.hadoop.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.ggfs.*;
import org.gridgain.grid.kernal.processors.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.shuffle.collections.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
index f25b86f..580ce6e 100644
--- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
+++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
@@ -44,7 +44,7 @@ import java.text.*;
import java.util.*;
import java.util.concurrent.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.spi.indexing.GridIndexType.*;
import static org.gridgain.grid.spi.indexing.h2.opt.GridH2AbstractKeyValueRow.*;
import static org.h2.result.SortOrder.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
index d7bc09b..149ca85 100644
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
@@ -27,7 +27,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Log4j-based implementation for logging. This logger should be used
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
index 0ed9d0b..efbb681 100644
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
@@ -9,8 +9,8 @@
package org.apache.ignite.logger.log4j;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
index 6a2b801..9e74625 100644
--- a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
+++ b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.kernal.processors.rest.protocols.http.jetty;
+import org.apache.ignite.*;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.util.*;
import org.eclipse.jetty.util.log.*;
@@ -28,7 +29,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.spi.GridPortProtocol.*;
/**
@@ -164,7 +165,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter {
}
/**
- * Checks {@link org.gridgain.grid.IgniteSystemProperties#GG_JETTY_PORT} system property
+ * Checks {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT} system property
* and overrides default connector port if it present.
* Then initializes {@code port} with the found value.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
index 06ce01b..b2be288 100644
--- a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.*;
import java.util.regex.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Implementation of {@link org.apache.ignite.scheduler.SchedulerFuture} interface.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index f19d117..c693d83 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -44,7 +44,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.IgniteState.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* Tests for {@link org.apache.ignite.Ignition}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
index 7d0c4f1..2189f3e 100644
--- a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
+++ b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
@@ -21,7 +21,7 @@ import java.io.*;
import java.text.*;
import java.util.*;
-import static org.gridgain.grid.IgniteSystemProperties.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
/**
* SSH-based node starter.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
index 89abf99..ad1f547 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
@@ -11,6 +11,7 @@
package org.gridgain.visor.commands.vvm
+import org.apache.ignite.IgniteSystemProperties
import org.apache.ignite.cluster.ClusterNode
import org.gridgain.grid._
import org.gridgain.grid.kernal.GridNodeAttributes._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
index 6080998..9f7e524 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
@@ -12,7 +12,7 @@
package org.gridgain.visor
import org.apache.ignite.thread.IgniteThreadPoolExecutor
-import org.apache.ignite.{IgniteState, Ignition}
+import org.apache.ignite.{IgniteSystemProperties, IgniteState, Ignition}
import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode}
import org.apache.ignite.configuration.IgniteConfiguration
import org.apache.ignite.events.{IgniteEvent, IgniteDiscoveryEvent, IgniteEventType}
@@ -26,7 +26,7 @@ import java.text._
import java.util.concurrent._
import java.util.{HashSet => JHashSet, _}
-import org.gridgain.grid.IgniteSystemProperties._
+import IgniteSystemProperties._
import IgniteEventType._
import org.gridgain.grid.kernal.GridComponentType._
import org.gridgain.grid.kernal.GridNodeAttributes._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8229484d/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
index f7bed0b..bdde03c 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala
@@ -13,7 +13,8 @@ package org.gridgain.visor.testsuites
import java.net.{InetAddress, UnknownHostException}
-import org.gridgain.grid.IgniteSystemProperties._
+import org.apache.ignite.IgniteSystemProperties
+import IgniteSystemProperties._
import org.gridgain.visor.commands.VisorArgListSpec
import org.gridgain.visor.commands.ack.VisorAckCommandSpec
import org.gridgain.visor.commands.alert.VisorAlertCommandSpec
[04/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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.*;
[09/11] incubator-ignite git commit: # Renaming
Posted by sb...@apache.org.
# 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/503efc85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/503efc85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/503efc85
Branch: refs/heads/master
Commit: 503efc85c9363857531d6cf39b3d904a3d9fc629
Parents: 1a9e7c2
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:23:30 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:23:30 2014 +0300
----------------------------------------------------------------------
modules/clients/src/test/resources/spring-cache.xml | 2 +-
modules/clients/src/test/resources/spring-server-node.xml | 2 +-
modules/clients/src/test/resources/spring-server-ssl-node.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/503efc85/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index cfdce6a..8358826 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -64,7 +64,7 @@
<!-- Client configuration. -->
<property name="clientConnectionConfiguration">
- <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration"/>
+ <bean class="org.apache.ignite.configuration.ClientConnectionConfiguration"/>
</property>
<property name="cacheConfiguration">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/503efc85/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index 819b41a..25a8438 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -92,7 +92,7 @@
<!-- Client configuration. -->
<property name="clientConnectionConfiguration">
- <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration">
+ <bean class="org.apache.ignite.configuration.ClientConnectionConfiguration">
<!-- Configure TCP rest protocol. -->
<property name="restTcpPort" value="10080"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/503efc85/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index ae9717f..2b707d3 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -62,7 +62,7 @@
<!-- Client configuration. -->
<property name="clientConnectionConfiguration">
- <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration">
+ <bean class="org.apache.ignite.configuration.ClientConnectionConfiguration">
<!-- Configure TCP+SSL rest protocol. -->
<property name="restTcpSslEnabled" value="true"/>