http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java index 61a20d9..9a4aacd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result.Status; @@ -54,9 +56,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase { private Properties createProperties(Host host, String name, String groups) { Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); - props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); + props.setProperty(LOG_LEVEL, "info"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); + props.setProperty(ENABLE_TIME_STATISTICS, "true"); props.setProperty(SystemConfigurationProperties.NAME, name); props.setProperty(DistributionConfig.GROUPS_NAME, groups); return props;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java index ee80360..f97b21c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassBuilder; import com.gemstone.gemfire.internal.ClassPathLoader; @@ -154,7 +155,7 @@ public class UserCommandsDUnitTest extends CliCommandTestBase { }); Properties properties = new Properties(); - properties.setProperty(DistributionConfig.USER_COMMAND_PACKAGES, "junit.ucdunit"); + properties.setProperty(SystemConfigurationProperties.USER_COMMAND_PACKAGES, "junit.ucdunit"); setUpJmxManagerOnVm0ThenConnect(properties); CommandResult cmdResult = executeCommand("ucdunitcmd"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ExampleJSONAuthorization.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ExampleJSONAuthorization.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ExampleJSONAuthorization.java index 7227371..d54c68a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ExampleJSONAuthorization.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ExampleJSONAuthorization.java @@ -20,7 +20,6 @@ import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.operations.OperationContext; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.security.AccessControl; import com.gemstone.gemfire.security.AuthenticationFailedException; @@ -38,6 +37,8 @@ import java.io.StringWriter; import java.security.Principal; import java.util.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public class ExampleJSONAuthorization implements AccessControl, Authenticator { public static class Role { @@ -94,7 +95,7 @@ public class ExampleJSONAuthorization implements AccessControl, Authenticator { user.pwd = user.name; } - JSONArray ops = obj.getJSONArray(DistributionConfig.ROLES_NAME); + JSONArray ops = obj.getJSONArray(ROLES); for (int j = 0; j < ops.length(); j++) { String roleName = ops.getString(j); user.roles.add(roleMap.get(roleName)); @@ -105,7 +106,7 @@ public class ExampleJSONAuthorization implements AccessControl, Authenticator { private static Map<String, Role> readRoles(JSONObject jsonBean) throws JSONException { Map<String, Role> roleMap = new HashMap<>(); - JSONArray array = jsonBean.getJSONArray(DistributionConfig.ROLES_NAME); + JSONArray array = jsonBean.getJSONArray(ROLES); for (int i = 0; i < array.length(); i++) { JSONObject obj = array.getJSONObject(i); Role role = new Role(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java index ebbf7d9..2582bc1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java @@ -47,7 +47,6 @@ import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.operations.OperationContext; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.security.AccessControl; import com.gemstone.gemfire.security.AuthenticationFailedException; @@ -65,6 +64,8 @@ import java.io.IOException; import java.security.Principal; import java.util.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public class JSONAuthorization implements AccessControl, Authenticator { public static class Role { @@ -115,8 +116,10 @@ public class JSONAuthorization implements AccessControl, Authenticator { user.pwd = user.name; } - for (JsonNode r : u.get("roles")) { - user.roles.add(roleMap.get(r.asText())); + JSONArray ops = obj.getJSONArray(ROLES); + for (int j = 0; j < ops.length(); j++) { + String roleName = ops.getString(j); + user.roles.add(roleMap.get(roleName)); } acl.put(user.name, user); } @@ -124,7 +127,7 @@ public class JSONAuthorization implements AccessControl, Authenticator { private static Map<String, Role> readRoles(JsonNode jsonNode) { Map<String, Role> roleMap = new HashMap<>(); - for (JsonNode r : jsonNode.get("roles")) { + for (JsonNode r : jsonNode.get(ROLES)) { Role role = new Role(); role.name = r.get("name").asText(); String regionNames = null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java index 36012d4..4ae62da 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java @@ -38,6 +38,8 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * */ @@ -402,7 +404,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase { public Properties getDistributedSystemProperties() { Properties p = super.getDistributedSystemProperties(); - p.put(DistributionConfig.CONSERVE_SOCKETS_NAME, "false"); + p.put(CONSERVE_SOCKETS, "false"); return p; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java index b8349d3..a1e8e04 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; import com.gemstone.gemfire.distributed.SystemConfigurationProperties; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -33,10 +32,8 @@ import redis.clients.jedis.exceptions.JedisDataException; import java.io.IOException; import java.util.Random; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class AuthJUnitTest { @@ -64,7 +61,7 @@ public class AuthJUnitTest { } private void setupCacheWithPassword() { CacheFactory cf = new CacheFactory(); - cf.set(DistributionConfig.LOG_LEVEL_NAME, "error"); + cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); cf.set(SystemConfigurationProperties.REDIS_PASSWORD, PASSWORD); @@ -98,7 +95,7 @@ public class AuthJUnitTest { @Test public void testAuthNoPwd() { CacheFactory cf = new CacheFactory(); - cf.set(DistributionConfig.LOG_LEVEL_NAME, "error"); + cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); cache = cf.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java index fed4803..9c94abf 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; @@ -31,8 +30,7 @@ import redis.clients.jedis.Jedis; import java.io.IOException; 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.*; import static org.junit.Assert.*; @Category(IntegrationTest.class) @@ -48,7 +46,7 @@ public class HashesJUnitTest { rand = new Random(); CacheFactory cf = new CacheFactory(); //cf.set("log-file", "redis.log"); - cf.set(DistributionConfig.LOG_LEVEL_NAME, "error"); + cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); cache = cf.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java index 17a2c3f..6c9fcdc 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; @@ -33,10 +32,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class ListsJUnitTest { @@ -52,7 +49,7 @@ public class ListsJUnitTest { rand = new Random(); CacheFactory cf = new CacheFactory(); //cf.set("log-file", "redis.log"); - cf.set(DistributionConfig.LOG_LEVEL_NAME, "error"); + cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); cache = cf.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java index 0ed99bd..2ed26cf 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.SystemConfigurationProperties; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.test.dunit.*; @@ -28,8 +27,7 @@ import redis.clients.jedis.Jedis; 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.*; public class RedisDistDUnitTest extends DistributedTestCase { @@ -81,7 +79,7 @@ public class RedisDistDUnitTest extends DistributedTestCase { int port = ports[VM.getCurrentVMNum()]; CacheFactory cF = new CacheFactory(); String locator = SocketCreator.getLocalHost().getHostName() + "[" + locatorPort + "]"; - cF.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + cF.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); cF.set(SystemConfigurationProperties.REDIS_BIND_ADDRESS, localHost); cF.set(SystemConfigurationProperties.REDIS_PORT, "" + port); cF.set(MCAST_PORT, "0"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java index 28c35bf..850e68f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; @@ -34,8 +33,7 @@ import java.util.HashSet; import java.util.Random; 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.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -53,7 +51,7 @@ public class SetsJUnitTest { rand = new Random(); CacheFactory cf = new CacheFactory(); //cf.set("log-file", "redis.log"); - cf.set(DistributionConfig.LOG_LEVEL_NAME, "error"); + cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); cache = cf.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java index 90b2827..06c8596 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; @@ -33,8 +32,7 @@ import java.io.IOException; import java.util.*; import java.util.Map.Entry; -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.*; @Category(IntegrationTest.class) @@ -50,7 +48,7 @@ public class SortedSetsJUnitTest { rand = new Random(); CacheFactory cf = new CacheFactory(); //cf.set("log-file", "redis.log"); - cf.set(DistributionConfig.LOG_LEVEL_NAME, "error"); + cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); cache = cf.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java index 8939e0b..54eeeee 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java @@ -18,7 +18,6 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; @@ -31,8 +30,7 @@ import redis.clients.jedis.Jedis; import java.io.IOException; 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.*; import static org.junit.Assert.*; @Category(IntegrationTest.class) @@ -49,7 +47,7 @@ public class StringsJunitTest { rand = new Random(); CacheFactory cf = new CacheFactory(); //cf.set("log-file", "redis.log"); - cf.set(DistributionConfig.LOG_LEVEL_NAME, "error"); + cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); cache = cf.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java index 14f1f80..ab8890b 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java @@ -26,6 +26,8 @@ import java.io.IOException; import java.security.Principal; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public class SSLCredentialGenerator extends CredentialGenerator { private static final Logger logger = LogService.getLogger(); @@ -113,10 +115,10 @@ public class SSLCredentialGenerator extends CredentialGenerator { private Properties getSSLProperties() { Properties props = new Properties(); - props.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true"); - props.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true"); - props.setProperty(DistributionConfig.SSL_CIPHERS_NAME, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"); - props.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, "TLSv1"); + props.setProperty(SSL_ENABLED, "true"); + props.setProperty(SSL_REQUIRE_AUTHENTICATION, "true"); + props.setProperty(SSL_CIPHERS, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"); + props.setProperty(SSL_PROTOCOLS, "TLSv1"); return props; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java index 0a482d4..373797c 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.test.dunit; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; @@ -101,7 +103,7 @@ public class LogWriterUtils { */ public static String getDUnitLogLevel() { Properties dsProperties = DUnitEnv.get().getDistributedSystemProperties(); - String result = dsProperties.getProperty(DistributionConfig.LOG_LEVEL_NAME); + String result = dsProperties.getProperty(LOG_LEVEL); if (result == null) { result = ManagerLogWriter.levelToString(DistributionConfig.DEFAULT_LOG_LEVEL); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java index 06019b8..8bb9b78 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.test.dunit.internal; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.Region; @@ -156,11 +158,11 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur if (logPerTest) { String testMethod = getTestMethodName(); String testName = lastSystemCreatedInTest.getName() + '-' + testMethod; - String oldLogFile = p.getProperty(DistributionConfig.LOG_FILE_NAME); - p.put(DistributionConfig.LOG_FILE_NAME, + String oldLogFile = p.getProperty(LOG_FILE); + p.put(LOG_FILE, oldLogFile.replace("system.log", testName+".log")); - String oldStatFile = p.getProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME); - p.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, + String oldStatFile = p.getProperty(STATISTIC_ARCHIVE_FILE); + p.put(STATISTIC_ARCHIVE_FILE, oldStatFile.replace("statArchive.gfs", testName+".gfs")); } system = (InternalDistributedSystem)DistributedSystem.connect(p); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java index 094095f..8f3cd28 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java @@ -50,8 +50,7 @@ import java.rmi.server.UnicastRemoteObject; 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.*; /** * A class to build a fake test configuration and launch some DUnit VMS. @@ -212,9 +211,9 @@ public class DUnitLauncher { Properties p = new Properties(); p.setProperty(LOCATORS, getLocatorString()); p.setProperty(MCAST_PORT, "0"); - p.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); - p.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); - p.setProperty(DistributionConfig.LOG_LEVEL_NAME, LOG_LEVEL); + p.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); + p.setProperty(USE_CLUSTER_CONFIGURATION, "false"); + p.setProperty(LOG_LEVEL, LOG_LEVEL); return p; } @@ -254,7 +253,7 @@ public class DUnitLauncher { p.setProperty(DistributionConfig.JMX_MANAGER_NAME, "false"); //Disable the shared configuration on this locator. //Shared configuration tests create their own locator - p.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); + p.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); //Tell the locator it's the first in the system for //faster boot-up System.setProperty(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java index 674437e..deb3e76 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.test.golden; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.process.ProcessWrapper; import org.apache.logging.log4j.core.config.ConfigurationFactory; @@ -124,7 +126,7 @@ public abstract class GoldenTestCase { protected final Properties createProperties() { Properties properties = new Properties(); properties.setProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT, "0"); - properties.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, "warning"); + properties.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, "warning"); properties.setProperty("file.encoding", "UTF-8"); return editProperties(properties); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java index 0866ea2..02169be 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java @@ -16,7 +16,8 @@ */ package com.gemstone.gemfire.test.process; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.internal.logging.LogService; import org.apache.logging.log4j.Logger; @@ -275,7 +276,7 @@ public class ProcessWrapper { if (properties != null) { for (Map.Entry<Object, Object> entry : properties.entrySet()) { - if (!entry.getKey().equals(DistributionConfig.LOG_FILE_NAME)) { + if (!entry.getKey().equals(LOG_FILE)) { jvmArgumentsList.add("-D" + entry.getKey() + "=" + entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java index 6403783..adc73bb 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java @@ -67,7 +67,7 @@ public class WANBootStrapping_Site1_Add { START_LOCATOR, "localhost[" + 10101 + "],server=true,peer=true,hostname-for-clients=localhost").set( - DistributionConfig.LOG_LEVEL_NAME, "warning").create(); + LOG_LEVEL, "warning").create(); System.out.println("Cache Created"); // to create region and a gateway sender ask to run http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java index 506990e..c469b4f 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java @@ -16,6 +16,8 @@ */ package com.main; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -49,7 +51,7 @@ public class WANBootStrapping_Site1_Remove { properties.setProperty(MCAST_PORT, "0"); properties.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+ (-1)); properties.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + 20202 + "]"); - properties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "warning"); + properties.setProperty(LOG_LEVEL, "warning"); Locator locator = null; try { locator = Locator.startLocatorAndDS(40445, null, properties); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java index 21b071b..059aa99 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java @@ -65,7 +65,7 @@ public class WANBootStrapping_Site2_Add { .set(LOCATORS, "localhost[" + 20202 + "]") .set(START_LOCATOR, "localhost[" + 20202 + "],server=true,peer=true,hostname-for-clients=localhost") .set(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + 10101 + "]") - .set(DistributionConfig.LOG_LEVEL_NAME, "warning") + .set(LOG_LEVEL, "warning") .create(); System.out.println("Cache Created"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java index 02df335..751f13d 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import java.io.IOException; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * This is a stand alone locator with a distributed-system-id = -2 @@ -48,7 +48,7 @@ public class WANBootStrapping_Site2_Remove { properties.setProperty(MCAST_PORT, "0"); properties.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+ (-2)); properties.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + 10101 + "]"); - properties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "warning"); + properties.setProperty(LOG_LEVEL, "warning"); Locator locator = null; try { locator = Locator.startLocatorAndDS(30445, null, properties); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java index 8ea8178..f71e51b 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java @@ -25,14 +25,13 @@ import com.gemstone.gemfire.cache.query.CqAttributesFactory; import com.gemstone.gemfire.cache.query.QueryInvalidException; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import junit.framework.TestCase; import org.junit.experimental.categories.Category; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; @Category(IntegrationTest.class) public class CQJUnitTest extends TestCase { @@ -51,7 +50,7 @@ public class CQJUnitTest extends TestCase { public void setUp() throws Exception { Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); + props.setProperty(LOG_LEVEL, "config"); this.ds = DistributedSystem.connect(props); this.cache = CacheFactory.create(ds); this.qs = cache.getQueryService(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java index e2b0f2a..15dbbf6 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java @@ -27,7 +27,6 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl.TestHook; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.cache30.CertifiableTestCacheListener; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; @@ -42,8 +41,7 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; 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.*; /** * This class tests the ContiunousQuery mechanism in GemFire. @@ -1352,8 +1350,8 @@ public class CqDataUsingPoolDUnitTest extends CacheTestCase { 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-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java index a5eed2d..290660c 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java @@ -27,7 +27,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; public class CqStateDUnitTest extends HelperTestCase { @@ -121,7 +121,7 @@ public class CqStateDUnitTest extends HelperTestCase { public Properties getClientProperties() { Properties props = new Properties(); - props.put(DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME, UserPasswordAuthInit.class.getName() + ".create"); + props.put(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create"); props.put("security-username", "root"); props.put("security-password", "root"); return props; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java index 389f412..3afa0a4 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java @@ -26,13 +26,15 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.cache30.ClientServerTestCase; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.test.dunit.*; import hydra.Log; import java.io.IOException; import java.util.HashSet; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * Test class for Partitioned Region and CQs * @@ -1734,7 +1736,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer(serverHosts[0]/*getServerHostName(Host.getHost(0))*/, serverPorts[0]); ccf.setPoolSubscriptionEnabled(true); - ccf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + ccf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); // Create Client Cache. getClientCache(ccf); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java index e91accc..9d6c3cb 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java @@ -31,7 +31,6 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; import com.gemstone.gemfire.cache.util.CqListenerAdapter; 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.Host; import com.gemstone.gemfire.test.dunit.LogWriterUtils; @@ -41,6 +40,8 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable; import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public class ClientSnapshotDUnitTest extends CacheTestCase { private transient Region<Integer, MyObject> region; @@ -251,7 +252,7 @@ public class ClientSnapshotDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory() - .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()) + .set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()) .setPdxSerializer(new MyPdxSerializer()) .addPoolServer(NetworkUtils.getServerHostName(host), port) .setPoolSubscriptionEnabled(true) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java index 65a1a14..8e36e92 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java @@ -32,7 +32,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.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.util.Collections; import java.util.HashSet; import java.util.Set; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * */ @@ -707,7 +708,7 @@ public class RemoteCQTransactionDUnitTest 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 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java index 4111248..c1680f5 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java @@ -41,8 +41,7 @@ import java.util.*; import java.util.concurrent.CountDownLatch; 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.*; /** * Class <code>DurableClientTestCase</code> tests durable client @@ -1573,8 +1572,8 @@ public class DurableClientTestCase 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-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java index 2a56dbf..c321b53 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java @@ -41,8 +41,7 @@ import java.net.UnknownHostException; import java.util.Collections; 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.*; /** * Cache Server related management test cases @@ -241,9 +240,9 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { Properties props = new Properties(); props.setProperty(MCAST_PORT, String.valueOf(0)); props.setProperty(LOCATORS, otherLocators); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0"); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); File logFile = new File(getUniqueName() + "-locator" + locatorPort + ".log"); try { InetAddress bindAddr = InetAddress.getByName(NetworkUtils.getServerHostName(vmHost)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java index ce230e2..453ef21 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java @@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.query.CqAttributesFactory; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.OSProcess; import com.gemstone.gemfire.internal.cache.DistributedRegion; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -59,8 +58,7 @@ import java.util.Map.Entry; import java.util.Properties; 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.*; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; @@ -725,10 +723,10 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { if (cache == null) { Properties props = getNonDurableClientProps(); - props.setProperty(DistributionConfig.LOG_FILE_NAME, "client_" + OSProcess.getId() + ".log"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); - props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "client_" + OSProcess.getId() + ".gfs"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(LOG_FILE, "client_" + OSProcess.getId() + ".log"); + props.setProperty(LOG_LEVEL, "fine"); + props.setProperty(STATISTIC_ARCHIVE_FILE, "client_" + OSProcess.getId() + ".gfs"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); getSystem(props); @@ -1063,10 +1061,10 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { if (cache == null) { Properties props = getNonDurableClientProps(); - props.setProperty(DistributionConfig.LOG_FILE_NAME, "client_" + OSProcess.getId() + ".log"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); - props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "client_" + OSProcess.getId() + ".gfs"); - props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); + props.setProperty(LOG_FILE, "client_" + OSProcess.getId() + ".log"); + props.setProperty(LOG_LEVEL, "fine"); + props.setProperty(STATISTIC_ARCHIVE_FILE, "client_" + OSProcess.getId() + ".gfs"); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java index e059b87..3042e76 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java @@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.DistributedRegion; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -42,8 +41,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 com.gemstone.gemfire.test.dunit.Assert.assertTrue; import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; @@ -401,8 +399,8 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase { Properties p = new Properties(); p.setProperty(MCAST_PORT, "0"); p.setProperty(LOCATORS, ""); - p.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId); - p.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(durableClientTimeout)); + p.setProperty(DURABLE_CLIENT_ID, durableClientId); + p.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(durableClientTimeout)); return p; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java index ad5b3a3..b7945b9 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java @@ -31,7 +31,6 @@ import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.junit.categories.PerformanceTest; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java index edeee3a..3205dd3 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java @@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.lucene.LuceneIndex; import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.extension.Extension; import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; @@ -48,7 +47,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -129,7 +128,7 @@ public class LuceneIndexXmlParserIntegrationJUnitTest { public void createIndex() throws FileNotFoundException { CacheFactory cf = new CacheFactory(); cf.set(MCAST_PORT, "0"); - cf.set(DistributionConfig.CACHE_XML_FILE_NAME, getXmlFileForTest()); + cf.set(CACHE_XML_FILE, getXmlFileForTest()); Cache cache = cf.create(); LuceneService service = LuceneServiceProvider.get(cache); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java b/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java index fd7dd50..1c6a5a2 100644 --- a/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java +++ b/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java @@ -58,7 +58,7 @@ public class JavaApiIntegrationTest extends JUnitSuite { public static void setUpBeforeClass() throws Exception { // start geode cluster, and spark context Properties settings = new Properties(); - settings.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, "src/it/resources/test-retrieve-regions.xml"); + settings.setProperty(CACHE_XML_FILE, "src/it/resources/test-retrieve-regions.xml"); settings.setProperty("num-of-servers", Integer.toString(numServers)); int locatorPort = GeodeCluster$.MODULE$.start(settings); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java index 22f5df4..0fb0b3e 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java @@ -629,9 +629,9 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { Properties props = test.getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, "localhost[" + locPort + "]"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); - props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); + props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); + props.setProperty(USE_CLUSTER_CONFIGURATION, "false"); InternalDistributedSystem ds = test.getSystem(props); cache = CacheFactory.create(ds); IgnoredException ex = new IgnoredException("could not get remote locator information for remote site"); @@ -772,8 +772,8 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { props.setProperty(LOCATORS, "localhost[" + port + "]"); props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); - props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); + props.setProperty(USE_CLUSTER_CONFIGURATION, "false"); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); test.getSystem(props); return port; } @@ -930,8 +930,8 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(LOCATORS, "localhost[" + port + "]"); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); - props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); + props.setProperty(USE_CLUSTER_CONFIGURATION, "false"); props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); test.getSystem(props); return port; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java index 9710549..2de6dd8 100755 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java @@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.CacheServerImpl; @@ -36,8 +35,7 @@ import java.io.IOException; 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 CacheClientNotifierDUnitTest extends WANTestBase { private static final int NUM_KEYS = 10; @@ -227,8 +225,8 @@ public class CacheClientNotifierDUnitTest extends WANTestBase { props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); if (isDurable) { - props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, clientId); - props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 200); + props.setProperty(DURABLE_CLIENT_ID, clientId); + props.setProperty(DURABLE_CLIENT_TIMEOUT, "" + 200); } InternalDistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java index 6e70d92..0ae3739 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java @@ -246,7 +246,7 @@ public class WANTestBase extends DistributedTestCase{ public static void bringBackLocatorOnOldPort(int dsId, int remoteLocPort, int oldPort) { WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.put(DistributionConfig.LOG_LEVEL_NAME, "fine"); + props.put(LOG_LEVEL, "fine"); props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(LOCATORS, "localhost[" + oldPort + "]"); @@ -851,7 +851,7 @@ public class WANTestBase extends DistributedTestCase{ Properties props = test.getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, "localhost[" + locPort + "]"); - props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, conserveSockets.toString()); + props.setProperty(CONSERVE_SOCKETS, conserveSockets.toString()); InternalDistributedSystem ds = test.getSystem(props); cache = CacheFactory.create(ds); } @@ -880,7 +880,7 @@ public class WANTestBase extends DistributedTestCase{ boolean gatewaySslRequireAuth = true; Properties gemFireProps = test.getDistributedSystemProperties(); - gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + gemFireProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled)); gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols); gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewaySslciphers); @@ -1938,7 +1938,7 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); props.setProperty(LOCATORS, "localhost[" + locPort + "]"); @@ -1974,7 +1974,7 @@ public class WANTestBase extends DistributedTestCase{ Properties gemFireProps = test.getDistributedSystemProperties(); - gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + gemFireProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled)); gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols); gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewaySslciphers); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java index 104223e..0721ed6 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java @@ -22,6 +22,8 @@ import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public class DistTXWANDUnitTest extends WANTestBase { private static final long serialVersionUID = 1L; @@ -35,7 +37,7 @@ public class DistTXWANDUnitTest extends WANTestBase { Invoke.invokeInEveryVM(new SerializableCallable() { @Override public Object call() throws Exception { - System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); return null; } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java index c4a0cea..a8776c3 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java @@ -33,8 +33,7 @@ import org.apache.logging.log4j.Logger; 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 NewWanAuthenticationDUnitTest extends WANTestBase { @@ -196,8 +195,7 @@ public class NewWanAuthenticationDUnitTest extends WANTestBase { accessor); } if (clientAuthInit != null) { - authProps.setProperty(DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME, - clientAuthInit); + authProps.setProperty(SECURITY_CLIENT_AUTH_INIT, clientAuthInit); } if (extraAuthProps != null) { authProps.putAll(extraAuthProps);
