http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java index f358be0..594e0f7 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java @@ -32,7 +32,6 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.BucketAdvisor.ServerBucketProfile; @@ -55,8 +54,7 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { @@ -134,7 +132,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { File logFile = new File("locator-" + locatorPort + ".log"); Properties props = new Properties(); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); try { locator = Locator.startLocatorAndDS(locatorPort, logFile, null, props); @@ -160,8 +158,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { cache = CacheFactory.create(ds); CacheServer server = cache.addCacheServer(); - int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - server.setPort(port); + server.setPort(0); server.setHostnameForClients("localhost"); try { server.start(); @@ -223,7 +220,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { LogWriterUtils.getLogWriter().info( "Partitioned Region SHIPMENT created Successfully :" + shipmentRegion.toString()); - return port; + return server.getPort(); } public static void clearMetadata() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java index d2b319b..822100b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java @@ -43,8 +43,7 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.StringTokenizer; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -1012,7 +1011,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes props = new Properties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); - props.setProperty(DistributionConfig.LOG_FILE_NAME, ""); + props.setProperty(LOG_FILE, ""); CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest( "PartitionedRegionSingleHopWithServerGroupDUnitTest"); DistributedSystem ds = test.getSystem(props); @@ -1622,8 +1621,8 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); - props.setProperty(DistributionConfig.LOG_FILE_NAME, ""); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); + props.setProperty(LOG_FILE, ""); try { locator = Locator.startLocatorAndDS(locatorPort, null, null, props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java index a7f24b6..9ad571a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire.internal.cache; import com.gemstone.gemfire.cache.*; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.FileUtil; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; @@ -28,7 +27,7 @@ import org.junit.experimental.categories.Category; import java.io.File; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertEquals; @Category(IntegrationTest.class) @@ -196,7 +195,7 @@ public class PersistentPartitionedRegionJUnitTest { private Region createRegion(int ttl) { Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); + props.setProperty(LOG_LEVEL, "info"); // props.setProperty("log-file", "junit.log"); cache = new CacheFactory(props).create(); cache.createDiskStoreFactory() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java index 0f78749..d7a57b4 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.cache; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.TXExpiryJUnitTest; import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.Region.Entry; @@ -32,7 +34,6 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.execute.CustomerIDPartitionResolver; @@ -3410,7 +3411,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(true); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<Integer, String> crf = cCache .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY @@ -3622,7 +3623,7 @@ protected static class ClientListener extends CacheListenerAdapter { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(true); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<Integer, String> crf = cCache .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java index 988721b..ee57682 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java @@ -19,9 +19,10 @@ */ package com.gemstone.gemfire.internal.cache; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest; @@ -48,7 +49,7 @@ public class RunCacheInOldGemfire { Properties config = new Properties(); config.setProperty(MCAST_PORT, mcastPort); config.setProperty(LOCATORS, ""); - config.setProperty(DistributionConfig.LOG_FILE_NAME, "oldgemfire.log"); + config.setProperty(LOG_FILE, "oldgemfire.log"); InternalDistributedSystem localsystem = (InternalDistributedSystem)DistributedSystem.connect(config); Cache cache = CacheFactory.create(localsystem); return cache; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java index 91b0153..e6080d8 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.cache; import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.Assert; @@ -33,8 +32,7 @@ import org.junit.rules.TestName; import java.net.InetAddress; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; @Category(IntegrationTest.class) public class TombstoneCreationJUnitTest { @@ -55,7 +53,7 @@ public class TombstoneCreationJUnitTest { Properties props = new Properties(); props.put(LOCATORS, ""); props.put(MCAST_PORT, "0"); - props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); + props.put(LOG_LEVEL, "config"); GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(props)); RegionFactory f = cache.createRegionFactory(RegionShortcut.REPLICATE); DistributedRegion region = (DistributedRegion)f.create(name); @@ -92,7 +90,7 @@ public class TombstoneCreationJUnitTest { Properties props = new Properties(); props.put(LOCATORS, ""); props.put(MCAST_PORT, "0"); - props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); + props.put(LOG_LEVEL, "config"); final GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(props)); RegionFactory f = cache.createRegionFactory(RegionShortcut.REPLICATE); final DistributedRegion region = (DistributedRegion)f.create(name); @@ -167,7 +165,7 @@ public class TombstoneCreationJUnitTest { Properties props = new Properties(); props.put(LOCATORS, ""); props.put(MCAST_PORT, "0"); - props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); + props.put(LOG_LEVEL, "config"); final GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(props)); RegionFactory f = cache.createRegionFactory(RegionShortcut.REPLICATE); final DistributedRegion region = (DistributedRegion)f.create(name); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java index 90ac6b8..379bdae 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java @@ -28,7 +28,6 @@ import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.execute.CustomerIDPartitionResolver; import com.gemstone.gemfire.internal.cache.execute.data.CustId; @@ -45,6 +44,8 @@ import java.io.IOException; import java.io.Serializable; import java.util.Iterator; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * */ @@ -105,7 +106,7 @@ public class TransactionsWithDeltaDUnitTest extends CacheTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(false); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<Integer, String> crf = cCache .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java index c4392ee..2bf9b51 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.cache.diskPerf; import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl; import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -30,8 +29,7 @@ import org.junit.rules.TestName; import java.io.File; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; @Category(IntegrationTest.class) public class MultiThreadedOplogPerJUnitPerformanceTest @@ -101,7 +99,7 @@ public class MultiThreadedOplogPerJUnitPerformanceTest Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); + props.setProperty(LOG_LEVEL, "info"); DistributedSystem ds = DistributedSystem.connect(props); Cache cache = null; try { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java index fc1cd6f..991bf5d 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java @@ -42,8 +42,7 @@ import java.io.IOException; import java.io.Serializable; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTestCase { @@ -906,8 +905,8 @@ public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTest Properties props = new Properties(); props.put(MCAST_PORT, "0"); props.put(LOCATORS, ""); - props.put(SystemConfigurationProperties.NAME, "SecurityClient"); - props.put(DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME, UserPasswordAuthInit.class.getName() + ".create"); + props.put(NAME, "SecurityClient"); + props.put(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create"); props.put("security-username", "reader1"); props.put("security-password", "reader1"); new DistributedRegionFunctionExecutionDUnitTest("temp").createCache(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java index 4ad95fc..ea6b8f9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.execute; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.CacheFactory; @@ -670,7 +672,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); @@ -768,7 +770,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); @@ -845,7 +847,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); IgnoredException ex = IgnoredException.addIgnoredException("No member found"); @@ -925,7 +927,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); IgnoredException expected = IgnoredException.addIgnoredException("No member found"); @@ -1002,7 +1004,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1051,7 +1053,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1100,7 +1102,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1167,7 +1169,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java index cf22c97..bca0473 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java @@ -27,7 +27,6 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; @@ -41,8 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRClientServerTestBase { @@ -369,7 +367,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends Properties props = new Properties(); props = DistributedTestUtils.getAllDistributedSystemProperties(props); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); try { locator = Locator.startLocatorAndDS(locatorPort, logFile, null, props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java index 1c17476..366bc72 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.ha; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; @@ -131,11 +133,11 @@ public class Bug48571DUnitTest extends DistributedTestCase { public static int createServerCache() throws Exception { Properties props = new Properties(); props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); - props.setProperty(DistributionConfig.LOG_FILE_NAME, "server_" + OSProcess.getId() + ".log"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); - props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "server_" + OSProcess.getId() + props.setProperty(LOG_FILE, "server_" + OSProcess.getId() + ".log"); + props.setProperty(LOG_LEVEL, "info"); + props.setProperty(STATISTIC_ARCHIVE_FILE, "server_" + OSProcess.getId() + ".gfs"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); CacheFactory cf = new CacheFactory(props); DistributedSystem ds = new Bug48571DUnitTest("Bug48571DUnitTest").getSystem(props); @@ -162,14 +164,14 @@ public class Bug48571DUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); - props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, "durable-48571"); - props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000"); + props.setProperty(DURABLE_CLIENT_ID, "durable-48571"); + props.setProperty(DURABLE_CLIENT_TIMEOUT, "300000"); - props.setProperty(DistributionConfig.LOG_FILE_NAME, "client_" + OSProcess.getId() + ".log"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); - props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "client_" + OSProcess.getId() + props.setProperty(LOG_FILE, "client_" + OSProcess.getId() + ".log"); + props.setProperty(LOG_LEVEL, "info"); + props.setProperty(STATISTIC_ARCHIVE_FILE, "client_" + OSProcess.getId() + ".gfs"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); ClientCacheFactory ccf = new ClientCacheFactory(props); ccf.setPoolSubscriptionEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java index ca27715..c2dc270 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.ha; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionFactory; @@ -107,9 +109,9 @@ public class Bug48879DUnitTest extends DistributedTestCase { throws Exception { Properties props = new Properties(); - props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "client_" + OSProcess.getId() + props.setProperty(STATISTIC_ARCHIVE_FILE, "client_" + OSProcess.getId() + ".gfs"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); DistributedSystem ds = new Bug48879DUnitTest("Bug48879DUnitTest").getSystem(props); ds.disconnect(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java index b2dbc0b..390aa44 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java @@ -16,12 +16,13 @@ */ package com.gemstone.gemfire.internal.cache.ha; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.Conflatable; import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.internal.cache.RegionQueue; @@ -1964,7 +1965,7 @@ public class HARegionQueueJUnitTest cache.close(); ds.disconnect(); Properties props = new Properties(); - props.put(DistributionConfig.LOG_LEVEL_NAME, "config"); + props.put(LOG_LEVEL, "config"); //props.put("mcast-port","11111"); try { cache= CacheFactory.create(DistributedSystem.connect(props)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java index 806ff2b..e315db5 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java @@ -28,6 +28,8 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * This class tests distributed ownership via the DistributedLockService api. */ @@ -650,7 +652,7 @@ public class TXLockServiceDUnitTest extends DistributedTestCase { public Properties getDistributedSystemProperties() { Properties props = super.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java index 5617ca2..b8eeccd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java @@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.OSProcess; import com.gemstone.gemfire.internal.cache.CacheServerImpl; @@ -34,7 +33,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * TODO This doesn't really test the optimised RI behaviour but only that RI @@ -234,10 +233,10 @@ public class Bug43684DUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); // props.setProperty("log-file", "server_" + OSProcess.getId() + ".log"); - // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); - props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "server_" + OSProcess.getId() + // props.setProperty(LOG_LEVEL, "fine"); + props.setProperty(STATISTIC_ARCHIVE_FILE, "server_" + OSProcess.getId() + ".gfs"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); CacheFactory cf = new CacheFactory(props); cache = (GemFireCacheImpl)cf.create(); @@ -262,10 +261,10 @@ public class Bug43684DUnitTest extends DistributedTestCase { DistributedTestCase.disconnectFromDS(); Properties props = new Properties(); // props.setProperty("log-file", "client_" + OSProcess.getId() + ".log"); - // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); - props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "client_" + OSProcess.getId() + // props.setProperty(LOG_LEVEL, "fine"); + props.setProperty(STATISTIC_ARCHIVE_FILE, "client_" + OSProcess.getId() + ".gfs"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); ClientCacheFactory ccf = new ClientCacheFactory(props); ccf.addPoolServer(host.getHostName(), port).setPoolSubscriptionEnabled(true); cache = (GemFireCacheImpl)ccf.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java index 9723b53..c20bbc1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java @@ -26,7 +26,6 @@ import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.ha.HARegionQueueStats; @@ -36,6 +35,8 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * The test creates two datastores with a partitioned region, and also running a * cache server each. A publisher client is connected to one server while a @@ -138,9 +139,9 @@ public class Bug47388DUnitTest extends DistributedTestCase { throws Exception { Properties props = new Properties(); - props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, + props.setProperty(DURABLE_CLIENT_ID, "my-durable-client-" + ports.length); - props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000"); + props.setProperty(DURABLE_CLIENT_TIMEOUT, "300000"); DistributedSystem ds = new Bug47388DUnitTest("Bug47388DUnitTest").getSystem(props); ds.disconnect(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java index 2df292d..bd8a71d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java @@ -92,7 +92,7 @@ public class Bug51400DUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); // props.setProperty("log-file", "server_" + OSProcess.getId() + ".log"); - // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); + // props.setProperty(LOG_LEVEL, "fine"); // props.setProperty("statistic-archive-file", "server_" + OSProcess.getId() // + ".gfs"); // props.setProperty("statistic-sampling-enabled", "true"); @@ -124,7 +124,7 @@ public class Bug51400DUnitTest extends DistributedTestCase { // "my-durable-client-" + ports.length); // props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000"); // props.setProperty("log-file", "client_" + OSProcess.getId() + ".log"); - // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); + // props.setProperty(LOG_LEVEL, "fine"); // props.setProperty("statistic-archive-file", "client_" + OSProcess.getId() // + ".gfs"); // props.setProperty("statistic-sampling-enabled", "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java index 0978878..57f63e4 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java @@ -53,6 +53,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import static com.gemstone.gemfire.internal.lang.ThrowableUtils.getRootCause; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * This is a test of how persistent distributed @@ -1760,7 +1761,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa System.getProperties().remove(DistributionConfig.GEMFIRE_PREFIX + "ack-wait-threshold"); } Properties props = super.getDistributedSystemProperties(); - props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "5"); + props.put(ACK_WAIT_THRESHOLD, "5"); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java index 91b661e..f702d85 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java @@ -24,14 +24,12 @@ import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.ServerOperationException; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; import com.gemstone.gemfire.test.dunit.*; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; public class Bug36829DUnitTest extends DistributedTestCase { private VM serverVM; @@ -156,9 +154,9 @@ public class Bug36829DUnitTest extends DistributedTestCase { Properties properties = new Properties(); properties.setProperty(MCAST_PORT, "0"); properties.setProperty(LOCATORS, ""); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, + properties.setProperty(DURABLE_CLIENT_ID, durableClientId); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, + properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(durableClientTimeout)); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java index f84c3ed..32c27fe 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java @@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.HARegion; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; import com.gemstone.gemfire.test.dunit.DistributedTestCase; @@ -34,8 +33,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.Set; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -133,9 +131,9 @@ public class Bug37805DUnitTest extends DistributedTestCase{ Properties properties = new Properties(); properties.setProperty(MCAST_PORT, "0"); properties.setProperty(LOCATORS, ""); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, + properties.setProperty(DURABLE_CLIENT_ID, durableClientId); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, + properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(durableClientTimeout)); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java index fc40aed..329bb0f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.*; import com.gemstone.gemfire.cache.client.internal.PoolImpl; @@ -202,17 +204,17 @@ public class CacheServerTestUtil extends DistributedTestCase ClientCacheFactory ccf = new ClientCacheFactory(); try { File cacheXmlFile = new File(url.toURI().getPath()); - ccf.set(DistributionConfig.CACHE_XML_FILE_NAME, cacheXmlFile.toURI().getPath()); + ccf.set(CACHE_XML_FILE, cacheXmlFile.toURI().getPath()); } catch (URISyntaxException e) { throw new ExceptionInInitializerError(e); } ccf.set(MCAST_PORT, "0"); - ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId); - ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(timeout)); - ccf.set(DistributionConfig.LOG_FILE_NAME, "abs_client_system.log"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(DURABLE_CLIENT_ID, durableClientId); + ccf.set(DURABLE_CLIENT_TIMEOUT, String.valueOf(timeout)); + ccf.set(LOG_FILE, "abs_client_system.log"); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); cache = (Cache)ccf.create(); expected = IgnoredException.addIgnoredException("java.net.ConnectionException||java.net.SocketException"); pool = (PoolImpl)PoolManager.find(poolName); @@ -223,15 +225,15 @@ public class CacheServerTestUtil extends DistributedTestCase ClientCacheFactory ccf = new ClientCacheFactory(); try { File cacheXmlFile = new File(url.toURI().getPath()); - ccf.set(DistributionConfig.CACHE_XML_FILE_NAME, cacheXmlFile.toURI().getPath()); + ccf.set(CACHE_XML_FILE, cacheXmlFile.toURI().getPath()); } catch (URISyntaxException e) { throw new ExceptionInInitializerError(e); } ccf.set(MCAST_PORT, "0"); - ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId); - ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(timeout)); + ccf.set(DURABLE_CLIENT_ID, durableClientId); + ccf.set(DURABLE_CLIENT_TIMEOUT, String.valueOf(timeout)); cache = (Cache)ccf.create(); expected = IgnoredException.addIgnoredException("java.net.ConnectionException||java.net.SocketException"); pool = (PoolImpl)PoolManager.find(poolName); @@ -242,11 +244,11 @@ public class CacheServerTestUtil extends DistributedTestCase CacheFactory ccf = new CacheFactory(); try { File cacheXmlFile = new File(url.toURI().getPath()); - ccf.set(DistributionConfig.CACHE_XML_FILE_NAME, cacheXmlFile.toURI().getPath()); + ccf.set(CACHE_XML_FILE, cacheXmlFile.toURI().getPath()); ccf.set(MCAST_PORT, "0"); ccf.set(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); - ccf.set(DistributionConfig.LOG_FILE_NAME, "abs_server_system.log"); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_FILE, "abs_server_system.log"); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); } catch (URISyntaxException e) { throw new ExceptionInInitializerError(e); @@ -259,7 +261,7 @@ public class CacheServerTestUtil extends DistributedTestCase CacheFactory ccf = new CacheFactory(); try { File cacheXmlFile = new File(url.toURI().getPath()); - ccf.set(DistributionConfig.CACHE_XML_FILE_NAME, cacheXmlFile.toURI().getPath()); + ccf.set(CACHE_XML_FILE, cacheXmlFile.toURI().getPath()); ccf.set(MCAST_PORT, "0"); ccf.set(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java index 8f185f5..e58627a 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java @@ -34,8 +34,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Iterator; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * This test verifies the per-client queue conflation override functionality @@ -144,7 +143,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false"); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); - props.setProperty(DistributionConfig.CLIENT_CONFLATION_PROP_NAME, conflation); + props.setProperty(CONFLATE_EVENTS, conflation); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java index 77f71fb..7af3004 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java @@ -21,15 +21,13 @@ import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.dunit.*; import java.io.IOException; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; public class DurableClientBug39997DUnitTest extends CacheTestCase { @@ -118,7 +116,7 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase { Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); - props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, "my_id"); + props.setProperty(DURABLE_CLIENT_ID, "my_id"); return props; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java index 9e0ec93..3705336 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java @@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Iterator; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -253,7 +253,7 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase { throws Exception { Properties props = new Properties(); props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]"); - // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); + // props.setProperty(LOG_LEVEL, "fine"); // props.setProperty("log-file", "server_" + OSProcess.getId() + ".log"); // props.setProperty("statistic-archive-file", "server_" + OSProcess.getId() // + ".gfs"); @@ -305,13 +305,13 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase { } Properties props = new Properties(); if (durable) { - props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, + props.setProperty(DURABLE_CLIENT_ID, "my-durable-client"); - props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, + props.setProperty(DURABLE_CLIENT_TIMEOUT, timeoutSeconds); } // props.setProperty("log-file", "client_" + OSProcess.getId() + ".log"); - // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); + // props.setProperty(LOG_LEVEL, "fine"); // props.setProperty("statistic-archive-file", "client_" + OSProcess.getId() // + ".gfs"); // props.setProperty("statistic-sampling-enabled", "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java index 5f958d7..8568a57 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java @@ -32,8 +32,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.net.SocketException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** @@ -705,8 +704,8 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase Properties properties = new Properties(); properties.setProperty(MCAST_PORT, "0"); properties.setProperty(LOCATORS, ""); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(durableClientTimeout)); + properties.setProperty(DURABLE_CLIENT_ID, durableClientId); + properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(durableClientTimeout)); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java index 238bbc0..dc04cc5 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java @@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; import com.gemstone.gemfire.test.dunit.*; @@ -33,8 +32,7 @@ import java.util.ArrayList; import java.util.Properties; import java.util.concurrent.RejectedExecutionException; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -361,9 +359,9 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { Properties properties = new Properties(); properties.setProperty(MCAST_PORT, "0"); properties.setProperty(LOCATORS, ""); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, + properties.setProperty(DURABLE_CLIENT_ID, durableClientId); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, + properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(durableClientTimeout)); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java index aeaaeec..bc55b8e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java @@ -34,8 +34,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.Set; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -714,9 +713,9 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { Properties properties = new Properties(); properties.setProperty(MCAST_PORT, "0"); properties.setProperty(LOCATORS, ""); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, + properties.setProperty(DURABLE_CLIENT_ID, durableClientId); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, + properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(durableClientTimeout)); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java index ebc4dca..887e374 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java @@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter; import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder; @@ -30,8 +29,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -468,9 +466,9 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase Properties properties = new Properties(); properties.setProperty(MCAST_PORT, "0"); properties.setProperty(LOCATORS, ""); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, + properties.setProperty(DURABLE_CLIENT_ID, durableClientId); - properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, + properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(durableClientTimeout)); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java index c0d132d..7f70ed9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java @@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.dunit.*; @@ -33,6 +32,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * Written to test fix for Bug #47132 * @@ -168,8 +169,8 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { public void setUpClientVM(String host, int port, boolean isDurable, String vmID) { Properties gemFireProps = new Properties(); if (isDurable) { - gemFireProps.put(DistributionConfig.DURABLE_CLIENT_ID_NAME, vmID); - gemFireProps.put(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + DURABLE_CLIENT_TIMEOUT); + gemFireProps.put(DURABLE_CLIENT_ID, vmID); + gemFireProps.put(DURABLE_CLIENT_TIMEOUT, "" + DURABLE_CLIENT_TIMEOUT); } ClientCacheFactory clientCacheFactory = new ClientCacheFactory(gemFireProps); clientCacheFactory.addPoolServer(host, port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java index f61cc2c..72850e2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java @@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.util.test.TestUtil; import org.junit.After; @@ -31,8 +30,7 @@ import org.junit.experimental.categories.Category; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -95,7 +93,7 @@ public class RedundancyLevelJUnitTest Properties p = new Properties(); p.setProperty(MCAST_PORT, "0"); p.setProperty(LOCATORS, ""); - p.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + p.setProperty(CACHE_XML_FILE, path); final String addExpected = "<ExpectedException action=add>" + expected + "</ExpectedException>"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java index 11be69d..b0fd781 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java @@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.compression.Compressor; import com.gemstone.gemfire.compression.SnappyCompressor; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.test.dunit.*; @@ -29,6 +28,8 @@ import java.io.IOException; import java.io.PrintStream; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * Tests configured and badly configured cache.xml files with regards to compression. * @@ -123,7 +124,7 @@ public class CompressionCacheConfigDUnitTest extends CacheTestCase { try { disconnectFromDS(); Properties props = new Properties(); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, cacheXml); + props.setProperty(CACHE_XML_FILE, cacheXml); LogWriterUtils.getLogWriter().info("<ExpectedException action=add>ClassNotFoundException</ExpectedException>"); getSystem(props); assertNotNull(getCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java index 582c5e3..d1a9fe5 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java @@ -22,6 +22,8 @@ */ package com.gemstone.gemfire.internal.datasource; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; @@ -57,11 +59,11 @@ public class AbstractPoolCacheJUnitTest { @Before public void setUp() throws Exception { props = new Properties(); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); + props.setProperty(LOG_LEVEL, "info"); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); String path = TestUtil.getResourcePath(AbstractPoolCacheJUnitTest.class, "/jta/cachejta.xml"); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + props.setProperty(CACHE_XML_FILE, path); ds1 = DistributedSystem.connect(props); cache = CacheFactory.create(ds1); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java index ece05b3..0f420ed 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java @@ -22,7 +22,6 @@ package com.gemstone.gemfire.internal.datasource; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.util.test.TestUtil; import org.junit.After; @@ -34,7 +33,7 @@ import javax.naming.Context; import java.sql.Connection; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.fail; //import javax.sql.PooledConnection; @@ -56,7 +55,7 @@ public class CleanUpJUnitTest { props = new Properties(); props.setProperty(MCAST_PORT, "0"); String path = TestUtil.getResourcePath(CleanUpJUnitTest.class, "/jta/cachejta.xml"); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + props.setProperty(CACHE_XML_FILE, path); ds1 = DistributedSystem.connect(props); cache = CacheFactory.create(ds1); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java index b961d8d..e7d2541 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java @@ -24,7 +24,6 @@ package com.gemstone.gemfire.internal.datasource; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.util.test.TestUtil; import org.junit.After; @@ -39,7 +38,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.fail; /* @@ -65,7 +64,7 @@ public class ConnectionPoolCacheImplJUnitTest { props = new Properties(); props.setProperty(MCAST_PORT, "0"); String path = TestUtil.getResourcePath(ConnectionPoolCacheImplJUnitTest.class, "/jta/cachejta.xml"); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + props.setProperty(CACHE_XML_FILE, path); ds1 = DistributedSystem.connect(props); cache = CacheFactory.create(ds1); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java index d2a377a..2719b0b 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.datasource; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.util.test.TestUtil; @@ -41,7 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @@ -69,7 +68,7 @@ public class ConnectionPoolingJUnitTest { props = new Properties(); props.setProperty(MCAST_PORT, "0"); String path = TestUtil.getResourcePath(ConnectionPoolingJUnitTest.class, "/jta/cachejta.xml"); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + props.setProperty(CACHE_XML_FILE, path); ds1 = DistributedSystem.connect(props); cache = CacheFactory.create(ds1); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java index 9384d43..6cbde69 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.datasource; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.util.test.TestUtil; import org.junit.After; @@ -31,7 +30,7 @@ import javax.naming.Context; import java.sql.Connection; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.fail; /* @@ -49,7 +48,7 @@ public class DataSourceFactoryJUnitTest { props = new Properties(); props.setProperty(MCAST_PORT, "0"); String path = TestUtil.getResourcePath(DataSourceFactoryJUnitTest.class, "/jta/cachejta.xml"); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + props.setProperty(CACHE_XML_FILE, path); ds1 = DistributedSystem.connect(props); cache = CacheFactory.create(ds1); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java index 7d5aba3..bdbfa29 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java @@ -22,7 +22,6 @@ package com.gemstone.gemfire.internal.datasource; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.jndi.JNDIInvoker; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.util.test.TestUtil; @@ -32,7 +31,7 @@ import org.junit.experimental.categories.Category; import javax.transaction.TransactionManager; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.fail; @@ -60,7 +59,7 @@ public class RestartJUnitTest { props = new Properties(); props.setProperty(MCAST_PORT, "0"); String path = TestUtil.getResourcePath(RestartJUnitTest.class, "/jta/cachejta.xml"); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + props.setProperty(CACHE_XML_FILE, path); ds1 = DistributedSystem.connect(props); cache = CacheFactory.create(ds1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java index 4ee947b..df10833 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -40,8 +39,7 @@ import java.sql.Statement; import java.util.Properties; import java.util.Random; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertNotNull; @Category(IntegrationTest.class) @@ -143,7 +141,7 @@ public class BlockingTimeOutJUnitTest { wr.write(modified_file_str); wr.flush(); wr.close(); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path); + props.setProperty(CACHE_XML_FILE, path); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); String tableName = ""; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java index 121b9aa..c2bd884 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java @@ -28,7 +28,6 @@ import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.util.test.TestUtil; import javax.naming.Context; @@ -40,11 +39,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; - -//import com.gemstone.gemfire.cache.AttributesFactory; -//import com.gemstone.gemfire.cache.Region; -//import com.gemstone.gemfire.cache.RegionAttributes; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @@ -65,7 +60,7 @@ public class CacheUtils { public static String init(String className) throws Exception{ Properties props = new Properties(); - props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml")); + props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml")); String tableName = ""; props.setProperty(MCAST_PORT, "0");
