You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/06/07 19:06:20 UTC
[01/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1372 48566a986 -> ba4361859
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);
[07/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index ea1df6a..ed5a60f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -168,7 +168,7 @@ public class InternalDistributedSystemJUnitTest
public void testMemberTimeout() {
Properties props = new Properties();
int memberTimeout = 100;
- props.put(DistributionConfig.MEMBER_TIMEOUT_NAME, String.valueOf(memberTimeout));
+ props.put(MEMBER_TIMEOUT, String.valueOf(memberTimeout));
props.put(MCAST_PORT, "0");
DistributionConfig config = createSystem(props).getOriginalConfig();
@@ -301,7 +301,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.LOG_LEVEL_NAME, logLevel.toString());
+ props.put(LOG_LEVEL, logLevel.toString());
DistributionConfig config = createSystem(props).getConfig();
assertEquals(logLevel.intValue(), config.getLogLevel());
@@ -311,7 +311,7 @@ public class InternalDistributedSystemJUnitTest
public void testInvalidLogLevel() {
try {
Properties props = new Properties();
- props.put(DistributionConfig.LOG_LEVEL_NAME, "blah blah blah");
+ props.put(LOG_LEVEL, "blah blah blah");
createSystem(props);
fail("Should have thrown an IllegalArgumentException");
@@ -326,7 +326,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+ props.put(STATISTIC_SAMPLING_ENABLED, "true");
DistributionConfig config = createSystem(props).getConfig();
assertEquals(true, config.getStatisticSamplingEnabled());
}
@@ -338,7 +338,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, rate);
+ props.put(STATISTIC_SAMPLE_RATE, rate);
DistributionConfig config = createSystem(props).getConfig();
// The fix for 48228 causes the rate to be 1000 even if we try to set it less
assertEquals(1000, config.getStatisticSampleRate());
@@ -349,7 +349,7 @@ public class InternalDistributedSystemJUnitTest
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, "5100-5200");
+ props.setProperty(MEMBERSHIP_PORT_RANGE, "5100-5200");
DistributionConfig config = createSystem(props).getConfig();
assertEquals(5100, config.getMembershipPortRange()[0]);
assertEquals(5200, config.getMembershipPortRange()[1]);
@@ -360,7 +360,7 @@ public class InternalDistributedSystemJUnitTest
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, "5200-5100");
+ props.setProperty(MEMBERSHIP_PORT_RANGE, "5200-5100");
Object exception = null;
try {
createSystem(props).getConfig();
@@ -377,7 +377,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, fileName);
+ props.put(STATISTIC_ARCHIVE_FILE, fileName);
DistributionConfig config = createSystem(props).getConfig();
assertEquals(fileName, config.getStatisticArchiveFile().getName());
}
@@ -393,7 +393,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, time);
+ props.put(ACK_WAIT_THRESHOLD, time);
DistributionConfig config = createSystem(props).getConfig();
assertEquals(Integer.parseInt(time), config.getAckWaitThreshold());
}
@@ -405,7 +405,7 @@ public class InternalDistributedSystemJUnitTest
*/
public void _testInvalidAckWaitThreshold() {
Properties props = new Properties();
- props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "blah");
+ props.put(ACK_WAIT_THRESHOLD, "blah");
try {
createSystem(props);
fail("Should have thrown an IllegalArgumentException");
@@ -422,7 +422,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.CACHE_XML_FILE_NAME, fileName);
+ props.put(CACHE_XML_FILE, fileName);
DistributionConfig config = createSystem(props).getConfig();
assertEquals(fileName, config.getCacheXmlFile().getPath());
}
@@ -434,7 +434,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, value);
+ props.put(ARCHIVE_DISK_SPACE_LIMIT, value);
DistributionConfig config = createSystem(props).getConfig();
assertEquals(Integer.parseInt(value), config.getArchiveDiskSpaceLimit());
}
@@ -442,7 +442,7 @@ public class InternalDistributedSystemJUnitTest
@Test
public void testInvalidArchiveDiskSpaceLimit() {
Properties props = new Properties();
- props.put(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "blah");
+ props.put(ARCHIVE_DISK_SPACE_LIMIT, "blah");
try {
createSystem(props);
fail("Should have thrown an IllegalArgumentException");
@@ -459,7 +459,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, value);
+ props.put(ARCHIVE_FILE_SIZE_LIMIT, value);
DistributionConfig config = createSystem(props).getConfig();
assertEquals(Integer.parseInt(value), config.getArchiveFileSizeLimit());
}
@@ -467,7 +467,7 @@ public class InternalDistributedSystemJUnitTest
@Test
public void testInvalidArchiveFileSizeLimit() {
Properties props = new Properties();
- props.put(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "blah");
+ props.put(ARCHIVE_FILE_SIZE_LIMIT, "blah");
try {
createSystem(props);
fail("Should have thrown an IllegalArgumentException");
@@ -484,7 +484,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, value);
+ props.put(LOG_DISK_SPACE_LIMIT, value);
DistributionConfig config = createSystem(props).getConfig();
assertEquals(Integer.parseInt(value), config.getLogDiskSpaceLimit());
}
@@ -492,7 +492,7 @@ public class InternalDistributedSystemJUnitTest
@Test
public void testInvalidLogDiskSpaceLimit() {
Properties props = new Properties();
- props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "blah");
+ props.put(LOG_DISK_SPACE_LIMIT, "blah");
try {
createSystem(props);
fail("Should have thrown an IllegalArgumentException");
@@ -509,7 +509,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, value);
+ props.put(LOG_FILE_SIZE_LIMIT, value);
DistributionConfig config = createSystem(props).getConfig();
assertEquals(Integer.parseInt(value), config.getLogFileSizeLimit());
}
@@ -517,7 +517,7 @@ public class InternalDistributedSystemJUnitTest
@Test
public void testInvalidLogFileSizeLimit() {
Properties props = new Properties();
- props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "blah");
+ props.put(LOG_FILE_SIZE_LIMIT, "blah");
try {
createSystem(props);
fail("Should have thrown an IllegalArgumentException");
@@ -566,7 +566,7 @@ public class InternalDistributedSystemJUnitTest
File spropFile = new File("gfsecurity.properties");
boolean spropFileExisted = spropFile.exists();
try {
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, "finest");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, "finest");
Properties apiProps = new Properties();
apiProps.setProperty(DistributionConfig.GROUPS_NAME, "foo, bar");
{
@@ -584,7 +584,7 @@ public class InternalDistributedSystemJUnitTest
spropFile.renameTo(new File("gfsecurity.properties.sav"));
}
Properties fileProps = new Properties();
- fileProps.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "999");
+ fileProps.setProperty(STATISTIC_SAMPLE_RATE, "999");
FileWriter fw = new FileWriter("gfsecurity.properties");
fileProps.store(fw, null);
fw.close();
@@ -592,9 +592,9 @@ public class InternalDistributedSystemJUnitTest
DistributionConfigImpl dci = new DistributionConfigImpl(apiProps);
assertEquals(null, dci.getAttributeSource(MCAST_PORT));
assertEquals(ConfigSource.api(), dci.getAttributeSource(DistributionConfig.GROUPS_NAME));
- assertEquals(ConfigSource.sysprop(), dci.getAttributeSource(DistributionConfig.LOG_LEVEL_NAME));
+ assertEquals(ConfigSource.sysprop(), dci.getAttributeSource(LOG_LEVEL));
assertEquals(ConfigSource.Type.FILE, dci.getAttributeSource("name").getType());
- assertEquals(ConfigSource.Type.SECURE_FILE, dci.getAttributeSource(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME).getType());
+ assertEquals(ConfigSource.Type.SECURE_FILE, dci.getAttributeSource(STATISTIC_SAMPLE_RATE).getType());
} finally {
System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "log-level");
propFile.delete();
@@ -629,7 +629,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.put(DistributionConfig.LOG_LEVEL_NAME, level.toString());
+ props.put(LOG_LEVEL, level.toString());
InternalDistributedSystem system = createSystem(props);
assertEquals(level.intValue(), system.getConfig().getLogLevel());
assertEquals(level.intValue(), ((InternalLogWriter) system.getLogWriter()).getLogWriterLevel());
@@ -688,7 +688,7 @@ public class InternalDistributedSystemJUnitTest
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true");
+ props.setProperty(SSL_ENABLED, "true");
Config config1 = new DistributionConfigImpl(props, false);
Properties props1 = config1.toProperties();
// For the deprecated ssl-* properties a decision was made
@@ -697,12 +697,12 @@ public class InternalDistributedSystemJUnitTest
// and its use in toProperties.
// The other thing that is done is the ssl-* props are copied to cluster-ssl-*.
// The following two assertions demonstrate this.
- assertEquals(null, props1.getProperty(DistributionConfig.SSL_ENABLED_NAME));
- assertEquals("true", props1.getProperty(DistributionConfig.CLUSTER_SSL_ENABLED_NAME));
+ assertEquals(null, props1.getProperty(SSL_ENABLED));
+ assertEquals("true", props1.getProperty(CLUSTER_SSL_ENABLED));
Config config2 = new DistributionConfigImpl(props1, false);
assertEquals(true, config1.sameAs(config2));
Properties props3 = new Properties(props1);
- props3.setProperty(DistributionConfig.SSL_ENABLED_NAME, "false");
+ props3.setProperty(SSL_ENABLED, "false");
Config config3 = new DistributionConfigImpl(props3, false);
assertEquals(false, config1.sameAs(config3));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
index 0185e03..e7b225b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
@@ -34,7 +34,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class ProductUseLogDUnitTest extends CacheTestCase {
@@ -51,7 +51,7 @@ public class ProductUseLogDUnitTest extends CacheTestCase {
@Override
public Properties getDistributedSystemProperties() {
Properties p = super.getDistributedSystemProperties();
- p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+ p.put(USE_CLUSTER_CONFIGURATION, "false");
return p;
}
@@ -64,7 +64,7 @@ public class ProductUseLogDUnitTest extends CacheTestCase {
int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
Properties p = new Properties();
p.put(START_LOCATOR, "localhost[" + locatorPort + "],peer=false");
- p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+ p.put(USE_CLUSTER_CONFIGURATION, "false");
InternalDistributedSystem system = getSystem(p);
InternalLocator locator = (InternalLocator)Locator.getLocator();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
index 05f498e..da8e8de 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
@@ -40,8 +40,7 @@ import java.io.File;
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.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
@@ -100,12 +99,12 @@ public class MembershipJUnitTest {
// create configuration objects
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+ nonDefault.put(DISABLE_TCP, "true");
nonDefault.put(MCAST_PORT, String.valueOf(mcastPort));
- nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
- nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ nonDefault.put(LOG_FILE, "");
+ nonDefault.put(LOG_LEVEL, "fine");
nonDefault.put(DistributionConfig.GROUPS_NAME, "red, blue");
- nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
+ nonDefault.put(MEMBER_TIMEOUT, "2000");
nonDefault.put(LOCATORS, localHost.getHostName() + '[' + port + ']');
DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
RemoteTransportConfig transport = new RemoteTransportConfig(config,
@@ -205,7 +204,7 @@ public class MembershipJUnitTest {
public void testJoinTimeoutSetting() throws Exception {
long timeout = 30000;
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, ""+timeout);
+ nonDefault.put(MEMBER_TIMEOUT, ""+timeout);
DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
RemoteTransportConfig transport = new RemoteTransportConfig(config,
DistributionManager.NORMAL_DM_TYPE);
@@ -246,10 +245,10 @@ public class MembershipJUnitTest {
@Test
public void testMulticastDiscoveryNotAllowed() {
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+ nonDefault.put(DISABLE_TCP, "true");
nonDefault.put(MCAST_PORT, "12345");
- nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
- nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ nonDefault.put(LOG_FILE, "");
+ nonDefault.put(LOG_LEVEL, "fine");
nonDefault.put(LOCATORS, "");
DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
RemoteTransportConfig transport = new RemoteTransportConfig(config,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 2786508..5ac830b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -87,14 +87,14 @@ public class GMSHealthMonitorJUnitTest {
Stopper stopper = mock(Stopper.class);
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "1");
- nonDefault.put(DistributionConfig.ACK_SEVERE_ALERT_THRESHOLD_NAME, "10");
- nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+ nonDefault.put(ACK_WAIT_THRESHOLD, "1");
+ nonDefault.put(ACK_SEVERE_ALERT_THRESHOLD, "10");
+ nonDefault.put(DISABLE_TCP, "true");
nonDefault.put(MCAST_PORT, "0");
nonDefault.put(MCAST_TTL, "0");
- nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
- nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
- nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
+ nonDefault.put(LOG_FILE, "");
+ nonDefault.put(LOG_LEVEL, "fine");
+ nonDefault.put(MEMBER_TIMEOUT, "2000");
nonDefault.put(LOCATORS, "localhost[10344]");
DM dm = mock(DM.class);
InternalDistributedSystem system = InternalDistributedSystem.newInstanceForTesting(dm, nonDefault);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index 806b8cb..7d2ab74 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -141,10 +141,10 @@ public class GMSLocatorRecoveryJUnitTest {
// create configuration objects
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+ nonDefault.put(DISABLE_TCP, "true");
nonDefault.put(MCAST_PORT, "0");
- nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
- nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ nonDefault.put(LOG_FILE, "");
+ nonDefault.put(LOG_LEVEL, "fine");
nonDefault.put(LOCATORS, localHost.getHostAddress() + '[' + port + ']');
nonDefault.put(BIND_ADDRESS, localHost.getHostAddress());
DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index c3239b2..aff0e1e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -85,13 +85,13 @@ public class JGroupsMessengerJUnitTest {
messenger = null;
}
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+ nonDefault.put(DISABLE_TCP, "true");
nonDefault.put(MCAST_PORT, enableMcast ? "" + AvailablePortHelper.getRandomAvailableUDPPort() : "0");
nonDefault.put(MCAST_TTL, "0");
- nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
- nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ nonDefault.put(LOG_FILE, "");
+ nonDefault.put(LOG_LEVEL, "fine");
nonDefault.put(LOCATORS, "localhost[10344]");
- nonDefault.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "1");
+ nonDefault.put(ACK_WAIT_THRESHOLD, "1");
DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
RemoteTransportConfig tconfig = new RemoteTransportConfig(config,
DistributionManager.NORMAL_DM_TYPE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
index 1bc4ed2..fdfb46e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
@@ -75,14 +75,14 @@ public class GMSMembershipManagerJUnitTest {
@Before
public void initMocks() throws Exception {
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "1");
- nonDefault.put(DistributionConfig.ACK_SEVERE_ALERT_THRESHOLD_NAME, "10");
- nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+ nonDefault.put(ACK_WAIT_THRESHOLD, "1");
+ nonDefault.put(ACK_SEVERE_ALERT_THRESHOLD, "10");
+ nonDefault.put(DISABLE_TCP, "true");
nonDefault.put(MCAST_PORT, "0");
nonDefault.put(MCAST_TTL, "0");
- nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
- nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
- nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
+ nonDefault.put(LOG_FILE, "");
+ nonDefault.put(LOG_LEVEL, "fine");
+ nonDefault.put(MEMBER_TIMEOUT, "2000");
nonDefault.put(LOCATORS, "localhost[10344]");
distConfig = new DistributionConfigImpl(nonDefault);
distProperties = nonDefault;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 897fafd..f312d3c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -38,8 +38,7 @@ import java.io.File;
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.*;
/**
* This tests the rolling upgrade for locators with
@@ -110,8 +109,8 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
final Properties props = new Properties();
props.setProperty(LOCATORS, locators);
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "finest");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(LOG_LEVEL, "finest");
// Start locator0 with props.
//props.setProperty(DistributionConfig.START_LOCATOR_NAME, host.getHostName() + "["+port0+"]");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
index f0ea16d..217ebf8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
@@ -17,10 +17,11 @@
package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache30.CacheMapTxnDUnitTest;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Same tests as that of {@link CacheMapTxnDUnitTest} after setting
@@ -59,8 +60,8 @@ public class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest {
}
public static void setDistributedTX() {
- props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-// props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+// props.setProperty(LOG_LEVEL, "fine");
}
public static void checkIsDistributedTX() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
index ead27d1..7f1a37a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
@@ -50,7 +50,7 @@ public class DistTXJUnitTest extends TXJUnitTest {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
- // p.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ // p.setProperty(LOG_LEVEL, "fine");
this.cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(p));
createRegion();
this.txMgr = this.cache.getCacheTransactionManager();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
index 71d82a9..a6a8a0f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
@@ -18,8 +18,8 @@ package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache30.TXOrderDUnitTest;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
@@ -36,8 +36,8 @@ public class DistTXOrderDUnitTest extends TXOrderDUnitTest {
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-// props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
index a935950..78a648a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
@@ -17,8 +17,7 @@
package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache30.TXRestrictionsDUnitTest;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
/**
@@ -35,8 +34,8 @@ public class DistTXRestrictionsDUnitTest extends TXRestrictionsDUnitTest {
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
// props.put("distributed-transactions", "true");
- props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-// props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+// props.setProperty(LOG_LEVEL, "fine");
return props;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
index befeca7..b22d37e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
@@ -16,10 +16,9 @@
*/
package com.gemstone.gemfire.disttx;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.TransactionsWithDeltaDUnitTest;
-
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest {
@@ -30,8 +29,8 @@ public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest {
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
- // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+ // props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 9b40e48..8aecf6b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -151,7 +151,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
//props.put("distributed-transactions", "true");
-// props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
index 7f75cae..66535bb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
@@ -16,9 +16,8 @@
*/
package com.gemstone.gemfire.disttx;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.execute.PRTransactionDUnitTest;
-
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
@@ -30,8 +29,8 @@ public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-// props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
index 2e539e3..e50755e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
@@ -48,7 +48,7 @@ public class PRDistTXJUnitTest extends PRTXJUnitTest {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
- // p.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ // p.setProperty(LOG_LEVEL, "fine");
this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
.connect(p));
createRegion();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
index f02ade9..934aef2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -16,11 +16,12 @@
*/
package com.gemstone.gemfire.disttx;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.execute.PRTransactionWithVersionsDUnitTest;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class PRDistTXWithVersionsDUnitTest extends
PRTransactionWithVersionsDUnitTest {
@@ -31,8 +32,8 @@ public class PRDistTXWithVersionsDUnitTest extends
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-// props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
index d9b8ed7..c514b60 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
@@ -16,9 +16,8 @@
*/
package com.gemstone.gemfire.disttx;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.partitioned.PersistentPartitionedRegionWithTransactionDUnitTest;
-
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
@@ -33,8 +32,8 @@ public class PersistentPartitionedRegionWithDistTXDUnitTest extends
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-// props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
index 48fa764..287ab86 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
@@ -24,69 +24,70 @@ import org.junit.experimental.categories.Category;
import java.lang.reflect.Method;
import java.util.Map;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@Category(UnitTest.class)
public class AbstractConfigJUnitTest {
- @Test
- public void testDisplayPropertyValue() throws Exception {
- AbstractConfigTestClass actc = new AbstractConfigTestClass();
- Method method = actc.getClass().getSuperclass().getDeclaredMethod("okToDisplayPropertyValue", String.class);
- method.setAccessible(true);
- assertFalse((Boolean) method.invoke(actc, "password"));
- assertFalse((Boolean) method.invoke(actc, DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
- assertTrue((Boolean) method.invoke(actc, DistributionConfig.CLUSTER_SSL_ENABLED_NAME));
- assertFalse((Boolean) method.invoke(actc, DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME));
- assertFalse((Boolean) method.invoke(actc, DistributionConfig.SERVER_SSL_KEYSTORE_PASSWORD_NAME));
- assertTrue((Boolean) method.invoke(actc, DistributionConfig.SSL_ENABLED_NAME));
- assertTrue((Boolean) method.invoke(actc, DistributionConfig.CONSERVE_SOCKETS_NAME));
- assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStorePassword"));
- assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStoreType"));
- assertFalse((Boolean) method.invoke(actc, "sysprop-value"));
- }
+ @Test
+ public void testDisplayPropertyValue() throws Exception {
+ AbstractConfigTestClass actc = new AbstractConfigTestClass();
+ Method method = actc.getClass().getSuperclass().getDeclaredMethod("okToDisplayPropertyValue", String.class);
+ method.setAccessible(true);
+ assertFalse((Boolean) method.invoke(actc, "password"));
+ assertFalse((Boolean) method.invoke(actc,CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ assertTrue((Boolean) method.invoke(actc, CLUSTER_SSL_ENABLED));
+ assertFalse((Boolean) method.invoke(actc, GATEWAY_SSL_TRUSTSTORE_PASSWORD));
+ assertFalse((Boolean) method.invoke(actc, SERVER_SSL_KEYSTORE_PASSWORD));
+ assertTrue((Boolean) method.invoke(actc, SSL_ENABLED));
+ assertTrue((Boolean) method.invoke(actc, CONSERVE_SOCKETS));
+ assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStorePassword"));
+ assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStoreType"));
+ assertFalse((Boolean) method.invoke(actc, "sysprop-value"));
+ }
- private static class AbstractConfigTestClass extends AbstractConfig {
+ private static class AbstractConfigTestClass extends AbstractConfig {
- @Override
- protected Map getAttDescMap() {
- return null;
- }
+ @Override
+ protected Map getAttDescMap() {
+ return null;
+ }
- @Override
- protected Map<String, ConfigSource> getAttSourceMap() {
- return null;
- }
+ @Override
+ protected Map<String, ConfigSource> getAttSourceMap() {
+ return null;
+ }
- @Override
- public Object getAttributeObject(String attName) {
- return null;
- }
+ @Override
+ public Object getAttributeObject(String attName) {
+ return null;
+ }
- @Override
- public void setAttributeObject(String attName, Object attValue, ConfigSource source) {
+ @Override
+ public void setAttributeObject(String attName, Object attValue, ConfigSource source) {
- }
+ }
- @Override
- public boolean isAttributeModifiable(String attName) {
- return false;
- }
+ @Override
+ public boolean isAttributeModifiable(String attName) {
+ return false;
+ }
- @Override
- public Class getAttributeType(String attName) {
- return null;
- }
+ @Override
+ public Class getAttributeType(String attName) {
+ return null;
+ }
- @Override
- public String[] getAttributeNames() {
- return new String[0];
- }
+ @Override
+ public String[] getAttributeNames() {
+ return new String[0];
+ }
- @Override
- public String[] getSpecificAttributeNames() {
- return new String[0];
- }
- }
+ @Override
+ public String[] getSpecificAttributeNames() {
+ return new String[0];
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
index 9d50cc5..c53a3d1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
@@ -43,8 +43,7 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-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.*;
import static org.junit.Assume.assumeFalse;
@@ -181,7 +180,7 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
final File archiveFile1 = new File(dir + File.separator + this.testName + ".gfs");
Properties props = createGemFireProperties();
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, archiveFileName);
+ props.setProperty(STATISTIC_ARCHIVE_FILE, archiveFileName);
connect(props);
GemFireStatSampler statSampler = getGemFireStatSampler();
@@ -360,9 +359,9 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
// set the system property to use KB instead of MB for file size
System.setProperty(HostStatSampler.TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY, "true");
Properties props = createGemFireProperties();
- props.setProperty(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "1");
- props.setProperty(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "0");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, archiveFileName);
+ props.setProperty(ARCHIVE_FILE_SIZE_LIMIT, "1");
+ props.setProperty(ARCHIVE_DISK_SPACE_LIMIT, "0");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, archiveFileName);
connect(props);
assertTrue(getGemFireStatSampler().waitForInitialization(5000));
@@ -408,10 +407,10 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
// set the system property to use KB instead of MB for file size
System.setProperty(HostStatSampler.TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY, "true");
Properties props = createGemFireProperties();
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, archiveFileName);
- props.setProperty(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "1");
- props.setProperty(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "12");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, String.valueOf(sampleRate));
+ props.setProperty(STATISTIC_ARCHIVE_FILE, archiveFileName);
+ props.setProperty(ARCHIVE_FILE_SIZE_LIMIT, "1");
+ props.setProperty(ARCHIVE_DISK_SPACE_LIMIT, "12");
+ props.setProperty(STATISTIC_SAMPLE_RATE, String.valueOf(sampleRate));
connect(props);
assertTrue(getGemFireStatSampler().waitForInitialization(5000));
@@ -534,11 +533,11 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
private Properties createGemFireProperties() {
Properties props = new Properties();
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); // TODO: test true/false
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); // TODO: test true/false
- props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, String.valueOf(STAT_SAMPLE_RATE));
- props.setProperty(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "0");
- props.setProperty(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "0");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); // TODO: test true/false
+ props.setProperty(ENABLE_TIME_STATISTICS, "true"); // TODO: test true/false
+ props.setProperty(STATISTIC_SAMPLE_RATE, String.valueOf(STAT_SAMPLE_RATE));
+ props.setProperty(ARCHIVE_FILE_SIZE_LIMIT, "0");
+ props.setProperty(ARCHIVE_DISK_SPACE_LIMIT, "0");
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
return props;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
index fc9fef5..fc1e40d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
@@ -42,7 +42,7 @@ import java.net.ServerSocket;
import java.net.Socket;
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.assertTrue;
import static org.junit.Assert.fail;
@@ -101,10 +101,10 @@ public class JSSESocketJUnitTest {
LogService.setBaseLogLevel(Level.DEBUG);
{
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT, "0");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_ENABLED_NAME, "true");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_CIPHERS_NAME, "any");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_PROTOCOLS_NAME, "TLSv1.2");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_ENABLED, "true");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_REQUIRE_AUTHENTICATION, "true");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_CIPHERS, "any");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_PROTOCOLS, "TLSv1.2");
File jks = findTestJKS();
System.setProperty("javax.net.ssl.trustStore", jks.getCanonicalPath());
@@ -164,7 +164,7 @@ public class JSSESocketJUnitTest {
public void testClientSocketFactory() {
System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "clientSocketFactory",
TSocketFactory.class.getName());
- System.getProperties().remove(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_ENABLED_NAME);
+ System.getProperties().remove(DistributionConfig.GEMFIRE_PREFIX + SSL_ENABLED);
SocketCreator.getDefaultInstance(new Properties());
factoryInvoked = false;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index 84a72b0..02bb437 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -21,6 +21,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.test.dunit.Assert;
@@ -456,7 +457,7 @@ public class JarDeployerDUnitTest extends CacheTestCase {
// Add the alternate directory to the distributed system, get it back out, and then create
// a JarDeployer object with it.
Properties properties = new Properties();
- properties.put(DistributionConfig.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
+ properties.put(SystemConfigurationProperties.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
InternalDistributedSystem distributedSystem = getSystem(properties);
final JarDeployer jarDeployer = new JarDeployer(distributedSystem.getConfig().getDeployWorkingDir());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
index 5e179f2..a2e7414 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
@@ -55,7 +55,7 @@ public class PdxDeleteFieldDUnitTest extends CacheTestCase{
final int[] locatorPorts = AvailablePortHelper.getRandomAvailableTCPPorts(2);
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + locatorPorts[0] + "],localhost[" + locatorPorts[1] + "]");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
final File f = new File(DS_NAME);
f.mkdir();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
index ede5e16..6e63465 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
@@ -62,7 +62,7 @@ public class PdxRenameDUnitTest extends CacheTestCase{
final Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + locatorPorts[0] + "],localhost[" + locatorPorts[1] + "]");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
Host host = Host.getHost(0);
VM vm1 = host.getVM(0);
[27/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0a059858
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0a059858
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0a059858
Branch: refs/heads/feature/GEODE-1372
Commit: 0a0598587f5d9386b1a8a8f6fba9f7f2e3f5d4d9
Parents: 03f5e0c
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue May 31 13:38:05 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../LocatorLauncherLocalIntegrationTest.java | 6 +++---
.../ServerLauncherLocalIntegrationTest.java | 3 +--
.../gemfire/disttx/CacheMapDistTXDUnitTest.java | 1 -
.../com/gemstone/gemfire/disttx/DistTXJUnitTest.java | 6 ++----
.../gemstone/gemfire/disttx/DistTXOrderDUnitTest.java | 1 -
.../gemfire/disttx/DistTXRestrictionsDUnitTest.java | 2 --
.../gemfire/disttx/DistTXWithDeltaDUnitTest.java | 1 -
.../disttx/DistributedTransactionDUnitTest.java | 2 --
.../com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java | 1 -
.../com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java | 1 -
.../gemfire/disttx/PRDistTXWithVersionsDUnitTest.java | 1 -
...PersistentPartitionedRegionWithDistTXDUnitTest.java | 1 -
.../gemfire/internal/cache/DiskRegionTestingBase.java | 3 ---
.../internal/cache/partitioned/Bug43684DUnitTest.java | 4 ----
.../internal/cache/partitioned/Bug51400DUnitTest.java | 13 -------------
.../tier/sockets/DurableClientQueueSizeDUnitTest.java | 11 -----------
.../management/bean/stats/MBeanStatsTestCase.java | 1 -
.../gemfire/test/dunit/standalone/DUnitLauncher.java | 4 ++--
.../gemfire/test/dunit/standalone/ProcessManager.java | 4 +++-
19 files changed, 11 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index 8500399..ff8ca6f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -257,7 +257,8 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
@Test
@Ignore("Need to rewrite this without using dunit.Host")
public void testStartUsingForceOverwritesExistingPidFile() throws Throwable {
- }/*
+ }
+ /*
assertTrue(getUniqueName() + " is broken if PID == Integer.MAX_VALUE", ProcessUtils.identifyPid() != Integer.MAX_VALUE);
// create existing pid file
@@ -272,7 +273,6 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setMemberName(getUniqueName())
.setPort(this.locatorPort)
.setRedirectOutput(true)
- .set(LOG_LEVEL, "config");
assertTrue(builder.getForce());
this.launcher = builder.build();
@@ -422,7 +422,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setMemberName(getUniqueName())
.setPort(this.locatorPort)
.setRedirectOutput(true)
- .set(LOG_LEVEL, "config");
+ .set(logLevel, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
index e15da94..a30c85f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
@@ -416,7 +416,6 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setForce(true)
.setMemberName(getUniqueName())
.setRedirectOutput(true)
- .set(LOG_LEVEL, "config")
.set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
assertTrue(builder.getForce());
@@ -697,7 +696,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setDisableDefaultServer(true)
.setMemberName(getUniqueName())
.setRedirectOutput(true)
- .set(LOG_LEVEL, "config")
+ .set(logLevel, "config")
.set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
assertFalse(builder.getForce());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
index 217ebf8..32748b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
@@ -61,7 +61,6 @@ public class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest {
public static void setDistributedTX() {
props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-// props.setProperty(LOG_LEVEL, "fine");
}
public static void checkIsDistributedTX() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
index 7f1a37a..0f91d55 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.TXJUnitTest;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -32,7 +31,7 @@ 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.*;
/**
* Run the basic transaction functionality tests in TXJUnitTest after setting
@@ -49,8 +48,7 @@ public class DistTXJUnitTest extends TXJUnitTest {
protected void createCache() throws Exception {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
- p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
- // p.setProperty(LOG_LEVEL, "fine");
+ p.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
this.cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(p));
createRegion();
this.txMgr = this.cache.getCacheTransactionManager();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
index a6a8a0f..2dfa96b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
@@ -37,7 +37,6 @@ public class DistTXOrderDUnitTest extends TXOrderDUnitTest {
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
index 78a648a..1350ecb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
@@ -33,9 +33,7 @@ public class DistTXRestrictionsDUnitTest extends TXRestrictionsDUnitTest {
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
-// props.put("distributed-transactions", "true");
props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-// props.setProperty(LOG_LEVEL, "fine");
return props;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
index b22d37e..53e8344 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
@@ -30,7 +30,6 @@ public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest {
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
- // props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 8aecf6b..3538e41 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -150,8 +150,6 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- //props.put("distributed-transactions", "true");
-// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
index 66535bb..2ecd31a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
@@ -30,7 +30,6 @@ public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
index e50755e..8e98f04 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
@@ -48,7 +48,6 @@ public class PRDistTXJUnitTest extends PRTXJUnitTest {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
- // p.setProperty(LOG_LEVEL, "fine");
this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
.connect(p));
createRegion();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
index 934aef2..4306444 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -33,7 +33,6 @@ public class PRDistTXWithVersionsDUnitTest extends
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
index c514b60..a2d88c2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
@@ -33,7 +33,6 @@ public class PersistentPartitionedRegionWithDistTXDUnitTest extends
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-// props.setProperty(LOG_LEVEL, "fine");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
index 83a29ae..e6ac042 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
@@ -174,9 +174,6 @@ public class DiskRegionTestingBase
}
protected Cache createCache() {
- // useful for debugging:
-// props.put(LOG_FILE, "diskRegionTestingBase_system.log");
-// props.put(LOG_LEVEL, getGemFireLogLevel());
cache = new CacheFactory(props).create();
ds = cache.getDistributedSystem();
logWriter = cache.getLogger();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/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 b8eeccd..6fbcdff 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
@@ -232,8 +232,6 @@ public class Bug43684DUnitTest extends DistributedTestCase {
DistributedTestCase.disconnectFromDS();
Properties props = new Properties();
props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
-// props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
- // props.setProperty(LOG_LEVEL, "fine");
props.setProperty(STATISTIC_ARCHIVE_FILE, "server_" + OSProcess.getId()
+ ".gfs");
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
@@ -260,8 +258,6 @@ public class Bug43684DUnitTest extends DistributedTestCase {
public static void createClientCache(Host host, Integer port) {
DistributedTestCase.disconnectFromDS();
Properties props = new Properties();
-// 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");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/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 bd8a71d..9ee0319 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
@@ -91,11 +91,6 @@ public class Bug51400DUnitTest extends DistributedTestCase {
Integer maxMessageCount) throws Exception {
Properties props = new Properties();
props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
-// props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
- // props.setProperty(LOG_LEVEL, "fine");
-// props.setProperty("statistic-archive-file", "server_" + OSProcess.getId()
-// + ".gfs");
-// props.setProperty("statistic-sampling-enabled", "true");
Bug51400DUnitTest test = new Bug51400DUnitTest("Bug51400DUnitTest");
DistributedSystem ds = test.getSystem(props);
@@ -120,14 +115,6 @@ public class Bug51400DUnitTest extends DistributedTestCase {
public static void createClientCache(String hostName, Integer[] ports,
Integer interval) throws Exception {
Properties props = new Properties();
-// props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME,
-// "my-durable-client-" + ports.length);
-// props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000");
-// 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");
DistributedSystem ds = new Bug51400DUnitTest("Bug51400DUnitTest").getSystem(props);
ds.disconnect();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/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 3705336..4e16cad 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
@@ -253,12 +253,6 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase {
throws Exception {
Properties props = new Properties();
props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
- // props.setProperty(LOG_LEVEL, "fine");
-// props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
-// props.setProperty("statistic-archive-file", "server_" + OSProcess.getId()
-// + ".gfs");
-// props.setProperty("statistic-sampling-enabled", "true");
-
DurableClientQueueSizeDUnitTest test = new DurableClientQueueSizeDUnitTest(
"DurableClientQueueSizeDUnitTest");
DistributedSystem ds = test.getSystem(props);
@@ -310,11 +304,6 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase {
props.setProperty(DURABLE_CLIENT_TIMEOUT,
timeoutSeconds);
}
- // 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");
DistributedSystem ds = new DurableClientQueueSizeDUnitTest(
"DurableClientQueueSizeDUnitTest").getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
index 3bba787..b1d8ba7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
@@ -50,7 +50,6 @@ public abstract class MBeanStatsTestCase {
//System.setProperty("gemfire.stats.debug.debugSampleCollector", "true");
final Properties props = new Properties();
- //props.setProperty(LOG_LEVEL, "finest");
props.setProperty(MCAST_PORT, "0");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/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 a1fa2dd..99990be 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
@@ -64,7 +64,7 @@ import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class DUnitLauncher {
/** change this to use a different log level in unit tests */
- public static final String LOG_LEVEL = System.getProperty("logLevel", "info");
+ public static final String logLevel = System.getProperty("logLevel", "info");
public static final String LOG4J = System.getProperty("log4j.configurationFile");
@@ -213,7 +213,7 @@ public class DUnitLauncher {
p.setProperty(MCAST_PORT, "0");
p.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
p.setProperty(USE_CLUSTER_CONFIGURATION, "false");
- p.setProperty(LOG_LEVEL, LOG_LEVEL);
+ p.setProperty(LOG_LEVEL, logLevel);
return p;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
index 797e96a..4245baa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
@@ -33,6 +33,8 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
*
*/
@@ -167,7 +169,7 @@ public class ProcessManager {
if (vmNum >= 0) { // let the locator print a banner
cmds.add("-D" + InternalLocator.INHIBIT_DM_BANNER + "=true");
}
- cmds.add("-DlogLevel=" + DUnitLauncher.LOG_LEVEL);
+ cmds.add("-D"+LOG_LEVEL+"=" + DUnitLauncher.logLevel);
if (DUnitLauncher.LOG4J != null) {
cmds.add("-Dlog4j.configurationFile=" + DUnitLauncher.LOG4J);
}
[21/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
index 440bbf6..e4c4b63 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -34,7 +33,7 @@ import java.util.Properties;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
index 95dd4a3..d8d68f3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 4c3b709..5729ad5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index 6fca17d..57e1ee4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
@@ -34,7 +34,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
index b250cf0..7c227d8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
@@ -62,7 +62,7 @@ public class MapClearGIIDUnitTest extends CacheTestCase {
/* public static void createCacheVM0() throws Exception {
InitialImageOperation.slowImageProcessing = 200;
Properties mprops = new Properties();
- // mprops.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "7777");
+ // mprops.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "7777");
ds = (new MapClearGIIDUnitTest("Clear")).getSystem(mprops);
//ds = DistributedSystem.connect(props);
@@ -74,7 +74,7 @@ public class MapClearGIIDUnitTest extends CacheTestCase {
public static void createCacheVM1() throws Exception {
Properties mprops = new Properties();
- // mprops.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "7777");
+ // mprops.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "7777");
ds = (new MapClearGIIDUnitTest("Clear")).getSystem(mprops);
// ds = DistributedSystem.connect(null);
cache = CacheFactory.create(ds);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
index 7591e66..7b24f96 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
@@ -28,8 +28,8 @@ import java.util.HashMap;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
index f7bd838..3d094a0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Performs eviction dunit tests for off-heap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
index 0994ed5..7ac1a9a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Performs eviction stat dunit tests for off-heap regions.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
index 7f5f5b0..748588f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
@@ -36,7 +36,7 @@ import java.io.FilenameFilter;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(IntegrationTest.class)
public class OfflineSnapshotJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
index 47b29e1..d9260a6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
index e755dc0..1f9aec7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
@@ -26,7 +26,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
index 3a839f1..c28a54d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
@@ -26,7 +26,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
index a6e2e5f..5c78048 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
@@ -22,7 +22,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests PartitionedRegion DataStore currentAllocatedMemory operation.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
index 6a6e2ba..8882238 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index 7fadf5e..bb41d50 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
index 5621829..a480b4c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
index 2a5f4a1..4642133 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
@@ -31,7 +31,7 @@ import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
index 4484fa9..e0a87b0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests PartitionedRegion localMaxMemory with Off-Heap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
index 6652120..0b6c259 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class PartitionedRegionOffHeapEvictionDUnitTest extends
PartitionedRegionEvictionDUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
index b61e71e..1d06545 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class PartitionedRegionRedundancyZoneDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 594e0f7..18ca858 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
@@ -54,7 +54,7 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 822100b..bd121fb 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,7 +43,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.StringTokenizer;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
index b434565..580133e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
@@ -26,8 +26,8 @@ import org.junit.Assert;
import java.io.Serializable;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 9ad571a..b72a1a5 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
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
index 15abb22..657d273 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 d7a57b4..0b82c98 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,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.TXExpiryJUnitTest;
import com.gemstone.gemfire.cache.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 ee57682..0e50a43 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,7 +19,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
@@ -29,8 +29,8 @@ import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
index 7cedbd0..ec6645f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
@@ -38,8 +38,8 @@ import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class SingleHopStatsDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
index ff00082..862c7b6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
@@ -30,8 +30,8 @@ import java.util.Properties;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
index c1688a7..a05f12e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
@@ -28,8 +28,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
@Category(IntegrationTest.class)
public class TXReservationMgrJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 e6080d8..d8dd06d 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
@@ -32,7 +32,7 @@ import org.junit.rules.TestName;
import java.net.InetAddress;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(IntegrationTest.class)
public class TombstoneCreationJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 379bdae..8c5384a 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
@@ -44,7 +44,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.Iterator;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
index bff92ca..a6d9d77 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
index 8a3ba0a..419245d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
@@ -38,7 +38,7 @@ import java.lang.management.MemoryPoolMXBean;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index fd161d7..4f46dc6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -32,7 +32,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
index 6463e46..488dcf6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -46,7 +46,7 @@ import java.util.concurrent.TimeoutException;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 2bf9b51..bc4db8e 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
@@ -29,7 +29,7 @@ import org.junit.rules.TestName;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(IntegrationTest.class)
public class MultiThreadedOplogPerJUnitPerformanceTest
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
index f579a93..8875895 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
@@ -38,8 +38,8 @@ import com.gemstone.gemfire.test.dunit.VM;
import java.util.ArrayList;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
@SuppressWarnings("serial")
public class Bug51193DUnitTest extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 47828e8..f6f4b01 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
@@ -22,9 +22,7 @@ import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.execute.*;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.LonerDistributionManager;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -42,7 +40,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index 1ff0a50..c6af7e6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -35,8 +35,8 @@ import com.gemstone.gemfire.test.dunit.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/*
* This is DUnite Test to test the Function Execution stats under various
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index c37e01f..f8d4937 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -35,7 +35,7 @@ import java.lang.reflect.Constructor;
import java.util.*;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
private static final String TEST_FUNCTION6 = TestFunction.TEST_FUNCTION6;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 6d36e83..b2821cd 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,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.execute;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheClosedException;
@@ -28,7 +28,6 @@ import com.gemstone.gemfire.cache.execute.*;
import com.gemstone.gemfire.cache.server.CacheServer;
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.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 bca0473..df7e9ae 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
@@ -40,7 +40,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
PRClientServerTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index 7b56a60..c6164de 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -35,8 +35,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class PRClientServerTestBase extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 80e3c1b..00f66f4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -37,8 +37,8 @@ import java.io.Serializable;
import java.util.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class PRFunctionExecutionDUnitTest extends
PartitionedRegionDUnitTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
index 6a63c68..502fa1d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
@@ -30,7 +30,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 3b52d81..a48b949 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -29,8 +29,8 @@ import junit.framework.Assert;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is a bug test for 36853 (Expiry logic in HA is used to expire early data
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 366bc72..15094bb 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,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.ha;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
@@ -25,7 +25,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.OSProcess;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
@@ -37,8 +36,8 @@ import java.util.Collection;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class Bug48571DUnitTest extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 c2dc270..c26cc59 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,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.ha;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
index ab912a8..00c488a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -35,8 +35,8 @@ import java.util.Iterator;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This test verifies that eventId, while being sent across the network ( client
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
index eb54d73..300ad4b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
@@ -33,8 +33,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
index e0ba099..ecce913 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
@@ -29,8 +29,8 @@ import com.gemstone.gemfire.test.dunit.VM;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This Dunit test is to verify the bug in put() operation. When the put is invoked on the server
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
index 5e3f926..2235ca2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
@@ -31,8 +31,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is the Dunit test to verify clear and destroyRegion operation in
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
index 346f37d..33b84d9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
@@ -28,8 +28,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is Targetted conflation Dunit test.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index efd6ff7..b6100b3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -29,8 +29,8 @@ import java.util.HashMap;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is the Dunit test to verify the duplicates after the fail over
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index fd09917..a5e9b41 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -37,8 +37,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
index 0eb589a..fabe3e6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
@@ -39,8 +39,8 @@ import java.util.Iterator;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Client is connected to S1 which has a slow dispatcher. Puts are made on S1. Then S2 is started
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
index 4acc174..6cb5b47 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
@@ -36,7 +36,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index ec8b646..2843fc0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -38,7 +38,7 @@ import util.TestException;
import java.io.File;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This DUnit contains various tests to ensure new implementation of ha region
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
index 425a20d..d98b3c7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
import java.io.IOException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 390aa44..59bdcaa 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,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.ha;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.SystemFailure;
@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CyclicBarrier;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
index f20e610..41d776c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
@@ -33,8 +33,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
index ac72788..aa4a0b3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import java.io.IOException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index ec90d80..46ad459 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.net.SocketException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class HASlowReceiverDUnitTest extends DistributedTestCase {
protected static Cache cache = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
index 4dbf631..eb86bd6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -28,8 +28,8 @@ import java.util.HashMap;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
index 4dcbad1..4cb1849 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
@@ -34,8 +34,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
index 0713bb9..0a66e5e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
@@ -30,8 +30,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is Dunit test for bug 36109. This test has a cache-client having a primary
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 e315db5..1be5f8e 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,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This class tests distributed ownership via the DistributedLockService api.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
index 1fba537..24685e4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
@@ -30,8 +30,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/** This class tests the LRUCapacityController's core clock algorithm. */
@Category(IntegrationTest.class)
@@ -43,7 +43,7 @@ public class LRUClockJUnitTest extends junit.framework.TestCase {
static Properties sysProps = new Properties();
static {
- //sysProps.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, String.valueOf(unusedPort));
+ //sysProps.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, String.valueOf(unusedPort));
// a loner is all this test needs
sysProps.setProperty(MCAST_PORT, "0");
sysProps.setProperty(LOCATORS, "");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
index 7dfd3ef..10f6b42 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
@@ -27,8 +27,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Test for transactional operations on overflowed data
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 6fbcdff..939e09a 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
@@ -33,7 +33,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* TODO This doesn't really test the optimised RI behaviour but only that RI
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 c20bbc1..ba24fe1 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
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The test creates two datastores with a partitioned region, and also running a
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 9ee0319..9193719 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
@@ -37,7 +37,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.DistributedSystemConfigProperties.LOCATORS;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index a1a6ad2..e6a765b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -50,8 +50,8 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.CountDownLatch;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.jayway.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 57f63e4..dabdd3c 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,7 +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.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This is a test of how persistent distributed
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
index 29de762..001a857 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
@@ -35,7 +35,7 @@ import java.net.BindException;
import java.util.Collections;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index 1517def..e447917 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -28,8 +28,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
[11/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 8033a41..702dda9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -60,24 +60,28 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* If set it must be unique in the ds.
* When set its used by tools to help identify the member.
* <p> The default value is: {@link #DEFAULT_NAME}.
+ *
* @return the system's name.
*/
- @ConfigAttributeGetter(name=NAME_NAME)
+ @ConfigAttributeGetter(name = NAME_NAME)
String getName();
/**
* Sets the member's name.
* <p> The name can not be changed while the system is running.
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ *
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
- @ConfigAttributeSetter(name=NAME_NAME)
+ @ConfigAttributeSetter(name = NAME_NAME)
void setName(String value);
- /** The name of the "name" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the "name" property
+ */
+ @ConfigAttribute(type = String.class)
String NAME_NAME = NAME;
/**
@@ -91,7 +95,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#mcast-port">"mcast-port"</a>
* property
*/
- @ConfigAttributeGetter(name=MCAST_PORT_NAME)
+ @ConfigAttributeGetter(name = MCAST_PORT_NAME)
int getMcastPort();
/**
@@ -99,10 +103,12 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#mcast-port">"mcast-port"</a>
* property
*/
- @ConfigAttributeSetter(name=MCAST_PORT_NAME)
+ @ConfigAttributeSetter(name = MCAST_PORT_NAME)
void setMcastPort(int value);
- /** The default value of the "mcastPort" property */
+ /**
+ * The default value of the "mcastPort" property
+ */
int DEFAULT_MCAST_PORT = 0;
/**
@@ -117,8 +123,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_MCAST_PORT = 65535;
- /** The name of the "mcastPort" property */
- @ConfigAttribute(type=Integer.class, min=MIN_MCAST_PORT, max=MAX_MCAST_PORT)
+ /**
+ * The name of the "mcastPort" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_MCAST_PORT, max = MAX_MCAST_PORT)
String MCAST_PORT_NAME = MCAST_PORT;
/**
@@ -137,7 +145,9 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
@ConfigAttributeSetter(name = TCP_PORT)
void setTcpPort(int value);
- /** The default value of the "tcpPort" property */
+ /**
+ * The default value of the "tcpPort" property
+ */
int DEFAULT_TCP_PORT = 0;
/**
@@ -152,8 +162,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_TCP_PORT = 65535;
- /** The name of the "tcpPort" property */
- @ConfigAttribute(type=Integer.class, min=MIN_TCP_PORT, max=MAX_TCP_PORT)
+ /**
+ * The name of the "tcpPort" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_TCP_PORT, max = MAX_TCP_PORT)
String TCP_PORT_NAME = TCP_PORT;
/**
@@ -172,11 +184,14 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
@ConfigAttributeSetter(name = MCAST_ADDRESS)
void setMcastAddress(InetAddress value);
- /** The name of the "mcastAddress" property */
- @ConfigAttribute(type=InetAddress.class)
+ /**
+ * The name of the "mcastAddress" property
+ */
+ @ConfigAttribute(type = InetAddress.class)
String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
- /** The default value of the "mcastAddress" property.
+ /**
+ * The default value of the "mcastAddress" property.
* Current value is <code>239.192.81.1</code>
*/
InetAddress DEFAULT_MCAST_ADDRESS = AbstractDistributionConfig._getDefaultMcastAddress();
@@ -197,7 +212,9 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
@ConfigAttributeSetter(name = MCAST_TTL)
void setMcastTtl(int value);
- /** The default value of the "mcastTtl" property */
+ /**
+ * The default value of the "mcastTtl" property
+ */
int DEFAULT_MCAST_TTL = 32;
/**
@@ -212,8 +229,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_MCAST_TTL = 255;
- /** The name of the "mcastTtl" property */
- @ConfigAttribute(type=Integer.class, min=MIN_MCAST_TTL, max=MAX_MCAST_TTL)
+ /**
+ * The name of the "mcastTtl" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_MCAST_TTL, max = MAX_MCAST_TTL)
String MCAST_TTL_NAME = MCAST_TTL;
/**
@@ -232,11 +251,14 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
@ConfigAttributeSetter(name = BIND_ADDRESS)
void setBindAddress(String value);
- /** The name of the "bindAddress" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the "bindAddress" property
+ */
+ @ConfigAttribute(type = String.class)
String BIND_ADDRESS_NAME = BIND_ADDRESS;
- /** The default value of the "bindAddress" property.
+ /**
+ * The default value of the "bindAddress" property.
* Current value is an empty string <code>""</code>
*/
String DEFAULT_BIND_ADDRESS = "";
@@ -257,11 +279,14 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
@ConfigAttributeSetter(name = SERVER_BIND_ADDRESS)
void setServerBindAddress(String value);
- /** The name of the "serverBindAddress" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the "serverBindAddress" property
+ */
+ @ConfigAttribute(type = String.class)
String SERVER_BIND_ADDRESS_NAME = SERVER_BIND_ADDRESS;
- /** The default value of the "serverBindAddress" property.
+ /**
+ * The default value of the "serverBindAddress" property.
* Current value is an empty string <code>""</code>
*/
String DEFAULT_SERVER_BIND_ADDRESS = "";
@@ -278,28 +303,33 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* A locator list is optional and by default empty.
* Its used to by the system to locator other system nodes
* and to publish itself so it can be located by others.
+ *
* @param value must be of the form <code>hostName[portNum]</code>.
- * Multiple elements are allowed and must be seperated by a comma.
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * Multiple elements are allowed and must be seperated by a comma.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
@ConfigAttributeSetter(name = LOCATORS)
void setLocators(String value);
- /** The name of the "locators" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the "locators" property
+ */
+ @ConfigAttribute(type = String.class)
String LOCATORS_NAME = LOCATORS;
- /** The default value of the "locators" property */
+ /**
+ * The default value of the "locators" property
+ */
String DEFAULT_LOCATORS = "";
/**
* Locator wait time - how long to wait for a locator to start before giving up &
* throwing a GemFireConfigException
*/
- @ConfigAttribute(type=Integer.class)
+ @ConfigAttribute(type = Integer.class)
String LOCATOR_WAIT_TIME_NAME = LOCATOR_WAIT_TIME;
int DEFAULT_LOCATOR_WAIT_TIME = 0;
@@ -309,18 +339,19 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
@ConfigAttributeSetter(name = LOCATOR_WAIT_TIME)
void setLocatorWaitTime(int seconds);
-
-
+
/**
* returns the value of the <a href="../DistribytedSystem.html#start-locator">"start-locator"
* </a> property
*/
@ConfigAttributeGetter(name = START_LOCATOR)
String getStartLocator();
+
/**
* Sets the start-locator property. This is a string in the form
* bindAddress[port] and, if set, tells the distributed system to start
* a locator prior to connecting
+ *
* @param value must be of the form <code>hostName[portNum]</code>
*/
@ConfigAttributeSetter(name = START_LOCATOR)
@@ -329,65 +360,67 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
/**
* The name of the "start-locator" property
*/
- @ConfigAttribute(type=String.class)
+ @ConfigAttribute(type = String.class)
String START_LOCATOR_NAME = START_LOCATOR;
/**
* The default value of the "start-locator" property
*/
String DEFAULT_START_LOCATOR = "";
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#deploy-working-dir">"deploy-working-dir"</a> property
*/
- @ConfigAttributeGetter(name=DEPLOY_WORKING_DIR)
+ @ConfigAttributeGetter(name = DEPLOY_WORKING_DIR)
File getDeployWorkingDir();
-
+
/**
* Sets the system's deploy working directory.
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ *
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
- @ConfigAttributeSetter(name=DEPLOY_WORKING_DIR)
+ @ConfigAttributeSetter(name = DEPLOY_WORKING_DIR)
void setDeployWorkingDir(File value);
-
+
/**
* The name of the "deploy-working-dir" property.
*/
- @ConfigAttribute(type=File.class)
- String DEPLOY_WORKING_DIR = SystemConfigurationProperties.DEPLOY_WORKING_DIR;
-
+ @ConfigAttribute(type = File.class)
+ String DEPLOY_WORKING_DIR_NAME = SystemConfigurationProperties.DEPLOY_WORKING_DIR;
+
/**
- * Default will be the current working directory as determined by
+ * Default will be the current working directory as determined by
* <code>System.getProperty("user.dir")</code>.
*/
File DEFAULT_DEPLOY_WORKING_DIR = new File(".");
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#user-command-packages">"user-command-packages"</a> property
*/
- @ConfigAttributeGetter(name=USER_COMMAND_PACKAGES)
+ @ConfigAttributeGetter(name = USER_COMMAND_PACKAGES)
String getUserCommandPackages();
-
+
/**
* Sets the system's user command path.
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ *
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
- @ConfigAttributeSetter(name=USER_COMMAND_PACKAGES)
+ @ConfigAttributeSetter(name = USER_COMMAND_PACKAGES)
void setUserCommandPackages(String value);
-
+
/**
* The name of the "user-command-packages" property.
*/
- @ConfigAttribute(type=String.class)
- String USER_COMMAND_PACKAGES = SystemConfigurationProperties.USER_COMMAND_PACKAGES;
-
+ @ConfigAttribute(type = String.class)
+ String USER_COMMAND_PACKAGES_NAME = SystemConfigurationProperties.USER_COMMAND_PACKAGES;
+
/**
* The default value of the "user-command-packages" property
*/
@@ -398,25 +431,29 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#log-file">"log-file"</a> property
*
* @return <code>null</code> if logging information goes to standard
- * out
+ * out
*/
- @ConfigAttributeGetter(name=LOG_FILE_NAME)
+ @ConfigAttributeGetter(name = LOG_FILE)
File getLogFile();
+
/**
* Sets the system's log file.
* <p> Non-absolute log files are relative to the system directory.
* <p> The system log file can not be changed while the system is running.
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ *
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
- @ConfigAttributeSetter(name=LOG_FILE_NAME)
+ @ConfigAttributeSetter(name = LOG_FILE)
void setLogFile(File value);
- /** The name of the "logFile" property */
- @ConfigAttribute(type=File.class)
+ /**
+ * The name of the "logFile" property
+ */
+ @ConfigAttribute(type = File.class)
String LOG_FILE_NAME = LOG_FILE;
/**
@@ -432,15 +469,16 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*
* @see com.gemstone.gemfire.internal.logging.LogWriterImpl
*/
- @ConfigAttributeGetter(name=LOG_LEVEL_NAME)
+ @ConfigAttributeGetter(name = LOG_LEVEL)
int getLogLevel();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#log-level">"log-level"</a> property
*
* @see com.gemstone.gemfire.internal.logging.LogWriterImpl
*/
- @ConfigAttributeSetter(name=LOG_LEVEL_NAME)
+ @ConfigAttributeSetter(name = LOG_LEVEL)
void setLogLevel(int value);
/**
@@ -459,9 +497,11 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_LOG_LEVEL = InternalLogWriter.NONE_LEVEL;
- /** The name of the "logLevel" property */
+ /**
+ * The name of the "logLevel" property
+ */
// type is String because the config file contains "config", "debug", "fine" etc, not a code, but the setter/getter accepts int
- @ConfigAttribute(type=String.class)
+ @ConfigAttribute(type = String.class)
String LOG_LEVEL_NAME = LOG_LEVEL;
/**
@@ -469,19 +509,24 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#statistic-sampling-enabled">"statistic-sampling-enabled"</a>
* property
*/
- @ConfigAttributeGetter(name=STATISTIC_SAMPLING_ENABLED_NAME)
+ @ConfigAttributeGetter(name = STATISTIC_SAMPLING_ENABLED)
boolean getStatisticSamplingEnabled();
+
/**
* Sets StatisticSamplingEnabled
*/
- @ConfigAttributeSetter(name=STATISTIC_SAMPLING_ENABLED_NAME)
+ @ConfigAttributeSetter(name = STATISTIC_SAMPLING_ENABLED)
void setStatisticSamplingEnabled(boolean newValue);
- /** The name of the "statisticSamplingEnabled" property */
- @ConfigAttribute(type=Boolean.class)
+ /**
+ * The name of the "statisticSamplingEnabled" property
+ */
+ @ConfigAttribute(type = Boolean.class)
String STATISTIC_SAMPLING_ENABLED_NAME = STATISTIC_SAMPLING_ENABLED;
- /** The default value of the "statisticSamplingEnabled" property */
+ /**
+ * The default value of the "statisticSamplingEnabled" property
+ */
boolean DEFAULT_STATISTIC_SAMPLING_ENABLED = true;
/**
@@ -489,14 +534,15 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
* property
*/
- @ConfigAttributeGetter(name=STATISTIC_SAMPLE_RATE_NAME)
+ @ConfigAttributeGetter(name = STATISTIC_SAMPLE_RATE)
int getStatisticSampleRate();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
* property
*/
- @ConfigAttributeSetter(name=STATISTIC_SAMPLE_RATE_NAME)
+ @ConfigAttributeSetter(name = STATISTIC_SAMPLE_RATE)
void setStatisticSampleRate(int value);
/**
@@ -515,8 +561,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_STATISTIC_SAMPLE_RATE = 60000;
- /** The name of the "statisticSampleRate" property */
- @ConfigAttribute(type=Integer.class, min=MIN_STATISTIC_SAMPLE_RATE, max=MAX_STATISTIC_SAMPLE_RATE)
+ /**
+ * The name of the "statisticSampleRate" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_STATISTIC_SAMPLE_RATE, max = MAX_STATISTIC_SAMPLE_RATE)
String STATISTIC_SAMPLE_RATE_NAME = STATISTIC_SAMPLE_RATE;
/**
@@ -524,16 +572,19 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*
* @return <code>null</code> if no file was specified
*/
- @ConfigAttributeGetter(name=STATISTIC_ARCHIVE_FILE_NAME)
+ @ConfigAttributeGetter(name = STATISTIC_ARCHIVE_FILE)
File getStatisticArchiveFile();
+
/**
* Sets the value of the <a href="../DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a> property.
*/
- @ConfigAttributeSetter(name=STATISTIC_ARCHIVE_FILE_NAME)
+ @ConfigAttributeSetter(name = STATISTIC_ARCHIVE_FILE)
void setStatisticArchiveFile(File value);
- /** The name of the "statisticArchiveFile" property */
- @ConfigAttribute(type=File.class)
+ /**
+ * The name of the "statisticArchiveFile" property
+ */
+ @ConfigAttribute(type = File.class)
String STATISTIC_ARCHIVE_FILE_NAME = STATISTIC_ARCHIVE_FILE;
/**
@@ -543,27 +594,31 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
File DEFAULT_STATISTIC_ARCHIVE_FILE = new File(""); // fix for bug 29786
-
/**
* Returns the value of the <a
* href="../DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
* property
*/
- @ConfigAttributeGetter(name=CACHE_XML_FILE_NAME)
+ @ConfigAttributeGetter(name = CACHE_XML_FILE)
File getCacheXmlFile();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
* property
*/
- @ConfigAttributeSetter(name=CACHE_XML_FILE_NAME)
+ @ConfigAttributeSetter(name = CACHE_XML_FILE)
void setCacheXmlFile(File value);
- /** The name of the "cacheXmlFile" property */
- @ConfigAttribute(type=File.class)
+ /**
+ * The name of the "cacheXmlFile" property
+ */
+ @ConfigAttribute(type = File.class)
String CACHE_XML_FILE_NAME = CACHE_XML_FILE;
- /** The default value of the "cacheXmlFile" property */
+ /**
+ * The default value of the "cacheXmlFile" property
+ */
File DEFAULT_CACHE_XML_FILE = new File("cache.xml");
/**
@@ -571,16 +626,16 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a>
* property
*/
- @ConfigAttributeGetter(name=ACK_WAIT_THRESHOLD_NAME)
+ @ConfigAttributeGetter(name = ACK_WAIT_THRESHOLD)
int getAckWaitThreshold();
/**
* Sets the value of the <a
* href="../DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a>
* property
- * Setting this value too low will cause spurious alerts.
- */
- @ConfigAttributeSetter(name=ACK_WAIT_THRESHOLD_NAME)
+ * Setting this value too low will cause spurious alerts.
+ */
+ @ConfigAttributeSetter(name = ACK_WAIT_THRESHOLD)
void setAckWaitThreshold(int newThreshold);
/**
@@ -598,26 +653,27 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <p> Actual value of this constant is <code>MAX_INT</code> seconds.
*/
int MAX_ACK_WAIT_THRESHOLD = Integer.MAX_VALUE;
- /** The name of the "ackWaitThreshold" property */
- @ConfigAttribute(type=Integer.class, min=MIN_ACK_WAIT_THRESHOLD)
+ /**
+ * The name of the "ackWaitThreshold" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_ACK_WAIT_THRESHOLD)
String ACK_WAIT_THRESHOLD_NAME = ACK_WAIT_THRESHOLD;
-
/**
* Returns the value of the <a
* href="../DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a>
* property
*/
- @ConfigAttributeGetter(name=ACK_SEVERE_ALERT_THRESHOLD_NAME)
+ @ConfigAttributeGetter(name = ACK_SEVERE_ALERT_THRESHOLD)
int getAckSevereAlertThreshold();
/**
* Sets the value of the <a
* href="../DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a>
* property
- * Setting this value too low will cause spurious forced disconnects.
- */
- @ConfigAttributeSetter(name=ACK_SEVERE_ALERT_THRESHOLD_NAME)
+ * Setting this value too low will cause spurious forced disconnects.
+ */
+ @ConfigAttributeSetter(name = ACK_SEVERE_ALERT_THRESHOLD)
void setAckSevereAlertThreshold(int newThreshold);
/**
@@ -637,8 +693,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <p> Actual value of this constant is <code>MAX_INT</code> seconds.
*/
int MAX_ACK_SEVERE_ALERT_THRESHOLD = Integer.MAX_VALUE;
- /** The name of the "ackSevereAlertThreshold" property */
- @ConfigAttribute(type=Integer.class, min=MIN_ACK_SEVERE_ALERT_THRESHOLD)
+ /**
+ * The name of the "ackSevereAlertThreshold" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_ACK_SEVERE_ALERT_THRESHOLD)
String ACK_SEVERE_ALERT_THRESHOLD_NAME = ACK_SEVERE_ALERT_THRESHOLD;
/**
@@ -646,14 +704,15 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
* property
*/
- @ConfigAttributeGetter(name=ARCHIVE_FILE_SIZE_LIMIT_NAME)
+ @ConfigAttributeGetter(name = ARCHIVE_FILE_SIZE_LIMIT)
int getArchiveFileSizeLimit();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
* property
*/
- @ConfigAttributeSetter(name=ARCHIVE_FILE_SIZE_LIMIT_NAME)
+ @ConfigAttributeSetter(name = ARCHIVE_FILE_SIZE_LIMIT)
void setArchiveFileSizeLimit(int value);
/**
@@ -672,22 +731,26 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_ARCHIVE_FILE_SIZE_LIMIT = 1000000;
- /** The name of the "ArchiveFileSizeLimit" property */
- @ConfigAttribute(type=Integer.class, min=MIN_ARCHIVE_FILE_SIZE_LIMIT, max=MAX_ARCHIVE_FILE_SIZE_LIMIT)
+ /**
+ * The name of the "ArchiveFileSizeLimit" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_ARCHIVE_FILE_SIZE_LIMIT, max = MAX_ARCHIVE_FILE_SIZE_LIMIT)
String ARCHIVE_FILE_SIZE_LIMIT_NAME = ARCHIVE_FILE_SIZE_LIMIT;
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
* property
*/
- @ConfigAttributeGetter(name=ARCHIVE_DISK_SPACE_LIMIT_NAME)
+ @ConfigAttributeGetter(name = ARCHIVE_DISK_SPACE_LIMIT)
int getArchiveDiskSpaceLimit();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
* property
*/
- @ConfigAttributeSetter(name=ARCHIVE_DISK_SPACE_LIMIT_NAME)
+ @ConfigAttributeSetter(name = ARCHIVE_DISK_SPACE_LIMIT)
void setArchiveDiskSpaceLimit(int value);
/**
@@ -706,22 +769,26 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_ARCHIVE_DISK_SPACE_LIMIT = 1000000;
- /** The name of the "ArchiveDiskSpaceLimit" property */
- @ConfigAttribute(type=Integer.class, min=MIN_ARCHIVE_DISK_SPACE_LIMIT, max=MAX_ARCHIVE_DISK_SPACE_LIMIT)
+ /**
+ * The name of the "ArchiveDiskSpaceLimit" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_ARCHIVE_DISK_SPACE_LIMIT, max = MAX_ARCHIVE_DISK_SPACE_LIMIT)
String ARCHIVE_DISK_SPACE_LIMIT_NAME = ARCHIVE_DISK_SPACE_LIMIT;
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
* property
*/
- @ConfigAttributeGetter(name=LOG_FILE_SIZE_LIMIT_NAME)
+ @ConfigAttributeGetter(name = LOG_FILE_SIZE_LIMIT)
int getLogFileSizeLimit();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
* property
*/
- @ConfigAttributeSetter(name=LOG_FILE_SIZE_LIMIT_NAME)
+ @ConfigAttributeSetter(name = LOG_FILE_SIZE_LIMIT)
void setLogFileSizeLimit(int value);
/**
@@ -740,8 +807,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_LOG_FILE_SIZE_LIMIT = 1000000;
- /** The name of the "LogFileSizeLimit" property */
- @ConfigAttribute(type=Integer.class, min=MIN_LOG_FILE_SIZE_LIMIT, max=MAX_LOG_FILE_SIZE_LIMIT)
+ /**
+ * The name of the "LogFileSizeLimit" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_LOG_FILE_SIZE_LIMIT, max = MAX_LOG_FILE_SIZE_LIMIT)
String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT;
/**
@@ -749,14 +818,15 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
* property
*/
- @ConfigAttributeGetter(name=LOG_DISK_SPACE_LIMIT_NAME)
+ @ConfigAttributeGetter(name = LOG_DISK_SPACE_LIMIT)
int getLogDiskSpaceLimit();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
* property
*/
- @ConfigAttributeSetter(name=LOG_DISK_SPACE_LIMIT_NAME)
+ @ConfigAttributeSetter(name = LOG_DISK_SPACE_LIMIT)
void setLogDiskSpaceLimit(int value);
/**
@@ -775,129 +845,151 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_LOG_DISK_SPACE_LIMIT = 1000000;
- /** The name of the "LogDiskSpaceLimit" property */
- @ConfigAttribute(type=Integer.class, min=MIN_LOG_DISK_SPACE_LIMIT, max=MAX_LOG_DISK_SPACE_LIMIT)
+ /**
+ * The name of the "LogDiskSpaceLimit" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_LOG_DISK_SPACE_LIMIT, max = MAX_LOG_DISK_SPACE_LIMIT)
String LOG_DISK_SPACE_LIMIT_NAME = LOG_DISK_SPACE_LIMIT;
/**
* Returns the value of the <a
* href="../DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #getClusterSSLEnabled} instead.
*/
- @ConfigAttributeGetter(name=SSL_ENABLED_NAME)
+ @ConfigAttributeGetter(name = SSL_ENABLED)
boolean getSSLEnabled();
/**
* The default ssl-enabled state.
* <p> Actual value of this constant is <code>false</code>.
+ *
* @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED} instead.
*/
boolean DEFAULT_SSL_ENABLED = false;
-
- /** The name of the "SSLEnabled" property
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED_NAME} instead.
+
+ /**
+ * The name of the "SSLEnabled" property
+ *
+ * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
*/
- @ConfigAttribute(type=Boolean.class)
+ @ConfigAttribute(type = Boolean.class)
String SSL_ENABLED_NAME = SSL_ENABLED;
/**
* Sets the value of the <a
* href="../DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #setClusterSSLEnabled} instead.
*/
- @ConfigAttributeSetter(name=SSL_ENABLED_NAME)
+ @ConfigAttributeSetter(name = SSL_ENABLED)
void setSSLEnabled(boolean enabled);
/**
* Returns the value of the <a
* href="../DistributedSystem.html#ssl-protocols">"ssl-protocols"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #getClusterSSLProtocols} instead.
*/
- @ConfigAttributeGetter(name=SSL_PROTOCOLS_NAME)
+ @ConfigAttributeGetter(name = SSL_PROTOCOLS)
String getSSLProtocols();
/**
* Sets the value of the <a
* href="../DistributedSystem.html#ssl-protocols">"ssl-protocols"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #setClusterSSLProtocols} instead.
*/
- @ConfigAttributeSetter(name=SSL_PROTOCOLS_NAME)
+ @ConfigAttributeSetter(name = SSL_PROTOCOLS)
void setSSLProtocols(String protocols);
/**
* The default ssl-protocols value.
* <p> Actual value of this constant is <code>any</code>.
+ *
* @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS} instead.
*/
String DEFAULT_SSL_PROTOCOLS = "any";
- /** The name of the "SSLProtocols" property
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS_NAME} instead.
+ /**
+ * The name of the "SSLProtocols" property
+ *
+ * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
*/
- @ConfigAttribute(type=String.class)
+ @ConfigAttribute(type = String.class)
String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
/**
* Returns the value of the <a
* href="../DistributedSystem.html#ssl-ciphers">"ssl-ciphers"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #getClusterSSLCiphers} instead.
*/
- @ConfigAttributeGetter(name=SSL_CIPHERS_NAME)
+ @ConfigAttributeGetter(name = SSL_CIPHERS)
String getSSLCiphers();
/**
* Sets the value of the <a
* href="../DistributedSystem.html#ssl-ciphers">"ssl-ciphers"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #setClusterSSLCiphers} instead.
*/
- @ConfigAttributeSetter(name=SSL_CIPHERS_NAME)
+ @ConfigAttributeSetter(name = SSL_CIPHERS)
void setSSLCiphers(String ciphers);
- /**
+ /**
* The default ssl-ciphers value.
* <p> Actual value of this constant is <code>any</code>.
+ *
* @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS} instead.
*/
- String DEFAULT_SSL_CIPHERS = "any";
- /** The name of the "SSLCiphers" property
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS_NAME} instead.
+ String DEFAULT_SSL_CIPHERS = "any";
+ /**
+ * The name of the "SSLCiphers" property
+ *
+ * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
*/
- @ConfigAttribute(type=String.class)
+ @ConfigAttribute(type = String.class)
String SSL_CIPHERS_NAME = SSL_CIPHERS;
/**
* Returns the value of the <a
* href="../DistributedSystem.html#ssl-require-authentication">"ssl-require-authentication"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #getClusterSSLRequireAuthentication} instead.
*/
- @ConfigAttributeGetter(name=SSL_REQUIRE_AUTHENTICATION_NAME)
+ @ConfigAttributeGetter(name = SSL_REQUIRE_AUTHENTICATION)
boolean getSSLRequireAuthentication();
/**
* Sets the value of the <a
* href="../DistributedSystem.html#ssl-require-authentication">"ssl-require-authentication"</a>
* property.
+ *
* @deprecated as of 8.0 use {@link #setClusterSSLRequireAuthentication} instead.
*/
- @ConfigAttributeSetter(name=SSL_REQUIRE_AUTHENTICATION_NAME)
+ @ConfigAttributeSetter(name = SSL_REQUIRE_AUTHENTICATION)
void setSSLRequireAuthentication(boolean enabled);
- /**
+ /**
* The default ssl-require-authentication value.
* <p> Actual value of this constant is <code>true</code>.
+ *
* @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
*/
- boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
- /** The name of the "SSLRequireAuthentication" property
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME} instead.
+ boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
+ /**
+ * The name of the "SSLRequireAuthentication" property
+ *
+ * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
*/
- @ConfigAttribute(type=Boolean.class)
+ @ConfigAttribute(type = Boolean.class)
String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
/**
@@ -905,32 +997,34 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_ENABLED_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_ENABLED)
boolean getClusterSSLEnabled();
/**
+ * Sets the value of the <a
+ * href="../DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
+ * property.
+ */
+ @ConfigAttributeSetter(name = CLUSTER_SSL_ENABLED)
+ void setClusterSSLEnabled(boolean enabled);
+
+ /**
* The default cluster-ssl-enabled state.
* <p> Actual value of this constant is <code>false</code>.
*/
boolean DEFAULT_CLUSTER_SSL_ENABLED = false;
- /** The name of the "ClusterSSLEnabled" property */
- @ConfigAttribute(type=Boolean.class)
- String CLUSTER_SSL_ENABLED_NAME = CLUSTER_SSL_ENABLED;
-
/**
- * Sets the value of the <a
- * href="../DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
- * property.
+ * The name of the "ClusterSSLEnabled" property
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_ENABLED_NAME)
- void setClusterSSLEnabled(boolean enabled);
+ @ConfigAttribute(type = Boolean.class)
+ String CLUSTER_SSL_ENABLED_NAME = CLUSTER_SSL_ENABLED;
/**
* Returns the value of the <a
* href="../DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_PROTOCOLS_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_PROTOCOLS)
String getClusterSSLProtocols();
/**
@@ -938,7 +1032,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_PROTOCOLS_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_PROTOCOLS)
void setClusterSSLProtocols(String protocols);
/**
@@ -946,8 +1040,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <p> Actual value of this constant is <code>any</code>.
*/
String DEFAULT_CLUSTER_SSL_PROTOCOLS = "any";
- /** The name of the "ClusterSSLProtocols" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the "ClusterSSLProtocols" property
+ */
+ @ConfigAttribute(type = String.class)
String CLUSTER_SSL_PROTOCOLS_NAME = CLUSTER_SSL_PROTOCOLS;
/**
@@ -955,7 +1051,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_CIPHERS_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_CIPHERS)
String getClusterSSLCiphers();
/**
@@ -963,16 +1059,18 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_CIPHERS_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_CIPHERS)
void setClusterSSLCiphers(String ciphers);
- /**
+ /**
* The default cluster-ssl-ciphers value.
* <p> Actual value of this constant is <code>any</code>.
*/
- String DEFAULT_CLUSTER_SSL_CIPHERS = "any";
- /** The name of the "ClusterSSLCiphers" property */
- @ConfigAttribute(type=String.class)
+ String DEFAULT_CLUSTER_SSL_CIPHERS = "any";
+ /**
+ * The name of the "ClusterSSLCiphers" property
+ */
+ @ConfigAttribute(type = String.class)
String CLUSTER_SSL_CIPHERS_NAME = CLUSTER_SSL_CIPHERS;
/**
@@ -980,7 +1078,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
boolean getClusterSSLRequireAuthentication();
/**
@@ -988,163 +1086,176 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
void setClusterSSLRequireAuthentication(boolean enabled);
- /**
+ /**
* The default cluster-ssl-require-authentication value.
* <p> Actual value of this constant is <code>true</code>.
*/
- boolean DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION = true;
- /** The name of the "ClusterSSLRequireAuthentication" property */
- @ConfigAttribute(type=Boolean.class)
+ boolean DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION = true;
+ /**
+ * The name of the "ClusterSSLRequireAuthentication" property
+ */
+ @ConfigAttribute(type = Boolean.class)
String CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME = CLUSTER_SSL_REQUIRE_AUTHENTICATION;
-
/**
* Returns the value of the <a
* href="../DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_KEYSTORE_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE)
String getClusterSSLKeyStore();
-
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_KEYSTORE_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE)
void setClusterSSLKeyStore(String keyStore);
-
+
/**
* The default cluster-ssl-keystore value.
* <p> Actual value of this constant is "".
*/
String DEFAULT_CLUSTER_SSL_KEYSTORE = "";
-
- /** The name of the "ClusterSSLKeyStore" property */
- @ConfigAttribute(type=String.class)
+
+ /**
+ * The name of the "ClusterSSLKeyStore" property
+ */
+ @ConfigAttribute(type = String.class)
String CLUSTER_SSL_KEYSTORE_NAME = CLUSTER_SSL_KEYSTORE;
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_KEYSTORE_TYPE_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
String getClusterSSLKeyStoreType();
-
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_KEYSTORE_TYPE_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
void setClusterSSLKeyStoreType(String keyStoreType);
-
+
/**
* The default cluster-ssl-keystore-type value.
* <p> Actual value of this constant is "".
*/
String DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE = "";
-
- /** The name of the "ClusterSSLKeyStoreType" property */
- @ConfigAttribute(type=String.class)
+
+ /**
+ * The name of the "ClusterSSLKeyStoreType" property
+ */
+ @ConfigAttribute(type = String.class)
String CLUSTER_SSL_KEYSTORE_TYPE_NAME = CLUSTER_SSL_KEYSTORE_TYPE;
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
String getClusterSSLKeyStorePassword();
-
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
void setClusterSSLKeyStorePassword(String keyStorePassword);
-
+
/**
* The default cluster-ssl-keystore-password value.
* <p> Actual value of this constant is "".
*/
String DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD = "";
-
- /** The name of the "ClusterSSLKeyStorePassword" property */
- @ConfigAttribute(type=String.class)
+
+ /**
+ * The name of the "ClusterSSLKeyStorePassword" property
+ */
+ @ConfigAttribute(type = String.class)
String CLUSTER_SSL_KEYSTORE_PASSWORD_NAME = CLUSTER_SSL_KEYSTORE_PASSWORD;
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_TRUSTSTORE_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE)
String getClusterSSLTrustStore();
-
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_TRUSTSTORE_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE)
void setClusterSSLTrustStore(String trustStore);
-
+
/**
* The default cluster-ssl-truststore value.
* <p> Actual value of this constant is "".
*/
String DEFAULT_CLUSTER_SSL_TRUSTSTORE = "";
-
- /** The name of the "ClusterSSLTrustStore" property */
- @ConfigAttribute(type=String.class)
+
+ /**
+ * The name of the "ClusterSSLTrustStore" property
+ */
+ @ConfigAttribute(type = String.class)
String CLUSTER_SSL_TRUSTSTORE_NAME = CLUSTER_SSL_TRUSTSTORE;
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a>
* property.
*/
- @ConfigAttributeGetter(name=CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)
+ @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
String getClusterSSLTrustStorePassword();
-
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a>
* property.
*/
- @ConfigAttributeSetter(name=CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)
+ @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
void setClusterSSLTrustStorePassword(String trusStorePassword);
+
/**
* The default cluster-ssl-truststore-password value.
* <p> Actual value of this constant is "".
*/
String DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD = "";
-
- /** The name of the "ClusterSSLKeyStorePassword" property */
- @ConfigAttribute(type=String.class)
+
+ /**
+ * The name of the "ClusterSSLKeyStorePassword" property
+ */
+ @ConfigAttribute(type = String.class)
String CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME = CLUSTER_SSL_TRUSTSTORE_PASSWORD;
-
-
- /** The name of an internal property that specifies a {@link
+
+ /**
+ * The name of an internal property that specifies a {@link
* com.gemstone.gemfire.i18n.LogWriterI18n} instance to log to.
- * Set this property with put(), not with setProperty()
+ * Set this property with put(), not with setProperty()
*
* @since GemFire 4.0 */
- public static final String LOG_WRITER_NAME = "log-writer";
+ String LOG_WRITER_NAME = "log-writer";
- /** The name of an internal property that specifies a
- * a DistributionConfigImpl that the locator is passing
- * in to a ds connect.
- * Set this property with put(), not with setProperty()
+ /**
+ * The name of an internal property that specifies a
+ * a DistributionConfigImpl that the locator is passing
+ * in to a ds connect.
+ * Set this property with put(), not with setProperty()
*
* @since GemFire 7.0 */
- public static final String DS_CONFIG_NAME = "ds-config";
+ String DS_CONFIG_NAME = "ds-config";
/**
* The name of an internal property that specifies whether
@@ -1153,7 +1264,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* @since GemFire 8.1
*/
String DS_RECONNECTING_NAME = "ds-reconnecting";
-
+
/**
* The name of an internal property that specifies the
* quorum checker for the system that was forcibly disconnected.
@@ -1161,7 +1272,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* is used.
*/
String DS_QUORUM_CHECKER_NAME = "ds-quorum-checker";
-
+
/**
* The name of an internal property that specifies a {@link
* com.gemstone.gemfire.LogWriter} instance to log security messages to. Set
@@ -1171,7 +1282,8 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
String SECURITY_LOG_WRITER_NAME = "security-log-writer";
- /** The name of an internal property that specifies a
+ /**
+ * The name of an internal property that specifies a
* FileOutputStream associated with the internal property
* LOG_WRITER_NAME. If this property is set, the
* FileOutputStream will be closed when the distributed
@@ -1196,19 +1308,20 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
* property
*/
- @ConfigAttributeGetter(name=SOCKET_LEASE_TIME_NAME)
+ @ConfigAttributeGetter(name = SOCKET_LEASE_TIME)
int getSocketLeaseTime();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
* property
*/
- @ConfigAttributeSetter(name=SOCKET_LEASE_TIME_NAME)
+ @ConfigAttributeSetter(name = SOCKET_LEASE_TIME)
void setSocketLeaseTime(int value);
-
-
- /** The default value of the "socketLeaseTime" property */
+ /**
+ * The default value of the "socketLeaseTime" property
+ */
int DEFAULT_SOCKET_LEASE_TIME = 60000;
/**
* The minimum socketLeaseTime.
@@ -1221,8 +1334,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MAX_SOCKET_LEASE_TIME = 600000;
- /** The name of the "socketLeaseTime" property */
- @ConfigAttribute(type=Integer.class, min=MIN_SOCKET_LEASE_TIME, max=MAX_SOCKET_LEASE_TIME)
+ /**
+ * The name of the "socketLeaseTime" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_SOCKET_LEASE_TIME, max = MAX_SOCKET_LEASE_TIME)
String SOCKET_LEASE_TIME_NAME = SOCKET_LEASE_TIME;
/**
@@ -1230,18 +1345,20 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
* property
*/
- @ConfigAttributeGetter(name=SOCKET_BUFFER_SIZE_NAME)
+ @ConfigAttributeGetter(name = SOCKET_BUFFER_SIZE)
int getSocketBufferSize();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
* property
*/
- @ConfigAttributeSetter(name=SOCKET_BUFFER_SIZE_NAME)
+ @ConfigAttributeSetter(name = SOCKET_BUFFER_SIZE)
void setSocketBufferSize(int value);
-
- /** The default value of the "socketBufferSize" property */
+ /**
+ * The default value of the "socketBufferSize" property
+ */
int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
/**
* The minimum socketBufferSize.
@@ -1257,17 +1374,18 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
boolean VALIDATE = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "validateMessageSize");
int VALIDATE_CEILING = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "validateMessageSizeCeiling", 8 * 1024 * 1024).intValue();
- /** The name of the "socketBufferSize" property */
- @ConfigAttribute(type=Integer.class, min=MIN_SOCKET_BUFFER_SIZE, max=MAX_SOCKET_BUFFER_SIZE)
+ /**
+ * The name of the "socketBufferSize" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_SOCKET_BUFFER_SIZE, max = MAX_SOCKET_BUFFER_SIZE)
String SOCKET_BUFFER_SIZE_NAME = SOCKET_BUFFER_SIZE;
-
/**
* Get the value of the
* <a href="../DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a>
* property
*/
- @ConfigAttributeGetter(name=MCAST_SEND_BUFFER_SIZE_NAME)
+ @ConfigAttributeGetter(name = MCAST_SEND_BUFFER_SIZE)
int getMcastSendBufferSize();
/**
@@ -1275,16 +1393,14 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a>
* property
*/
- @ConfigAttributeSetter(name=MCAST_SEND_BUFFER_SIZE_NAME)
+ @ConfigAttributeSetter(name = MCAST_SEND_BUFFER_SIZE)
void setMcastSendBufferSize(int value);
-
/**
* The default value of the corresponding property
*/
int DEFAULT_MCAST_SEND_BUFFER_SIZE = 65535;
-
/**
* The minimum size of the buffer, in bytes.
* <p> Actual value of this constant is <code>2048</code>.
@@ -1294,7 +1410,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
/**
* The name of the corresponding property
*/
- @ConfigAttribute(type=Integer.class, min=MIN_MCAST_SEND_BUFFER_SIZE)
+ @ConfigAttribute(type = Integer.class, min = MIN_MCAST_SEND_BUFFER_SIZE)
String MCAST_SEND_BUFFER_SIZE_NAME = MCAST_SEND_BUFFER_SIZE;
/**
@@ -1302,7 +1418,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a>
* property
*/
- @ConfigAttributeGetter(name=MCAST_RECV_BUFFER_SIZE_NAME)
+ @ConfigAttributeGetter(name = MCAST_RECV_BUFFER_SIZE)
int getMcastRecvBufferSize();
/**
@@ -1310,10 +1426,9 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a>
* property
*/
- @ConfigAttributeSetter(name=MCAST_RECV_BUFFER_SIZE_NAME)
+ @ConfigAttributeSetter(name = MCAST_RECV_BUFFER_SIZE)
void setMcastRecvBufferSize(int value);
-
/**
* The default value of the corresponding property
*/
@@ -1328,16 +1443,15 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
/**
* The name of the corresponding property
*/
- @ConfigAttribute(type=Integer.class, min=MIN_MCAST_RECV_BUFFER_SIZE)
+ @ConfigAttribute(type = Integer.class, min = MIN_MCAST_RECV_BUFFER_SIZE)
String MCAST_RECV_BUFFER_SIZE_NAME = MCAST_RECV_BUFFER_SIZE;
-
/**
* Get the value of the
* <a href="../DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a>
* property.
*/
- @ConfigAttributeGetter(name=MCAST_FLOW_CONTROL_NAME)
+ @ConfigAttributeGetter(name = MCAST_FLOW_CONTROL)
FlowControlParams getMcastFlowControl();
/**
@@ -1345,20 +1459,20 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a>
* property
*/
- @ConfigAttributeSetter(name=MCAST_FLOW_CONTROL_NAME)
+ @ConfigAttributeSetter(name = MCAST_FLOW_CONTROL)
void setMcastFlowControl(FlowControlParams values);
/**
* The name of the corresponding property
*/
- @ConfigAttribute(type=FlowControlParams.class)
+ @ConfigAttribute(type = FlowControlParams.class)
String MCAST_FLOW_CONTROL_NAME = MCAST_FLOW_CONTROL;
/**
* The default value of the corresponding property
*/
FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
- = new FlowControlParams(1048576, (float)0.25, 5000);
+ = new FlowControlParams(1048576, (float) 0.25, 5000);
/**
* The minimum byteAllowance for the mcast-flow-control setting of
@@ -1395,7 +1509,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a>
* property.
*/
- @ConfigAttributeGetter(name=UDP_FRAGMENT_SIZE_NAME)
+ @ConfigAttributeGetter(name = UDP_FRAGMENT_SIZE)
int getUdpFragmentSize();
/**
@@ -1403,7 +1517,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a>
* property
*/
- @ConfigAttributeSetter(name=UDP_FRAGMENT_SIZE_NAME)
+ @ConfigAttributeSetter(name = UDP_FRAGMENT_SIZE)
void setUdpFragmentSize(int value);
/**
@@ -1411,29 +1525,28 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int DEFAULT_UDP_FRAGMENT_SIZE = 60000;
- /** The minimum allowed udp-fragment-size setting of 1000
- */
+ /**
+ * The minimum allowed udp-fragment-size setting of 1000
+ */
int MIN_UDP_FRAGMENT_SIZE = 1000;
- /** The maximum allowed udp-fragment-size setting of 60000
- */
+ /**
+ * The maximum allowed udp-fragment-size setting of 60000
+ */
int MAX_UDP_FRAGMENT_SIZE = 60000;
/**
* The name of the corresponding property
*/
- @ConfigAttribute(type=Integer.class, min=MIN_UDP_FRAGMENT_SIZE, max=MAX_UDP_FRAGMENT_SIZE)
+ @ConfigAttribute(type = Integer.class, min = MIN_UDP_FRAGMENT_SIZE, max = MAX_UDP_FRAGMENT_SIZE)
String UDP_FRAGMENT_SIZE_NAME = UDP_FRAGMENT_SIZE;
-
-
-
/**
* Get the value of the
* <a href="../DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a>
* property
*/
- @ConfigAttributeGetter(name=UDP_SEND_BUFFER_SIZE_NAME)
+ @ConfigAttributeGetter(name = UDP_SEND_BUFFER_SIZE)
int getUdpSendBufferSize();
/**
@@ -1441,7 +1554,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a>
* property
*/
- @ConfigAttributeSetter(name=UDP_SEND_BUFFER_SIZE_NAME)
+ @ConfigAttributeSetter(name = UDP_SEND_BUFFER_SIZE)
void setUdpSendBufferSize(int value);
/**
@@ -1458,7 +1571,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
/**
* The name of the corresponding property
*/
- @ConfigAttribute(type=Integer.class, min=MIN_UDP_SEND_BUFFER_SIZE)
+ @ConfigAttribute(type = Integer.class, min = MIN_UDP_SEND_BUFFER_SIZE)
String UDP_SEND_BUFFER_SIZE_NAME = UDP_SEND_BUFFER_SIZE;
/**
@@ -1466,7 +1579,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a>
* property
*/
- @ConfigAttributeGetter(name=UDP_RECV_BUFFER_SIZE_NAME)
+ @ConfigAttributeGetter(name = UDP_RECV_BUFFER_SIZE)
int getUdpRecvBufferSize();
/**
@@ -1474,7 +1587,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a>
* property
*/
- @ConfigAttributeSetter(name=UDP_RECV_BUFFER_SIZE_NAME)
+ @ConfigAttributeSetter(name = UDP_RECV_BUFFER_SIZE)
void setUdpRecvBufferSize(int value);
/**
@@ -1494,11 +1607,10 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int MIN_UDP_RECV_BUFFER_SIZE = 2048;
-
/**
* The name of the corresponding property
*/
- @ConfigAttribute(type=Integer.class, min=MIN_UDP_RECV_BUFFER_SIZE)
+ @ConfigAttribute(type = Integer.class, min = MIN_UDP_RECV_BUFFER_SIZE)
String UDP_RECV_BUFFER_SIZE_NAME = UDP_RECV_BUFFER_SIZE;
/**
@@ -1506,28 +1618,32 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#disable-tcp">"disable-tcp"</a>
* property
*/
- @ConfigAttributeGetter(name=DISABLE_TCP_NAME)
+ @ConfigAttributeGetter(name = DISABLE_TCP)
boolean getDisableTcp();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#disable-tcp">"disable-tcp"</a>
* property.
*/
- @ConfigAttributeSetter(name=DISABLE_TCP_NAME)
+ @ConfigAttributeSetter(name = DISABLE_TCP)
void setDisableTcp(boolean newValue);
- /** The name of the corresponding property */
- @ConfigAttribute(type=Boolean.class)
+ /**
+ * The name of the corresponding property
+ */
+ @ConfigAttribute(type = Boolean.class)
String DISABLE_TCP_NAME = DISABLE_TCP;
- /** The default value of the corresponding property */
+ /**
+ * The default value of the corresponding property
+ */
boolean DEFAULT_DISABLE_TCP = false;
-
/**
* Turns on timing statistics for the distributed system
*/
- @ConfigAttributeSetter(name=ENABLE_TIME_STATISTICS_NAME)
+ @ConfigAttributeSetter(name = ENABLE_TIME_STATISTICS)
void setEnableTimeStatistics(boolean newValue);
/**
@@ -1535,22 +1651,25 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#enable-time-statistics">enable-time-statistics</a>
* property
*/
- @ConfigAttributeGetter(name=ENABLE_TIME_STATISTICS_NAME)
+ @ConfigAttributeGetter(name = ENABLE_TIME_STATISTICS)
boolean getEnableTimeStatistics();
- /** the name of the corresponding property */
- @ConfigAttribute(type=Boolean.class)
+ /**
+ * the name of the corresponding property
+ */
+ @ConfigAttribute(type = Boolean.class)
String ENABLE_TIME_STATISTICS_NAME = ENABLE_TIME_STATISTICS;
- /** The default value of the corresponding property */
+ /**
+ * The default value of the corresponding property
+ */
boolean DEFAULT_ENABLE_TIME_STATISTICS = false;
-
/**
- * Sets the value for
- <a href="../DistributedSystem.html#use-cluster-configuration">use-shared-configuration</a>
+ * Sets the value for
+ * <a href="../DistributedSystem.html#use-cluster-configuration">use-shared-configuration</a>
*/
- @ConfigAttributeSetter(name=USE_CLUSTER_CONFIGURATION_NAME)
+ @ConfigAttributeSetter(name = USE_CLUSTER_CONFIGURATION)
void setUseSharedConfiguration(boolean newValue);
/**
@@ -1558,21 +1677,25 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#use-cluster-configuration">use-cluster-configuration</a>
* property
*/
- @ConfigAttributeGetter(name=USE_CLUSTER_CONFIGURATION_NAME)
+ @ConfigAttributeGetter(name = USE_CLUSTER_CONFIGURATION)
boolean getUseSharedConfiguration();
- /** the name of the corresponding property */
- @ConfigAttribute(type=Boolean.class)
+ /**
+ * the name of the corresponding property
+ */
+ @ConfigAttribute(type = Boolean.class)
String USE_CLUSTER_CONFIGURATION_NAME = USE_CLUSTER_CONFIGURATION;
- /** The default value of the corresponding property */
+ /**
+ * The default value of the corresponding property
+ */
boolean DEFAULT_USE_CLUSTER_CONFIGURATION = true;
-
+
/**
- * Sets the value for
- <a href="../DistributedSystem.html#enable-cluster-configuration">enable-cluster-configuration</a>
+ * Sets the value for
+ * <a href="../DistributedSystem.html#enable-cluster-configuration">enable-cluster-configuration</a>
*/
- @ConfigAttributeSetter(name=ENABLE_CLUSTER_CONFIGURATION_NAME)
+ @ConfigAttributeSetter(name = ENABLE_CLUSTER_CONFIGURATION)
void setEnableClusterConfiguration(boolean newValue);
/**
@@ -1580,56 +1703,66 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#enable-cluster-configuration">enable-cluster-configuration</a>
* property
*/
- @ConfigAttributeGetter(name=ENABLE_CLUSTER_CONFIGURATION_NAME)
+ @ConfigAttributeGetter(name = ENABLE_CLUSTER_CONFIGURATION)
boolean getEnableClusterConfiguration();
- /** the name of the corresponding property */
- @ConfigAttribute(type=Boolean.class)
+ /**
+ * the name of the corresponding property
+ */
+ @ConfigAttribute(type = Boolean.class)
String ENABLE_CLUSTER_CONFIGURATION_NAME = ENABLE_CLUSTER_CONFIGURATION;
- /** The default value of the corresponding property */
+ /**
+ * The default value of the corresponding property
+ */
boolean DEFAULT_ENABLE_CLUSTER_CONFIGURATION = true;
- @ConfigAttribute(type=Boolean.class)
+ @ConfigAttribute(type = Boolean.class)
String LOAD_CLUSTER_CONFIG_FROM_DIR_NAME = LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
boolean DEFAULT_LOAD_CLUSTER_CONFIG_FROM_DIR = false;
-
+
/**
- * Returns the value of
+ * Returns the value of
* <a href="../DistributedSystem.html#cluster-configuration-dir">cluster-configuration-dir</a>
* property
*/
- @ConfigAttributeGetter(name=LOAD_CLUSTER_CONFIG_FROM_DIR_NAME)
+ @ConfigAttributeGetter(name = LOAD_CLUSTER_CONFIGURATION_FROM_DIR)
boolean getLoadClusterConfigFromDir();
-
+
/**
- * Sets the value of
+ * Sets the value of
* <a href="../DistributedSystem.html#cluster-configuration-dir">cluster-configuration-dir</a>
* property
*/
- @ConfigAttributeSetter(name=LOAD_CLUSTER_CONFIG_FROM_DIR_NAME)
+ @ConfigAttributeSetter(name = LOAD_CLUSTER_CONFIGURATION_FROM_DIR)
void setLoadClusterConfigFromDir(boolean newValue);
- @ConfigAttribute(type=String.class)
- String CLUSTER_CONFIGURATION_DIR = SystemConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
+ @ConfigAttribute(type = String.class)
+ String CLUSTER_CONFIGURATION_DIR_NAME = CLUSTER_CONFIGURATION_DIR;
String DEFAULT_CLUSTER_CONFIGURATION_DIR = System.getProperty("user.dir");
- @ConfigAttributeGetter(name=CLUSTER_CONFIGURATION_DIR)
+ @ConfigAttributeGetter(name = CLUSTER_CONFIGURATION_DIR)
String getClusterConfigDir();
- @ConfigAttributeSetter(name=CLUSTER_CONFIGURATION_DIR)
+
+ @ConfigAttributeSetter(name = CLUSTER_CONFIGURATION_DIR)
void setClusterConfigDir(String clusterConfigDir);
-
- /** Turns on network partition detection */
- @ConfigAttributeSetter(name=ENABLE_NETWORK_PARTITION_DETECTION_NAME)
+
+ /**
+ * Turns on network partition detection
+ */
+ @ConfigAttributeSetter(name = ENABLE_NETWORK_PARTITION_DETECTION)
void setEnableNetworkPartitionDetection(boolean newValue);
+
/**
* Returns the value of the enable-network-partition-detection property
*/
- @ConfigAttributeGetter(name=ENABLE_NETWORK_PARTITION_DETECTION_NAME)
+ @ConfigAttributeGetter(name = ENABLE_NETWORK_PARTITION_DETECTION)
boolean getEnableNetworkPartitionDetection();
- /** the name of the corresponding property */
- @ConfigAttribute(type=Boolean.class)
+ /**
+ * the name of the corresponding property
+ */
+ @ConfigAttribute(type = Boolean.class)
String ENABLE_NETWORK_PARTITION_DETECTION_NAME = ENABLE_NETWORK_PARTITION_DETECTION;
boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION = false;
@@ -1638,7 +1771,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#member-timeout">"member-timeout"</a>
* property
*/
- @ConfigAttributeGetter(name=MEMBER_TIMEOUT_NAME)
+ @ConfigAttributeGetter(name = MEMBER_TIMEOUT)
int getMemberTimeout();
/**
@@ -1646,7 +1779,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <a href="../DistributedSystem.html#member-timeout">"member-timeout"</a>
* property
*/
- @ConfigAttributeSetter(name=MEMBER_TIMEOUT_NAME)
+ @ConfigAttributeSetter(name = MEMBER_TIMEOUT)
void setMemberTimeout(int value);
/**
@@ -1654,48 +1787,57 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*/
int DEFAULT_MEMBER_TIMEOUT = 5000;
- /** The minimum member-timeout setting of 1000 milliseconds */
+ /**
+ * The minimum member-timeout setting of 1000 milliseconds
+ */
int MIN_MEMBER_TIMEOUT = 10;
- /**The maximum member-timeout setting of 600000 millieseconds */
+ /**
+ * The maximum member-timeout setting of 600000 millieseconds
+ */
int MAX_MEMBER_TIMEOUT = 600000;
/**
* The name of the corresponding property
*/
- @ConfigAttribute(type=Integer.class, min=MIN_MEMBER_TIMEOUT, max=MAX_MEMBER_TIMEOUT)
+ @ConfigAttribute(type = Integer.class, min = MIN_MEMBER_TIMEOUT, max = MAX_MEMBER_TIMEOUT)
String MEMBER_TIMEOUT_NAME = MEMBER_TIMEOUT;
- @ConfigAttribute(type=int[].class)
+ @ConfigAttribute(type = int[].class)
String MEMBERSHIP_PORT_RANGE_NAME = MEMBERSHIP_PORT_RANGE;
int[] DEFAULT_MEMBERSHIP_PORT_RANGE = new int[] { 1024, 65535 };
- @ConfigAttributeGetter(name=MEMBERSHIP_PORT_RANGE_NAME)
+ @ConfigAttributeGetter(name = MEMBERSHIP_PORT_RANGE)
int[] getMembershipPortRange();
- @ConfigAttributeSetter(name=MEMBERSHIP_PORT_RANGE_NAME)
+ @ConfigAttributeSetter(name = MEMBERSHIP_PORT_RANGE)
void setMembershipPortRange(int[] range);
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
* property
*/
- @ConfigAttributeGetter(name=CONSERVE_SOCKETS_NAME)
+ @ConfigAttributeGetter(name = CONSERVE_SOCKETS)
boolean getConserveSockets();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
* property.
*/
- @ConfigAttributeSetter(name=CONSERVE_SOCKETS_NAME)
+ @ConfigAttributeSetter(name = CONSERVE_SOCKETS)
void setConserveSockets(boolean newValue);
- /** The name of the "conserveSockets" property */
- @ConfigAttribute(type=Boolean.class)
+ /**
+ * The name of the "conserveSockets" property
+ */
+ @ConfigAttribute(type = Boolean.class)
String CONSERVE_SOCKETS_NAME = CONSERVE_SOCKETS;
- /** The default value of the "conserveSockets" property */
+ /**
+ * The default value of the "conserveSockets" property
+ */
boolean DEFAULT_CONSERVE_SOCKETS = true;
/**
@@ -1703,26 +1845,32 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#roles">"roles"</a>
* property
*/
- @ConfigAttributeGetter(name=ROLES_NAME)
+ @ConfigAttributeGetter(name = ROLES)
String getRoles();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#roles">"roles"</a>
* property.
*/
- @ConfigAttributeSetter(name=ROLES_NAME)
+ @ConfigAttributeSetter(name = ROLES)
void setRoles(String roles);
- /** The name of the "roles" property */
- @ConfigAttribute(type=String.class)
+
+ /**
+ * The name of the "roles" property
+ */
+ @ConfigAttribute(type = String.class)
String ROLES_NAME = ROLES;
- /** The default value of the "roles" property */
+ /**
+ * The default value of the "roles" property
+ */
String DEFAULT_ROLES = "";
-
/**
- * The name of the "max wait time for reconnect" property */
- @ConfigAttribute(type=Integer.class)
+ * The name of the "max wait time for reconnect" property
+ */
+ @ConfigAttribute(type = Integer.class)
String MAX_WAIT_TIME_FOR_RECONNECT_NAME = MAX_WAIT_TIME_RECONNECT;
/**
@@ -1732,37 +1880,37 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
/**
* Sets the max wait timeout, in milliseconds, for reconnect.
- * */
- @ConfigAttributeSetter(name=MAX_WAIT_TIME_FOR_RECONNECT_NAME)
+ */
+ @ConfigAttributeSetter(name = MAX_WAIT_TIME_RECONNECT)
void setMaxWaitTimeForReconnect(int timeOut);
/**
* Returns the max wait timeout, in milliseconds, for reconnect.
- * */
- @ConfigAttributeGetter(name=MAX_WAIT_TIME_FOR_RECONNECT_NAME)
+ */
+ @ConfigAttributeGetter(name = MAX_WAIT_TIME_RECONNECT)
int getMaxWaitTimeForReconnect();
/**
* The name of the "max number of tries for reconnect" property.
- * */
- @ConfigAttribute(type=Integer.class)
- String MAX_NUM_RECONNECT_TRIES = SystemConfigurationProperties.MAX_NUM_RECONNECT_TRIES;
+ */
+ @ConfigAttribute(type = Integer.class)
+ String MAX_NUM_RECONNECT_TRIES_NAME = MAX_NUM_RECONNECT_TRIES;
/**
- * Default value for MAX_NUM_RECONNECT_TRIES.
+ * Default value for MAX_NUM_RECONNECT_TRIES_NAME.
*/
int DEFAULT_MAX_NUM_RECONNECT_TRIES = 3;
/**
* Sets the max number of tries for reconnect.
- * */
- @ConfigAttributeSetter(name=MAX_NUM_RECONNECT_TRIES)
+ */
+ @ConfigAttributeSetter(name = MAX_NUM_RECONNECT_TRIES)
void setMaxNumReconnectTries(int tries);
/**
* Returns the value for max number of tries for reconnect.
- * */
- @ConfigAttributeGetter(name=MAX_NUM_RECONNECT_TRIES)
+ */
+ @ConfigAttributeGetter(name = MAX_NUM_RECONNECT_TRIES)
int getMaxNumReconnectTries();
// ------------------- Asynchronous Messaging Properties -------------------
@@ -1772,120 +1920,149 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#async-distribution-timeout">
* "async-distribution-timeout"</a> property.
*/
- @ConfigAttributeGetter(name=ASYNC_DISTRIBUTION_TIMEOUT_NAME)
+ @ConfigAttributeGetter(name = ASYNC_DISTRIBUTION_TIMEOUT)
int getAsyncDistributionTimeout();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#async-distribution-timeout">
* "async-distribution-timeout"</a> property.
*/
- @ConfigAttributeSetter(name=ASYNC_DISTRIBUTION_TIMEOUT_NAME)
+ @ConfigAttributeSetter(name = ASYNC_DISTRIBUTION_TIMEOUT)
void setAsyncDistributionTimeout(int newValue);
- /** The default value of "asyncDistributionTimeout" is <code>0</code>. */
+ /**
+ * The default value of "asyncDistributionTimeout" is <code>0</code>.
+ */
int DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT = 0;
- /** The minimum value of "asyncDistributionTimeout" is <code>0</code>. */
+ /**
+ * The minimum value of "asyncDistributionTimeout" is <code>0</code>.
+ */
int MIN_ASYNC_DISTRIBUTION_TIMEOUT = 0;
- /** The maximum value of "asyncDistributionTimeout" is <code>60000</code>. */
+ /**
+ * The maximum value of "asyncDistributionTimeout" is <code>60000</code>.
+ */
int MAX_ASYNC_DISTRIBUTION_TIMEOUT = 60000;
- /** The name of the "asyncDistributionTimeout" property */
- @ConfigAttribute(type=Integer.class, min=MIN_ASYNC_DISTRIBUTION_TIMEOUT, max=MAX_ASYNC_DISTRIBUTION_TIMEOUT)
+ /**
+ * The name of the "asyncDistributionTimeout" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_ASYNC_DISTRIBUTION_TIMEOUT, max = MAX_ASYNC_DISTRIBUTION_TIMEOUT)
String ASYNC_DISTRIBUTION_TIMEOUT_NAME = ASYNC_DISTRIBUTION_TIMEOUT;
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#async-queue-timeout">
* "async-queue-timeout"</a> property.
*/
- @ConfigAttributeGetter(name=ASYNC_QUEUE_TIMEOUT_NAME)
+ @ConfigAttributeGetter(name = ASYNC_QUEUE_TIMEOUT)
int getAsyncQueueTimeout();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#async-queue-timeout">
* "async-queue-timeout"</a> property.
*/
- @ConfigAttributeSetter(name=ASYNC_QUEUE_TIMEOUT_NAME)
+ @ConfigAttributeSetter(name = ASYNC_QUEUE_TIMEOUT)
void setAsyncQueueTimeout(int newValue);
- /** The default value of "asyncQueueTimeout" is <code>60000</code>. */
+ /**
+ * The default value of "asyncQueueTimeout" is <code>60000</code>.
+ */
int DEFAULT_ASYNC_QUEUE_TIMEOUT = 60000;
- /** The minimum value of "asyncQueueTimeout" is <code>0</code>. */
+ /**
+ * The minimum value of "asyncQueueTimeout" is <code>0</code>.
+ */
int MIN_ASYNC_QUEUE_TIMEOUT = 0;
- /** The maximum value of "asyncQueueTimeout" is <code>86400000</code>. */
+ /**
+ * The maximum value of "asyncQueueTimeout" is <code>86400000</code>.
+ */
int MAX_ASYNC_QUEUE_TIMEOUT = 86400000;
- /** The name of the "asyncQueueTimeout" property */
- @ConfigAttribute(type=Integer.class, min=MIN_ASYNC_QUEUE_TIMEOUT, max=MAX_ASYNC_QUEUE_TIMEOUT)
+ /**
+ * The name of the "asyncQueueTimeout" property
+ */
+ @ConfigAttribute(type = Integer.class, min = MIN_ASYNC_QUEUE_TIMEOUT, max = MAX_ASYNC_QUEUE_TIMEOUT)
String ASYNC_QUEUE_TIMEOUT_NAME = ASYNC_QUEUE_TIMEOUT;
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#async-max-queue-size">
* "async-max-queue-size"</a> property.
*/
- @ConfigAttributeGetter(name=ASYNC_MAX_QUEUE_SIZE_NAME)
+ @ConfigAttributeGetter(name = ASYNC_MAX_QUEUE_SIZE)
int getAsyncMaxQueueSize();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#async-max-queue-size">
* "async-max-queue-size"</a> property.
*/
- @ConfigAttributeSetter(name=ASYNC_MAX_QUEUE_SIZE_NAME)
+ @ConfigAttributeSetter(name = ASYNC_MAX_QUEUE_SIZE)
void setAsyncMaxQueueSize(int newValue);
- /** The default value of "asyncMaxQueueSize" is <code>8</code>. */
+ /**
+ * The default value of "asyncMaxQueueSize" is <code>8</code>.
+ */
int DEFAULT_ASYNC_MAX_QUEUE_SIZE = 8;
- /** The minimum value of "asyncMaxQueueSize" is <code>0</code>. */
+ /**
+ * The minimum value of "asyncMaxQueueSize" is <code>0</code>.
+ */
int MIN_ASYNC_MAX_QUEUE_SIZE = 0;
- /** The maximum value of "asyncMaxQueueSize" is <code>1024</code>. */
+ /**
+ * The maximum value of "asyncMaxQueueSize" is <code>1024</code>.
+ */
int MAX_ASYNC_MAX_QUEUE_SIZE = 1024;
/** The name of the "asyncMaxQueueSize" property */
@ConfigAttribute(type=Integer.class, min=MIN_ASYNC_MAX_QUEUE_SIZE, max=MAX_ASYNC_MAX_QUEUE_SIZE)
- public static final String ASYNC_MAX_QUEUE_SIZE_NAME = "async-max-queue-size";
+ String ASYNC_MAX_QUEUE_SIZE_NAME = "async-max-queue-size";
/** @since GemFire 5.7 */
@ConfigAttribute(type=String.class)
- public static final String CLIENT_CONFLATION_PROP_NAME = "conflate-events";
+ String CLIENT_CONFLATION_PROP_NAME = "conflate-events";
/** @since GemFire 5.7 */
- public static final String CLIENT_CONFLATION_PROP_VALUE_DEFAULT = "server";
+ String CLIENT_CONFLATION_PROP_VALUE_DEFAULT = "server";
/** @since GemFire 5.7 */
- public static final String CLIENT_CONFLATION_PROP_VALUE_ON = "true";
+ String CLIENT_CONFLATION_PROP_VALUE_ON = "true";
/** @since GemFire 5.7 */
- public static final String CLIENT_CONFLATION_PROP_VALUE_OFF = "false";
-
-
+ String CLIENT_CONFLATION_PROP_VALUE_OFF = "false";
+
+
/** @since Geode 1.0 */
@ConfigAttribute(type=Boolean.class)
String DISTRIBUTED_TRANSACTIONS_NAME = DISTRIBUTED_TRANSACTIONS;
boolean DEFAULT_DISTRIBUTED_TRANSACTIONS = false;
- @ConfigAttributeGetter(name=DISTRIBUTED_TRANSACTIONS_NAME)
+ @ConfigAttributeGetter(name = DISTRIBUTED_TRANSACTIONS)
boolean getDistributedTransactions();
- @ConfigAttributeSetter(name=DISTRIBUTED_TRANSACTIONS_NAME)
+ @ConfigAttributeSetter(name = DISTRIBUTED_TRANSACTIONS)
void setDistributedTransactions(boolean value);
-
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#conflate-events">"conflate-events"</a>
* property.
* @since GemFire 5.7
*/
- @ConfigAttributeGetter(name=CLIENT_CONFLATION_PROP_NAME)
+ @ConfigAttributeGetter(name = CONFLATE_EVENTS)
String getClientConflation();
+
/**
* Sets the value of the <a
* href="../DistributedSystem.html#conflate-events">"conflate-events"</a>
* property.
* @since GemFire 5.7
*/
- @ConfigAttributeSetter(name=CLIENT_CONFLATION_PROP_NAME)
+ @ConfigAttributeSetter(name = CONFLATE_EVENTS)
void setClientConflation(String clientConflation);
// -------------------------------------------------------------------------
+
/**
* Returns the value of the <a
* href="../DistributedSystem.html#durable-client-id">"durable-client-id"</a>
* property.
*/
- @ConfigAttributeGetter(name=DURABLE_CLIENT_ID_NAME)
+ @ConfigAttributeGetter(name = DURABLE_CLIENT_ID)
String getDurableClientId();
/**
@@ -1893,11 +2070,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#durable-client-id">"durable-client-id"</a>
* property.
*/
- @ConfigAttributeSetter(name=DURABLE_CLIENT_ID_NAME)
+ @ConfigAttributeSetter(name = DURABLE_CLIENT_ID)
void setDurableClientId(String durableClientId);
- /** The name of the "durableClientId" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the "durableClientId" property
+ */
+ @ConfigAttribute(type = String.class)
String DURABLE_CLIENT_ID_NAME = DURABLE_CLIENT_ID;
/**
@@ -1911,7 +2090,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#durable-client-timeout">"durable-client-timeout"</a>
* property.
*/
- @ConfigAttributeGetter(name=DURABLE_CLIENT_TIMEOUT_NAME)
+ @ConfigAttributeGetter(name = DURABLE_CLIENT_TIMEOUT)
int getDurableClientTimeout();
/**
@@ -1919,11 +2098,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#durable-client-timeout">"durable-client-timeout"</a>
* property.
*/
- @ConfigAttributeSetter(name=DURABLE_CLIENT_TIMEOUT_NAME)
+ @ConfigAttributeSetter(name = DURABLE_CLIENT_TIMEOUT)
void setDurableClientTimeout(int durableClientTimeout);
- /** The name of the "durableClientTimeout" property */
- @ConfigAttribute(type=Integer.class)
+ /**
+ * The name of the "durableClientTimeout" property
+ */
+ @ConfigAttribute(type = Integer.class)
String DURABLE_CLIENT_TIMEOUT_NAME = DURABLE_CLIENT_TIMEOUT;
/**
@@ -1936,7 +2117,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* Returns user module name for client authentication initializer in <a
* href="../DistributedSystem.html#security-client-auth-init">"security-client-auth-init"</a>
*/
- @ConfigAttributeGetter(name=SECURITY_CLIENT_AUTH_INIT_NAME)
+ @ConfigAttributeGetter(name = SECURITY_CLIENT_AUTH_INIT)
String getSecurityClientAuthInit();
/**
@@ -1944,11 +2125,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#security-client-auth-init">"security-client-auth-init"</a>
* property.
*/
- @ConfigAttributeSetter(name=SECURITY_CLIENT_AUTH_INIT_NAME)
+ @ConfigAttributeSetter(name = SECURITY_CLIENT_AUTH_INIT)
void setSecurityClientAuthInit(String attValue);
- /** The name of user defined method name for "security-client-auth-init" property*/
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of user defined method name for "security-client-auth-init" property
+ */
+ @ConfigAttribute(type = String.class)
String SECURITY_CLIENT_AUTH_INIT_NAME = SECURITY_CLIENT_AUTH_INIT;
/**
@@ -1961,7 +2144,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* Returns user module name authenticating client credentials in <a
* href="../DistributedSystem.html#security-client-authenticator">"security-client-authenticator"</a>
*/
- @ConfigAttributeGetter(name=SECURITY_CLIENT_AUTHENTICATOR_NAME)
+ @ConfigAttributeGetter(name = SECURITY_CLIENT_AUTHENTICATOR_NAME)
String getSecurityClientAuthenticator();
/**
@@ -1969,11 +2152,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#security-client-authenticator">"security-client-authenticator"</a>
* property.
*/
- @ConfigAttributeSetter(name=SECURITY_CLIENT_AUTHENTICATOR_NAME)
+ @ConfigAttributeSetter(name = SECURITY_CLIENT_AUTHENTICATOR_NAME)
void setSecurityClientAuthenticator(String attValue);
- /** The name of factory method for "security-client-authenticator" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of factory method for "security-client-authenticator" property
+ */
+ @ConfigAttribute(type = String.class)
String SECURITY_CLIENT_AUTHENTICATOR_NAME = SECURITY_CLIENT_AUTHENTICATOR;
/**
@@ -1986,7 +2171,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* Returns name of algorithm to use for Diffie-Hellman key exchange <a
* href="../DistributedSystem.html#security-client-dhalgo">"security-client-dhalgo"</a>
*/
- @ConfigAttributeGetter(name=SECURITY_CLIENT_DHALGO_NAME)
+ @ConfigAttributeGetter(name = SECURITY_CLIENT_DHALGO_NAME)
String getSecurityClientDHAlgo();
/**
@@ -1994,14 +2179,14 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#security-client-dhalgo">"security-client-dhalgo"</a>
* property.
*/
- @ConfigAttributeSetter(name=SECURITY_CLIENT_DHALGO_NAME)
+ @ConfigAttributeSetter(name = SECURITY_CLIENT_DHALGO_NAME)
void setSecurityClientDHAlgo(String attValue);
/**
* The name of the Diffie-Hellman symmetric algorithm "security-client-dhalgo"
* property.
*/
- @ConfigAttribute(type=String.class)
+ @ConfigAttribute(type = String.class)
String SECURITY_CLIENT_DHALGO_NAME = SECURITY_CLIENT_DHALGO;
/**
@@ -2016,7 +2201,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* Returns user defined method name for peer authentication initializer in <a
* href="../DistributedSystem.html#security-peer-auth-init">"security-peer-auth-init"</a>
*/
- @ConfigAttributeGetter(name=SECURITY_PEER_AUTH_INIT_NAME)
+ @ConfigAttributeGetter(name = SECURITY_PEER_AUTH_INIT_NAME)
String getSecurityPeerAuthInit();
/**
@@ -2024,11 +2209,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#security-peer-auth-init">"security-peer-auth-init"</a>
* property.
*/
- @ConfigAttributeSetter(name=SECURITY_PEER_AUTH_INIT_NAME)
+ @ConfigAttributeSetter(name = SECURITY_PEER_AUTH_INIT_NAME)
void setSecurityPeerAuthInit(String attValue);
- /** The name of user module for "security-peer-auth-init" property*/
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of user module for "security-peer-auth-init" property
+ */
+ @ConfigAttribute(type = String.class)
String SECURITY_PEER_AUTH_INIT_NAME = SECURITY_PEER_AUTH_INIT;
/**
@@ -2041,7 +2228,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* Returns user defined method name authenticating peer's credentials in <a
* href="../DistributedSystem.html#security-peer-authenticator">"security-peer-authenticator"</a>
*/
- @ConfigAttributeGetter(name=SECURITY_PEER_AUTHENTICATOR_NAME)
+ @ConfigAttributeGetter(name = SECURITY_PEER_AUTHENTICATOR_NAME)
String getSecurityPeerAuthenticator();
/**
@@ -2049,11 +2236,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#security-peer-authenticator">"security-peer-authenticator"</a>
* property.
*/
- @ConfigAttributeSetter(name=SECURITY_PEER_AUTHENTICATOR_NAME)
+ @ConfigAttributeSetter(name = SECURITY_PEER_AUTHENTICATOR_NAME)
void setSecurityPeerAuthenticator(String attValue);
- /** The name of user defined method for "security-peer-authenticator" property*/
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of user defined method for "security-peer-authenticator" property
+ */
+ @ConfigAttribute(type = String.class)
String SECURITY_PEER_AUTHENTICATOR_NAME = SECURITY_PEER_AUTHENTICATOR;
/**
@@ -2066,7 +2255,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* Returns user module name authorizing client credentials in <a
* href="../DistributedSystem.html#security-client-accessor">"security-client-accessor"</a>
*/
- @ConfigAttributeGetter(name=SECURITY_CLIENT_ACCESSOR_NAME)
+ @ConfigAttributeGetter(name = SECURITY_CLIENT_ACCESSOR_NAME)
String getSecurityClientAccessor();
/**
@@ -2074,11 +2263,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#security-client-accessor">"security-client-accessor"</a>
* property.
*/
- @ConfigAttributeSetter(name=SECURITY_CLIENT_ACCESSOR_NAME)
+ @ConfigAttributeSetter(name = SECURITY_CLIENT_ACCESSOR_NAME)
void setSecurityClientAccessor(String attValue);
- /** The name of the factory method for "security-client-accessor" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the factory method for "security-client-accessor" property
+ */
+ @ConfigAttribute(type = String.class)
String SECURITY_CLIENT_ACCESSOR_NAME = SECURITY_CLIENT_ACCESSOR;
/**
@@ -2091,7 +2282,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* Returns user module name authorizing client credentials in <a
* href="../DistributedSystem.html#security-client-accessor-pp">"security-client-accessor-pp"</a>
*/
- @ConfigAttributeGetter(name=SECURITY_CLIENT_ACCESSOR_PP_NAME)
+ @ConfigAttributeGetter(name = SECURITY_CLIENT_ACCESSOR_PP_NAME)
String getSecurityClientAccessorPP();
/**
@@ -2099,11 +2290,13 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* href="../DistributedSystem.html#security-client-accessor-pp">"security-client-accessor-pp"</a>
* property.
*/
- @ConfigAttributeSetter(name=SECURITY_CLIENT_ACCESSOR_PP_NAME)
+ @ConfigAttributeSetter(name = SECURITY_CLIENT_ACCESSOR_PP_NAME)
void setSecurityClientAccessorPP(String attValue);
- /** The name of the factory method for "security-client-accessor-pp" property */
- @ConfigAttribute(type=String.class)
+ /**
+ * The name of the factory method for "security-client-accessor-pp" property
+ */
+ @ConfigAttribute(type = String.class)
String SECURITY_CLIENT_ACCESSOR_PP_NAME = SECURITY_CLIENT_ACCESSOR_PP;
/**
@@ -2117,16 +2310,15 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*
* @return the current security log-level
*/
- @ConfigAttributeGetter(name=SECURITY_LOG_LEVEL_NAME)
+ @ConfigAttributeGetter(name = SECURITY_LOG_LEVEL_NAME)
int getSecurityLogLevel();
/**
* Set the log-level for security logging.
*
- * @param level
- * the new security log-level
+ * @param level the new security log-level
*/
- @ConfigAttributeSetter(name=SECURITY_LOG_LEVEL_NAME)
+ @ConfigAttributeSetter(name = SECURITY_LOG_LEVEL_NAME)
void setSecurityLogLevel(int level);
/**
@@ -2135,7 +2327,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* {@link DistributedSystem#getSecurityLogWriter()}
*/
// type is String because the config file "config", "debug", "fine" etc, but the setter getter accepts int
- @ConfigAttribute(type=String.class)
+ @ConfigAttribute(type = String.class)
String SECURITY_LOG_LEVEL_NAME = SECURITY_LOG_LEVEL;
/**
@@ -2143,7 +2335,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
*
* @return <code>null</code> if logging information goes to standard out
*/
- @ConfigAttributeGetter(name=SECURITY_LOG_FILE_NAME)
+ @ConfigAttributeGetter(name = SECURITY_LOG_FILE_NAME)
File getSecurityLogFile();
/**
@@ -2153,22 +2345,19 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* <p>
* The security log file can not be changed while the system is running.
*
- * @throws IllegalArgumentException
- * if the specified value is not acceptable.
- * @throws com.gemstone.gemfire.UnmodifiableException
- * if this attribute can not be modified.
- * @throws com.gemstone.ge
<TRUNCATED>
[15/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index 042df6f..d675b14 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -71,7 +71,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testGCForGroup() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
String command = "gc --group=Group1";
@@ -441,7 +441,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testChangeLogLevelForGrps() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group0");
final VM vm1 = Host.getHost(0).getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 6595ca0..6bdf917 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -86,7 +86,7 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
@Test
public void testExportLogsForGroup() throws IOException {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
String dir = getCurrentTimeString();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index e1c906d..e53e6ea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -94,7 +94,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
diskStoreDir.mkdirs();
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
localProps.setProperty(GROUPS, "Group1");
getSystem(localProps);
getCache();
@@ -106,7 +106,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
vm2.invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
+ localProps.setProperty(NAME, vm2Name);
localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
@@ -261,7 +261,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
final File locatorLogFile = new File("locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+ locatorProps.setProperty(NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "fine");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index a77aeee..3b1f75e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -178,7 +178,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locator1Port);
localProps.setProperty(GROUPS, groupName);
- localProps.setProperty(SystemConfigurationProperties.NAME, "DataMember");
+ localProps.setProperty(NAME, "DataMember");
getSystem(localProps);
Cache cache = getCache();
assertNotNull(cache);
@@ -286,7 +286,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
public void run() {
final File locatorLogFile = new File(locator2LogFilePath);
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, locator2Name);
+ locatorProps.setProperty(NAME, locator2Name);
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "fine");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index cc7017a..b439e20 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -53,7 +53,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
private void createLocalSetUp() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Controller");
+ localProps.setProperty(NAME, "Controller");
getSystem(localProps);
Cache cache = getCache();
RegionFactory<Integer, Integer> dataRegionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE);
@@ -74,7 +74,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
vm1.invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
getSystem(localProps);
Cache cache = getCache();
@@ -117,7 +117,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
vm1.invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
getSystem(localProps);
Cache cache = getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/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 2e4e2e4..44600f6 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
@@ -59,7 +59,7 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
props.setProperty(LOG_LEVEL, "info");
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
- props.setProperty(SystemConfigurationProperties.NAME, name);
+ props.setProperty(NAME, name);
props.setProperty(GROUPS, groups);
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index e6ee71b..06e5fbb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -94,7 +94,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
final File locatorLogFile = new File(testName + "-locator-" + locator1Port + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, locator1Name);
+ locatorProps.setProperty(NAME, locator1Name);
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "fine");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
@@ -143,7 +143,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
final File locatorLogFile = new File(testName + "-locator-" + locator2Port + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, locator2Name);
+ locatorProps.setProperty(NAME, locator2Name);
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "fine");
locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port);
@@ -229,7 +229,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
final File locatorLogFile = new File(testName + "-locator-" + locator1Port + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator1");
+ locatorProps.setProperty(NAME, "Locator1");
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "info");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
@@ -321,7 +321,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
final File locatorLogFile = new File(testName + "-locator-" + locator2Port + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator2");
+ locatorProps.setProperty(NAME, "Locator2");
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "info");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
index 3e21a7a..97b56d3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
@@ -306,7 +306,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
disconnectFromDS();
final Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "member" + i);
+ props.setProperty(NAME, "member" + i);
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, getLocatorStr(locatorPorts));
props.setProperty(LOG_FILE, "server-" + i + ".log");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
index ffb5d79..e2e951f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
@@ -54,7 +54,7 @@ public class JsonAuthorizationCacheStartRule extends ExternalResource {
protected void before() throws Throwable {
Properties properties = new Properties();
- properties.put(SystemConfigurationProperties.NAME, JsonAuthorizationCacheStartRule.class.getSimpleName());
+ properties.put(NAME, JsonAuthorizationCacheStartRule.class.getSimpleName());
properties.put(LOCATORS, "");
properties.put(MCAST_PORT, "0");
properties.put(JMX_MANAGER, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
index b17edd0..2887195 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
@@ -38,7 +38,7 @@ public class ShiroCacheStartRule extends ExternalResource {
protected void before() throws Throwable {
Properties properties = new Properties();
- properties.put(SystemConfigurationProperties.NAME, ShiroCacheStartRule.class.getSimpleName());
+ properties.put(NAME, ShiroCacheStartRule.class.getSimpleName());
properties.put(LOCATORS, "");
properties.put(MCAST_PORT, "0");
properties.put(JMX_MANAGER, "true");
[16/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ff81dbfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ff81dbfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ff81dbfc
Branch: refs/heads/feature/GEODE-1372
Commit: ff81dbfc6fe193f30d9607fa39be6c8f72b56688
Parents: 8975cbd
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue May 31 12:02:27 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../LauncherLifecycleCommandsJUnitTest.java | 2 +-
.../SharedConfigurationEndToEndDUnitTest.java | 4 +--
.../gemfire/admin/DistributedSystemConfig.java | 2 +-
.../gemfire/distributed/AbstractLauncher.java | 2 +-
.../gemfire/distributed/LocatorLauncher.java | 6 ++--
.../gemfire/distributed/ServerLauncher.java | 6 ++--
.../SystemConfigurationProperties.java | 4 +--
.../internal/AbstractDistributionConfig.java | 2 +-
.../internal/DistributionConfig.java | 2 +-
.../internal/DistributionConfigImpl.java | 4 +--
.../internal/SharedConfiguration.java | 4 ++-
.../internal/cli/help/utils/HelpUtils.java | 4 +--
.../com/gemstone/gemfire/GemFireTestCase.java | 2 +-
.../gemfire/LocalStatisticsJUnitTest.java | 2 +-
.../com/gemstone/gemfire/LonerDMJUnitTest.java | 2 +-
.../functional/IndexCreationJUnitTest.java | 12 ++++----
.../DistributedMulticastRegionDUnitTest.java | 2 +-
.../distributed/AbstractLauncherTest.java | 32 ++++++++++----------
.../distributed/DistributedMemberDUnitTest.java | 14 ++++-----
.../LocatorLauncherIntegrationTest.java | 2 +-
.../LocatorLauncherLocalIntegrationTest.java | 24 +++++++--------
.../distributed/LocatorLauncherTest.java | 6 ++--
.../ServerLauncherIntegrationTest.java | 2 +-
.../ServerLauncherLocalIntegrationTest.java | 2 +-
.../gemfire/distributed/ServerLauncherTest.java | 6 ++--
.../internal/DistributionManagerDUnitTest.java | 8 ++---
.../InternalDistributedSystemJUnitTest.java | 4 +--
.../cache/DiskRegCacheXmlJUnitTest.java | 2 +-
.../DiskRegCachexmlGeneratorJUnitTest.java | 2 +-
...ributedRegionFunctionExecutionDUnitTest.java | 2 +-
.../cli/HeadlessGfshIntegrationTest.java | 2 +-
.../cli/commands/CliCommandTestBase.java | 4 +--
.../cli/commands/ConfigCommandsDUnitTest.java | 20 ++++++------
...eateAlterDestroyRegionCommandsDUnitTest.java | 8 ++---
.../cli/commands/DeployCommandsDUnitTest.java | 14 ++++-----
.../commands/DiskStoreCommandsDUnitTest.java | 14 ++++-----
.../cli/commands/FunctionCommandsDUnitTest.java | 14 ++++-----
.../commands/GemfireDataCommandsDUnitTest.java | 2 +-
...WithCacheLoaderDuringCacheMissDUnitTest.java | 4 +--
.../cli/commands/IndexCommandsDUnitTest.java | 4 +--
...stAndDescribeDiskStoreCommandsDUnitTest.java | 4 +--
.../ListAndDescribeRegionDUnitTest.java | 2 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 4 +--
.../cli/commands/MemberCommandsDUnitTest.java | 2 +-
.../MiscellaneousCommandsDUnitTest.java | 4 +--
...laneousCommandsExportLogsPart3DUnitTest.java | 2 +-
.../cli/commands/QueueCommandsDUnitTest.java | 6 ++--
.../SharedConfigurationCommandsDUnitTest.java | 4 +--
.../cli/commands/ShowMetricsDUnitTest.java | 6 ++--
.../cli/commands/ShowStackTraceDUnitTest.java | 2 +-
.../SharedConfigurationDUnitTest.java | 8 ++---
.../SharedConfigurationUsingDirDUnitTest.java | 2 +-
.../JsonAuthorizationCacheStartRule.java | 2 +-
.../internal/security/ShiroCacheStartRule.java | 2 +-
54 files changed, 151 insertions(+), 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index b97cef3..97251a6 100755
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -103,7 +103,7 @@ public class LauncherLifecycleCommandsJUnitTest {
gemfireProperties.setProperty(LOG_LEVEL, "config");
gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY_STRING);
gemfireProperties.setProperty(MCAST_PORT, "0");
- gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "tidepool");
+ gemfireProperties.setProperty(NAME, "tidepool");
getLauncherLifecycleCommands().addGemFireSystemProperties(commandLine, gemfireProperties);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index d03e211..5c3d99f 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -345,7 +345,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
final File locatorLogFile = new File(locatorLogPath);
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, locator1Name);
+ locatorProps.setProperty(NAME, locator1Name);
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(SystemConfigurationProperties.LOG_LEVEL, "config");
locatorProps.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "true");
@@ -393,7 +393,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(SystemConfigurationProperties.LOCATORS, "localhost:" + locator1Port);
- localProps.setProperty(SystemConfigurationProperties.NAME, "DataMember");
+ localProps.setProperty(NAME, "DataMember");
getSystem(localProps);
Cache cache = getCache();
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index a060c96..1c53e42 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -81,7 +81,7 @@ public interface DistributedSystemConfig extends Cloneable {
String DEFAULT_SYSTEM_ID = "Default System";
/** The name of the "name" property. See {@link #getSystemName()}. */
- String NAME_NAME = SystemConfigurationProperties.NAME;
+ String NAME_NAME = NAME;
/** The default value of the "name" property (""). See {@link #getSystemName()}. */
String DEFAULT_NAME = "";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
index 9be157c..cc27a03 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
@@ -285,7 +285,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
}
if (!StringUtils.isBlank(getMemberName())) {
- distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, getMemberName());
+ distributedSystemProperties.setProperty(NAME, getMemberName());
}
// Set any other GemFire Distributed System/Distribution Config directory-based properties as necessary
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index 1e350e7..f759886 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -1711,9 +1711,9 @@ public final class LocatorLauncher extends AbstractLauncher<String> {
protected void validateOnStart() {
if (Command.START.equals(getCommand())) {
if (StringUtils.isBlank(getMemberName())
- && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME)
- && !isSet(getDistributedSystemProperties(), SystemConfigurationProperties.NAME)
- && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), SystemConfigurationProperties.NAME))
+ && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + NAME)
+ && !isSet(getDistributedSystemProperties(), NAME)
+ && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), NAME))
{
throw new IllegalStateException(LocalizedStrings.Launcher_Builder_MEMBER_NAME_VALIDATION_ERROR_MESSAGE
.toLocalizedString("Locator"));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index fe441fd..f19ce09 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -2264,9 +2264,9 @@ public class ServerLauncher extends AbstractLauncher<String> {
protected void validateOnStart() {
if (Command.START.equals(getCommand())) {
if (StringUtils.isBlank(getMemberName())
- && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME)
- && !isSet(getDistributedSystemProperties(), SystemConfigurationProperties.NAME)
- && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), SystemConfigurationProperties.NAME))
+ && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + NAME)
+ && !isSet(getDistributedSystemProperties(), NAME)
+ && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), NAME))
{
throw new IllegalStateException(LocalizedStrings.Launcher_Builder_MEMBER_NAME_VALIDATION_ERROR_MESSAGE
.toLocalizedString("Server"));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
index c451708..df320b2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.distributed;
-import com.gemstone.gemfire.distributed.internal.ConfigAttribute;
/**
* Created by ukohlmeyer on 26/05/2016.
@@ -130,9 +129,8 @@ public interface SystemConfigurationProperties {
String MEMCACHED_PROTOCOL = "memcached-protocol";
/**
- * The name of the "name" property
+ * The "name" property, representing the system's name
*/
- @ConfigAttribute(type = String.class)
String NAME = "name";
String REDUNDANCY_ZONE = "redundancy-zone";
String REMOTE_LOCATORS = "remote-locators";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 98c3faf..4212bb3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -809,7 +809,7 @@ public abstract class AbstractDistributionConfig
LocalizedStrings.AbstractDistributionConfig_SERVER_BIND_ADDRESS_NAME_0
.toLocalizedString(DEFAULT_BIND_ADDRESS));
- m.put(SystemConfigurationProperties.NAME, "A name that uniquely identifies a member in its distributed system." +
+ m.put(NAME, "A name that uniquely identifies a member in its distributed system." +
" Multiple members in the same distributed system can not have the same name." +
" Defaults to \"\".");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index dbd9c79..1cce999 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -79,7 +79,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
void setName(String value);
/**
- * The name of the "name" property
+ * The "name" property, representing the system's name
*/
@ConfigAttribute(type = String.class)
String NAME_NAME = NAME;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index 196d8f3..e8e4f3b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -35,8 +35,6 @@ import java.net.URL;
import java.net.UnknownHostException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
-
/**
* Provides an implementation of <code>DistributionConfig</code> that
* knows how to read the configuration file.
@@ -1574,7 +1572,7 @@ public class DistributionConfigImpl
if (value == null) {
value = DEFAULT_NAME;
}
- this.name = (String) checkAttribute(SystemConfigurationProperties.NAME, value);
+ this.name = (String) checkAttribute(NAME, value);
}
public void setTcpPort(int value) {
this.tcpPort = (Integer) checkAttribute(TCP_PORT, value);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index ccccee3..3493a87 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -83,6 +83,8 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon
import com.gemstone.gemfire.management.internal.configuration.utils.XmlUtils;
import com.gemstone.gemfire.management.internal.configuration.utils.ZipUtils;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
@SuppressWarnings({ "deprecation", "unchecked" })
public class SharedConfiguration {
@@ -142,7 +144,7 @@ public class SharedConfiguration {
public SharedConfiguration(Cache cache) throws IOException {
this.cache = (GemFireCacheImpl)cache;
this.configDiskDirName = CLUSTER_CONFIG_DISK_DIR_PREFIX + cache.getDistributedSystem().getName();
- String clusterConfigDir = cache.getDistributedSystem().getProperties().getProperty(DistributionConfig.CLUSTER_CONFIGURATION_DIR);
+ String clusterConfigDir = cache.getDistributedSystem().getProperties().getProperty(CLUSTER_CONFIGURATION_DIR);
if (StringUtils.isBlank(clusterConfigDir)) {
clusterConfigDir = System.getProperty("user.dir");
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
index bf71373..b15feda 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
@@ -74,7 +74,7 @@ public class HelpUtils {
public static Help getHelp(CommandTarget commandTarget) {
List<Block> blocks = new ArrayList<Block>();
// First we will have the block for NAME of the command
- blocks.add(block(SystemConfigurationProperties.NAME, row(commandTarget.getCommandName())));
+ blocks.add(block(NAME, row(commandTarget.getCommandName())));
// Now add synonyms if any
if (commandTarget.getSynonyms() != null) {
blocks.add(block(SYNONYMS_NAME, row(commandTarget.getSynonyms())));
@@ -186,7 +186,7 @@ public class HelpUtils {
public static NewHelp getNewHelp(CommandTarget commandTarget, boolean withinShell) {
DataNode root = new DataNode(null, new ArrayList<DataNode>());
// First we will have the block for NAME of the command
- DataNode name = new DataNode(SystemConfigurationProperties.NAME, new ArrayList<DataNode>());
+ DataNode name = new DataNode(NAME, new ArrayList<DataNode>());
name.addChild(new DataNode(commandTarget.getCommandName(), null));
root.addChild(name);
if (withinShell) {// include availabilty info
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
index 30b5c27..cd4e615 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
@@ -48,7 +48,7 @@ public abstract class GemFireTestCase {
// make it a loner
p.setProperty(MCAST_PORT, "0");
p.setProperty(LOCATORS, "");
- p.setProperty(SystemConfigurationProperties.NAME, getName());
+ p.setProperty(NAME, getName());
DistributedSystem.connect(p);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
index dccdf79..5270738 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
@@ -42,7 +42,7 @@ public class LocalStatisticsJUnitTest extends StatisticsTestCase {
props.setProperty(STATISTIC_ARCHIVE_FILE, "StatisticsTestCase-localTest.gfs");
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(SystemConfigurationProperties.NAME, getName());
+ props.setProperty(NAME, getName());
this.system = DistributedSystem.connect(props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
index 09605c7..dedfa67 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
@@ -168,7 +168,7 @@ public class LonerDMJUnitTest {
cfg.setProperty(MCAST_PORT, "0");
cfg.setProperty(LOCATORS, "");
cfg.setProperty(ROLES, "lonelyOne");
- cfg.setProperty(SystemConfigurationProperties.NAME, name);
+ cfg.setProperty(NAME, name);
DistributedSystem ds = DistributedSystem.connect(cfg);
System.out.println("MemberId = " + ds.getMemberId());
assertEquals(host.toString(), ds.getDistributedMember().getHost());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
index 3128dc7..17763d2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
@@ -849,7 +849,7 @@ public class IndexCreationJUnitTest{
{
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "test");
+ props.setProperty(NAME, "test");
props.setProperty(MCAST_PORT, "0");
props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath());
DistributedSystem ds = DistributedSystem.connect(props);
@@ -873,7 +873,7 @@ public class IndexCreationJUnitTest{
{
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "test");
+ props.setProperty(NAME, "test");
props.setProperty(MCAST_PORT, "0");
//Using a different cache.xml that changes some region properties
//That will force the disk code to copy the region entries.
@@ -899,7 +899,7 @@ public class IndexCreationJUnitTest{
file.mkdir();
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "test");
+ props.setProperty(NAME, "test");
props.setProperty(MCAST_PORT, "0");
props
.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
@@ -927,7 +927,7 @@ public class IndexCreationJUnitTest{
file.mkdir();
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "test");
+ props.setProperty(NAME, "test");
props.setProperty(MCAST_PORT, "0");
props
.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
@@ -956,7 +956,7 @@ public class IndexCreationJUnitTest{
{
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "test");
+ props.setProperty(NAME, "test");
props.setProperty(MCAST_PORT, "0");
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
@@ -990,7 +990,7 @@ public class IndexCreationJUnitTest{
{
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "test");
+ props.setProperty(NAME, "test");
props.setProperty(MCAST_PORT, "0");
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 3104892..e7aaf0c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -271,7 +271,7 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
public Object call() {
final File locatorLogFile = new File(getTestMethodName() + "-locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "LocatorWithMcast");
+ locatorProps.setProperty(NAME, "LocatorWithMcast");
locatorProps.setProperty(MCAST_PORT, mcastport);
locatorProps.setProperty(MCAST_TTL, mcastttl);
locatorProps.setProperty(LOG_LEVEL, "info");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
index 96e88c3..1d05217 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
@@ -70,22 +70,22 @@ public class AbstractLauncherTest {
public void testIsSet() {
final Properties properties = new Properties();
- assertFalse(properties.containsKey(SystemConfigurationProperties.NAME));
- assertFalse(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME));
+ assertFalse(properties.containsKey(NAME));
+ assertFalse(AbstractLauncher.isSet(properties, NAME));
- properties.setProperty(SystemConfigurationProperties.NAME, "");
+ properties.setProperty(NAME, "");
- assertTrue(properties.containsKey(SystemConfigurationProperties.NAME));
- assertFalse(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME));
+ assertTrue(properties.containsKey(NAME));
+ assertFalse(AbstractLauncher.isSet(properties, NAME));
- properties.setProperty(SystemConfigurationProperties.NAME, " ");
+ properties.setProperty(NAME, " ");
- assertTrue(properties.containsKey(SystemConfigurationProperties.NAME));
- assertFalse(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME));
+ assertTrue(properties.containsKey(NAME));
+ assertFalse(AbstractLauncher.isSet(properties, NAME));
- properties.setProperty(SystemConfigurationProperties.NAME, "memberOne");
+ properties.setProperty(NAME, "memberOne");
- assertTrue(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME));
+ assertTrue(AbstractLauncher.isSet(properties, NAME));
assertFalse(AbstractLauncher.isSet(properties, "NaMe"));
}
@@ -114,8 +114,8 @@ public class AbstractLauncherTest {
Properties distributedSystemProperties = launcher.getDistributedSystemProperties();
assertNotNull(distributedSystemProperties);
- assertTrue(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME));
- assertEquals("memberOne", distributedSystemProperties.getProperty(SystemConfigurationProperties.NAME));
+ assertTrue(distributedSystemProperties.containsKey(NAME));
+ assertEquals("memberOne", distributedSystemProperties.getProperty(NAME));
launcher = createAbstractLauncher(null, "22");
@@ -126,7 +126,7 @@ public class AbstractLauncherTest {
distributedSystemProperties = launcher.getDistributedSystemProperties();
assertNotNull(distributedSystemProperties);
- assertFalse(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME));
+ assertFalse(distributedSystemProperties.containsKey(NAME));
launcher = createAbstractLauncher(StringUtils.EMPTY_STRING, "333");
@@ -137,7 +137,7 @@ public class AbstractLauncherTest {
distributedSystemProperties = launcher.getDistributedSystemProperties();
assertNotNull(distributedSystemProperties);
- assertFalse(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME));
+ assertFalse(distributedSystemProperties.containsKey(NAME));
launcher = createAbstractLauncher(" ", "4444");
@@ -148,7 +148,7 @@ public class AbstractLauncherTest {
distributedSystemProperties = launcher.getDistributedSystemProperties();
assertNotNull(distributedSystemProperties);
- assertFalse(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME));
+ assertFalse(distributedSystemProperties.containsKey(NAME));
}
@Test
@@ -166,7 +166,7 @@ public class AbstractLauncherTest {
Properties distributedSystemProperties = launcher.getDistributedSystemProperties(defaults);
assertNotNull(distributedSystemProperties);
- assertEquals(launcher.getMemberName(), distributedSystemProperties.getProperty(SystemConfigurationProperties.NAME));
+ assertEquals(launcher.getMemberName(), distributedSystemProperties.getProperty(NAME));
assertEquals("testValue", distributedSystemProperties.getProperty("testKey"));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 8dc0d03..3f13597 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -64,7 +64,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
config.setProperty(LOCATORS, "");
config.setProperty(ROLES, "");
config.setProperty(GROUPS, "");
- config.setProperty(SystemConfigurationProperties.NAME, "");
+ config.setProperty(NAME, "");
InternalDistributedSystem system = getSystem(config);
try {
@@ -93,7 +93,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
- config.setProperty(SystemConfigurationProperties.NAME, "nondefault");
+ config.setProperty(NAME, "nondefault");
InternalDistributedSystem system = getSystem(config);
try {
@@ -154,21 +154,21 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(SystemConfigurationProperties.NAME, "name0");
+ config.setProperty(NAME, "name0");
getSystem(config);
}
});
Host.getHost(0).getVM(1).invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(SystemConfigurationProperties.NAME, "name1");
+ config.setProperty(NAME, "name1");
getSystem(config);
}
});
Host.getHost(0).getVM(2).invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(SystemConfigurationProperties.NAME, "name0");
+ config.setProperty(NAME, "name0");
try {
getSystem(config);
fail("expected IncompatibleSystemException");
@@ -363,7 +363,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
- config.setProperty(SystemConfigurationProperties.NAME, "foobar");
+ config.setProperty(NAME, "foobar");
InternalDistributedSystem system = getSystem(config);
try {
@@ -421,7 +421,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
@Override
public Object call() throws Exception {
Properties config = new Properties();
- config.setProperty(SystemConfigurationProperties.NAME, name);
+ config.setProperty(NAME, name);
DistributedSystem ds = getSystem(config);
return ds.getDistributedMember();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
index ba7e8c6..63e7b99 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
@@ -116,7 +116,7 @@ public class LocatorLauncherIntegrationTest {
public void testBuildWithMemberNameSetInGemFirePropertiesOnStart() throws Exception {
// given: gemfire.properties with a name
Properties gemfireProperties = new Properties();
- gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "locator123");
+ gemfireProperties.setProperty(NAME, "locator123");
useGemFirePropertiesFileInTemporaryFolder(DistributionConfig.GEMFIRE_PREFIX + "properties", gemfireProperties);
// when: starting with null MemberName
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index 4285ed9..8500399 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -71,7 +71,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setMemberName(getUniqueName())
.setPort(this.locatorPort)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(DISABLE_AUTO_RECONNECT, "true")
.set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0")
@@ -90,7 +90,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
assertEquals("true", distributedSystem.getProperties().getProperty(DISABLE_AUTO_RECONNECT));
assertEquals("0", distributedSystem.getProperties().getProperty(MCAST_PORT));
assertEquals("config", distributedSystem.getProperties().getProperty(LOG_LEVEL));
- assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(SystemConfigurationProperties.NAME));
+ assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(NAME));
} catch (Throwable e) {
this.errorCollector.addError(e);
}
@@ -116,7 +116,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config")
.build();
@@ -168,7 +168,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
@@ -221,7 +221,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
@@ -339,7 +339,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config")
.build();
@@ -498,7 +498,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(freeTCPPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config")
.build();
@@ -550,7 +550,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config")
.build();
@@ -612,7 +612,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
@@ -675,7 +675,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
@@ -738,7 +738,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
@@ -790,7 +790,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setPort(this.locatorPort)
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
- .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
+ .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
index 29d9b4c..e635af6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
@@ -314,18 +314,18 @@ public class LocatorLauncherTest {
LocatorLauncher launcher = new Builder()
.setCommand(LocatorLauncher.Command.START)
.setMemberName(null)
- .set(SystemConfigurationProperties.NAME, "locatorABC")
+ .set(NAME, "locatorABC")
.build();
assertNotNull(launcher);
assertEquals(LocatorLauncher.Command.START, launcher.getCommand());
assertNull(launcher.getMemberName());
- assertEquals("locatorABC", launcher.getProperties().getProperty(SystemConfigurationProperties.NAME));
+ assertEquals("locatorABC", launcher.getProperties().getProperty(NAME));
}
@Test
public void testBuildWithMemberNameSetInSystemPropertiesOnStart() {
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME, "locatorXYZ");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "locatorXYZ");
LocatorLauncher launcher = new Builder()
.setCommand(LocatorLauncher.Command.START)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
index 49c6446..f781374 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
@@ -183,7 +183,7 @@ public class ServerLauncherIntegrationTest {
public void testBuildWithMemberNameSetInGemFirePropertiesOnStart() throws Exception {
// given: gemfire.properties with a name
Properties gemfireProperties = new Properties();
- gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "server123");
+ gemfireProperties.setProperty(NAME, "server123");
useGemFirePropertiesFileInTemporaryFolder(DistributionConfig.GEMFIRE_PREFIX + "properties", gemfireProperties);
// when: starting with null MemberName
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
index d039aef..e15da94 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
@@ -113,7 +113,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
assertEquals("true", distributedSystem.getProperties().getProperty(DISABLE_AUTO_RECONNECT));
assertEquals("config", distributedSystem.getProperties().getProperty(LOG_LEVEL));
assertEquals("0", distributedSystem.getProperties().getProperty(MCAST_PORT));
- assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(SystemConfigurationProperties.NAME));
+ assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(NAME));
} catch (Throwable e) {
this.errorCollector.addError(e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
index 864d8f9..7d694cd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
@@ -500,18 +500,18 @@ public class ServerLauncherTest {
ServerLauncher launcher = new Builder()
.setCommand(ServerLauncher.Command.START)
.setMemberName(null)
- .set(SystemConfigurationProperties.NAME, "serverABC")
+ .set(NAME, "serverABC")
.build();
assertNotNull(launcher);
assertEquals(ServerLauncher.Command.START, launcher.getCommand());
assertNull(launcher.getMemberName());
- assertEquals("serverABC", launcher.getProperties().getProperty(SystemConfigurationProperties.NAME));
+ assertEquals("serverABC", launcher.getProperties().getProperty(NAME));
}
@Test
public void testBuildWithMemberNameSetInSystemPropertiesOnStart() {
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME, "serverXYZ");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "serverXYZ");
ServerLauncher launcher = new Builder()
.setCommand(ServerLauncher.Command.START)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
index c78c077..b6eb757 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
@@ -254,7 +254,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
props.setProperty(MCAST_PORT, "0");
props.setProperty(ACK_WAIT_THRESHOLD, "3");
props.setProperty(ACK_SEVERE_ALERT_THRESHOLD, "3");
- props.setProperty(SystemConfigurationProperties.NAME, "putter");
+ props.setProperty(NAME, "putter");
getSystem(props);
Region rgn = (new RegionFactory())
@@ -265,7 +265,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
vm1.invoke(new SerializableRunnable("Connect to distributed system") {
public void run() {
- props.setProperty(SystemConfigurationProperties.NAME, "sleeper");
+ props.setProperty(NAME, "sleeper");
getSystem(props);
IgnoredException.addIgnoredException("elapsed while waiting for replies");
RegionFactory rf = new RegionFactory();
@@ -396,7 +396,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
props.setProperty(MCAST_PORT, "0"); // loner
props.setProperty(ACK_WAIT_THRESHOLD, "5");
props.setProperty(ACK_SEVERE_ALERT_THRESHOLD, "5");
- props.setProperty(SystemConfigurationProperties.NAME, "putter");
+ props.setProperty(NAME, "putter");
getSystem(props);
Region rgn = (new RegionFactory())
@@ -407,7 +407,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
vm1.invoke(new SerializableRunnable("Connect to distributed system") {
public void run() {
- props.setProperty(SystemConfigurationProperties.NAME, "sleeper");
+ props.setProperty(NAME, "sleeper");
getSystem(props);
LogWriter log = basicGetSystem().getLogWriter();
log.info("<ExpectedException action=add>service failure</ExpectedException>");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index e9f2fb6..442c3d7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -155,7 +155,7 @@ public class InternalDistributedSystemJUnitTest
String name = "testGetName";
Properties props = new Properties();
- props.put(SystemConfigurationProperties.NAME, name);
+ props.put(NAME, name);
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
@@ -617,7 +617,7 @@ public class InternalDistributedSystemJUnitTest
// a loner is all this test needs
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(SystemConfigurationProperties.NAME, name);
+ props.setProperty(NAME, name);
createSystem(props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
index 57bde39..6defbba 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -69,7 +69,7 @@ public class DiskRegCacheXmlJUnitTest
dirs[2] = file3;
// Connect to the GemFire distributed system
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "test");
+ props.setProperty(NAME, "test");
String path = TestUtil.getResourcePath(getClass(), "DiskRegCacheXmlJUnitTest.xml");
props.setProperty(MCAST_PORT, "0");
props.setProperty(CACHE_XML_FILE, path);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
index c7f1d18..fc15247 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
@@ -197,7 +197,7 @@ public class DiskRegCachexmlGeneratorJUnitTest extends DiskRegionTestingBase
ds.disconnect();
// Connect to the GemFire distributed system
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, "DiskRegCachexmlGeneratorJUnitTest");
+ props.setProperty(NAME, "DiskRegCachexmlGeneratorJUnitTest");
props.setProperty(MCAST_PORT, "0");
String path = "DiskRegCachexmlGeneratorJUnitTest.xml";
props.setProperty(CACHE_XML_FILE, path);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/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 43775c8..47828e8 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
@@ -888,7 +888,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTest
public static void createCacheInVm_41367() {
Properties props = new Properties();
- props.put(SystemConfigurationProperties.NAME, "SecurityServer");
+ props.put(NAME, "SecurityServer");
props.put(SECURITY_CLIENT_AUTHENTICATOR, DummyAuthenticator.class.getName() + ".create");
new DistributedRegionFunctionExecutionDUnitTest("temp").createCache(props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
index f33bd3b..0111d6d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
@@ -54,7 +54,7 @@ public class HeadlessGfshIntegrationTest {
int port = getRandomAvailablePort(SOCKET);
Properties properties = new Properties();
- properties.put(SystemConfigurationProperties.NAME, this.testName.getMethodName());
+ properties.put(NAME, this.testName.getMethodName());
properties.put(JMX_MANAGER, "true");
properties.put(JMX_MANAGER_START, "true");
properties.put(JMX_MANAGER_PORT, String.valueOf(port));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index e82768f..f9cfd0c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -134,8 +134,8 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
jmxHost = "localhost";
}
- if (!localProps.containsKey(SystemConfigurationProperties.NAME)) {
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ if (!localProps.containsKey(NAME)) {
+ localProps.setProperty(NAME, "Manager");
}
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 8a2aab7..47183af 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -160,7 +160,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testExportConfig() throws Exception {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
@@ -168,7 +168,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
Host.getHost(0).getVM(1).invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "VM1");
+ localProps.setProperty(NAME, "VM1");
localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
@@ -179,7 +179,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
Host.getHost(0).getVM(2).invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "VM2");
+ localProps.setProperty(NAME, "VM2");
localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
@@ -188,7 +188,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
// Create a cache in the local VM
localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Shell");
+ localProps.setProperty(NAME, "Shell");
getSystem(localProps);
Cache cache = getCache();
@@ -260,7 +260,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
setUpJmxManagerOnVm0ThenConnect(null);
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, controller);
+ localProps.setProperty(NAME, controller);
localProps.setProperty(LOG_LEVEL, "error");
getSystem(localProps);
@@ -305,7 +305,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
setUpJmxManagerOnVm0ThenConnect(null);
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, controller);
+ localProps.setProperty(NAME, controller);
localProps.setProperty(LOG_LEVEL, "error");
getSystem(localProps);
@@ -315,7 +315,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
Host.getHost(0).getVM(1).invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, member1);
+ localProps.setProperty(NAME, member1);
getSystem(localProps);
Cache cache = getCache();
}
@@ -353,7 +353,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
setUpJmxManagerOnVm0ThenConnect(null);
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, controller);
+ localProps.setProperty(NAME, controller);
localProps.setProperty(LOG_LEVEL, "error");
getSystem(localProps);
@@ -363,7 +363,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
Host.getHost(0).getVM(1).invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, member1);
+ localProps.setProperty(NAME, member1);
getSystem(localProps);
Cache cache = getCache();
}
@@ -430,7 +430,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
final File locatorLogFile = new File(locatorDirectory, "locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+ locatorProps.setProperty(NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
locatorProps.setProperty(CLUSTER_CONFIGURATION_DIR, locatorDirectory);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index d3f8b11..f6013ec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -401,7 +401,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
this.alterVm1Name = "VM" + this.alterVm1.getPid();
this.alterVm1.invoke(() -> {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, alterVm1Name);
+ localProps.setProperty(NAME, alterVm1Name);
localProps.setProperty(GROUPS, "Group1");
getSystem(localProps);
Cache cache = getCache();
@@ -434,7 +434,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
this.alterVm2Name = "VM" + this.alterVm2.getPid();
this.alterVm2.invoke(() -> {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, alterVm2Name);
+ localProps.setProperty(NAME, alterVm2Name);
localProps.setProperty(GROUPS, "Group1,Group2");
getSystem(localProps);
Cache cache = getCache();
@@ -770,7 +770,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
Host.getHost(0).getVM(3).invoke(() -> {
final File locatorLogFile = new File("locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+ locatorProps.setProperty(NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "fine");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
@@ -904,7 +904,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
Host.getHost(0).getVM(3).invoke(() -> {
final File locatorLogFile = new File("locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+ locatorProps.setProperty(NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "fine");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 3d77dad..f40675c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -98,7 +98,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
final String vmName = "VM" + vm.getPid();
// Create the cache in this VM
- props.setProperty(SystemConfigurationProperties.NAME, "Controller");
+ props.setProperty(NAME, "Controller");
props.setProperty(GROUPS, "Group1");
getSystem(props);
getCache();
@@ -106,7 +106,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
// Create the cache in the other VM
vm.invoke(new SerializableRunnable() {
public void run() {
- props.setProperty(SystemConfigurationProperties.NAME, vmName);
+ props.setProperty(NAME, vmName);
props.setProperty(GROUPS, "Group2");
getSystem(props);
getCache();
@@ -184,7 +184,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
final String vmName = "VM" + vm.getPid();
// Create the cache in this VM
- props.setProperty(SystemConfigurationProperties.NAME, "Controller");
+ props.setProperty(NAME, "Controller");
props.setProperty(GROUPS, "Group1");
getSystem(props);
getCache();
@@ -192,7 +192,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
// Create the cache in the other VM
vm.invoke(new SerializableRunnable() {
public void run() {
- props.setProperty(SystemConfigurationProperties.NAME, vmName);
+ props.setProperty(NAME, vmName);
props.setProperty(GROUPS, "Group2");
getSystem(props);
getCache();
@@ -261,7 +261,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
final String vmName = "VM" + vm.getPid();
// Create the cache in this VM
- props.setProperty(SystemConfigurationProperties.NAME, "Controller");
+ props.setProperty(NAME, "Controller");
props.setProperty(GROUPS, "Group1");
getSystem(props);
getCache();
@@ -269,7 +269,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
// Create the cache in the other VM
vm.invoke(new SerializableRunnable() {
public void run() {
- props.setProperty(SystemConfigurationProperties.NAME, vmName);
+ props.setProperty(NAME, vmName);
props.setProperty(GROUPS, "Group2");
getSystem(props);
getCache();
@@ -337,7 +337,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
final File locatorLogFile = new File(locatorLogPath);
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+ locatorProps.setProperty(NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
locatorProps.setProperty(LOG_LEVEL, "fine");
locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 02c4ba3..09f51d0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -83,7 +83,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
vm1.invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
getSystem(localProps);
Cache cache = getCache();
}
@@ -747,7 +747,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
filesToBeDeleted.add(fullBackupDirPath);
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, controllerName);
+ props.setProperty(NAME, controllerName);
getSystem(props);
@@ -762,7 +762,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
vm1.invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
getSystem(localProps);
Cache cache = getCache();
@@ -840,7 +840,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
diskStore1Dir2.mkdirs();
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
localProps.setProperty(GROUPS, "Group1");
getSystem(localProps);
getCache();
@@ -856,7 +856,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
diskStore2Dir.mkdirs();
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
+ localProps.setProperty(NAME, vm2Name);
localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
@@ -959,7 +959,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
diskStore2Dir1.mkdirs();
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
localProps.setProperty(GROUPS, "Group1,Group2");
getSystem(localProps);
Cache cache = getCache();
@@ -985,7 +985,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
diskStore2Dir2.mkdirs();
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
+ localProps.setProperty(NAME, vm2Name);
localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
Cache cache = getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index 4fa3ddb..09cd629 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -302,7 +302,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testExecuteFunctionOnMembers() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
@@ -336,7 +336,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testExecuteFunctionOnMembersWithArgs() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS);
@@ -372,7 +372,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testExecuteFunctionOnMembersWithArgsAndCustomResultCollector() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS);
@@ -409,7 +409,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testExecuteFunctionOnGroups() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group0");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
@@ -488,7 +488,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testDestroyOnGroups() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
+ localProps.setProperty(NAME, "Manager");
localProps.setProperty(GROUPS, "Group0");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
@@ -578,7 +578,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
vm1.invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
+ localProps.setProperty(NAME, vm1Name);
localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
@@ -597,7 +597,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
vm2.invoke(new SerializableRunnable() {
public void run() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
+ localProps.setProperty(NAME, vm2Name);
localProps.setProperty(GROUPS, "Group3");
getSystem(localProps);
getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 28424a5..59eab66 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -104,7 +104,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
final VM vm1 = Host.getHost(0).getVM(1);
final VM vm2 = Host.getHost(0).getVM(2);
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, testName + "Manager");
+ props.setProperty(NAME, testName + "Manager");
HeadlessGfsh gfsh = setUpJmxManagerOnVm0ThenConnect(props);
assertNotNull(gfsh);
assertEquals(true, gfsh.isConnectedAndReady());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index f284f02..79e8b23 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -42,7 +42,7 @@ import java.util.Map;
import java.util.Properties;
import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_LEVEL;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.NAME;
+import static com.gemstone.gemfire.distributed.NAME;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
@@ -265,7 +265,7 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C
}
public String getName() {
- return getConfiguration().getProperty(SystemConfigurationProperties.NAME);
+ return getConfiguration().getProperty(NAME);
}
public VM getVm() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index b4a1f5f..fc7aaab 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -765,7 +765,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, VM1Name);
+ props.setProperty(NAME, VM1Name);
props.setProperty(GROUPS, group1);
getSystem(props);
Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class);
@@ -799,7 +799,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, VM1Name);
+ props.setProperty(NAME, VM1Name);
props.setProperty(GROUPS, group1);
getSystem(props);
Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index 469ff7b..d6ae20f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -123,7 +123,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas
final Properties distributedSystemProperties = new Properties();
distributedSystemProperties.setProperty(SystemConfigurationProperties.LOG_LEVEL, getDUnitLogLevel());
- distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName);
+ distributedSystemProperties.setProperty(NAME, gemfireName);
return distributedSystemProperties;
}
@@ -170,7 +170,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas
}
public String getName() {
- return getDistributedSystemConfiguration().getProperty(SystemConfigurationProperties.NAME);
+ return getDistributedSystemConfiguration().getProperty(NAME);
}
public VM getVm() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index 3123399..2352113 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -67,7 +67,7 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
props.setProperty(LOG_LEVEL, "info");
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
- props.setProperty(SystemConfigurationProperties.NAME, name);
+ props.setProperty(NAME, name);
props.setProperty(GROUPS, groups);
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 931cdbe..26b858e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -128,7 +128,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
final Properties distributedSystemProperties = new Properties();
distributedSystemProperties.setProperty(LOG_LEVEL, getDUnitLogLevel());
- distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName);
+ distributedSystemProperties.setProperty(NAME, gemfireName);
return distributedSystemProperties;
}
@@ -318,7 +318,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
}
public String getName() {
- return getConfiguration().getProperty(SystemConfigurationProperties.NAME);
+ return getConfiguration().getProperty(NAME);
}
public VM getVm() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index 1377551..7703a7b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -80,7 +80,7 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
props.setProperty(LOG_LEVEL, "info");
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
- props.setProperty(SystemConfigurationProperties.NAME, name);
+ props.setProperty(NAME, name);
props.setProperty(GROUPS, groups);
return props;
}
[45/55] [abbrv] incubator-geode git commit: GEODE-11: Added support
for lucene index profile exchange
Posted by hi...@apache.org.
GEODE-11: Added support for lucene index profile exchange
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c742c4e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c742c4e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c742c4e5
Branch: refs/heads/feature/GEODE-1372
Commit: c742c4e54c0b3ab16ce7845e2534e746cefbbce1
Parents: 8e21638
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Thu Jun 2 13:38:23 2016 -0700
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Mon Jun 6 09:56:48 2016 -0700
----------------------------------------------------------------------
.../internal/DataSerializableFixedID.java | 2 +-
.../cache/CacheDistributionAdvisor.java | 22 +-
.../internal/cache/CacheServiceProfile.java | 40 +++
.../internal/cache/CreateRegionProcessor.java | 23 +-
.../internal/cache/GemFireCacheImpl.java | 2 +-
.../internal/cache/InternalRegionArguments.java | 16 ++
.../gemfire/internal/cache/LocalRegion.java | 11 +-
.../internal/cache/PartitionedRegion.java | 8 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 10 +-
.../sanctionedDataSerializables.txt | 150 +++++-----
.../internal/LuceneIndexCreationProfile.java | 189 +++++++++++++
.../lucene/internal/LuceneServiceImpl.java | 15 +-
.../internal/xml/LuceneIndexCreation.java | 9 +-
.../gemfire/cache/lucene/LuceneDUnitTest.java | 38 +++
.../lucene/LuceneIndexCreationDUnitTest.java | 281 +++++++++++++++++++
.../gemfire/cache/lucene/LuceneQueriesBase.java | 18 +-
.../LuceneIndexCreationProfileJUnitTest.java | 144 ++++++++++
.../cache/lucene/test/LuceneTestUtilities.java | 11 +
...ifferentFieldAnalyzerSizesFails1.1.cache.xml | 37 +++
...ifferentFieldAnalyzerSizesFails1.2.cache.xml | 36 +++
...ifferentFieldAnalyzerSizesFails2.1.cache.xml | 36 +++
...ifferentFieldAnalyzerSizesFails2.2.cache.xml | 37 +++
...ifyDifferentFieldAnalyzersFails1.1.cache.xml | 36 +++
...ifyDifferentFieldAnalyzersFails1.2.cache.xml | 36 +++
...ifyDifferentFieldAnalyzersFails2.1.cache.xml | 37 +++
...ifyDifferentFieldAnalyzersFails2.2.cache.xml | 37 +++
...ifyDifferentFieldAnalyzersFails3.1.cache.xml | 37 +++
...ifyDifferentFieldAnalyzersFails3.2.cache.xml | 37 +++
...tTest.verifyDifferentFieldsFails.1.cache.xml | 36 +++
...tTest.verifyDifferentFieldsFails.2.cache.xml | 37 +++
...t.verifyDifferentIndexNamesFails.1.cache.xml | 36 +++
...t.verifyDifferentIndexNamesFails.2.cache.xml | 36 +++
...est.verifyDifferentIndexesFails1.1.cache.xml | 36 +++
...est.verifyDifferentIndexesFails1.2.cache.xml | 32 +++
...est.verifyDifferentIndexesFails2.1.cache.xml | 36 +++
...est.verifyDifferentIndexesFails2.2.cache.xml | 39 +++
36 files changed, 1531 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
index beaadb1..0788503 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
@@ -848,7 +848,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final short LUCENE_ENTRY_SCORE = 2174;
public static final short LUCENE_TOP_ENTRIES = 2175;
public static final short LUCENE_TOP_ENTRIES_COLLECTOR = 2176;
-
+
// NOTE, codes > 65535 will take 4 bytes to serialize
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
index 2e60c55..c4a8e27 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
@@ -99,6 +99,8 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
private static final int ASYNC_EVENT_QUEUE_IDS_MASK = 0x400000;
private static final int IS_OFF_HEAP_MASK = 0x800000;
+ private static final int CACHE_SERVICE_PROFILES_MASK = 0x1000000;
+
// moved initializ* to DistributionAdvisor
@@ -567,6 +569,8 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
*/
public boolean hasCacheServer = false;
+ public List<CacheServiceProfile> cacheServiceProfiles = new ArrayList<>();
+
/** for internal use, required for DataSerializer.readObject */
public CacheProfile() {
}
@@ -619,6 +623,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
if (!this.gatewaySenderIds.isEmpty()) s |= GATEWAY_SENDER_IDS_MASK;
if (!this.asyncEventQueueIds.isEmpty()) s |= ASYNC_EVENT_QUEUE_IDS_MASK;
if (this.isOffHeap) s |= IS_OFF_HEAP_MASK;
+ if (!this.cacheServiceProfiles.isEmpty()) s |= CACHE_SERVICE_PROFILES_MASK;
Assert.assertTrue(!this.scope.isLocal());
return s;
}
@@ -724,6 +729,14 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
return this.subscriptionAttributes.getInterestPolicy().isAll();
}
+ public void addCacheServiceProfile(CacheServiceProfile profile) {
+ this.cacheServiceProfiles.add(profile);
+ }
+
+ private boolean hasCacheServiceProfiles(int bits) {
+ return (bits & CACHE_SERVICE_PROFILES_MASK) != 0;
+ }
+
/**
* Used to process an incoming cache profile.
*/
@@ -829,9 +842,12 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
writeSet(asyncEventQueueIds, out);
}
DataSerializer.writeObject(this.filterProfile, out);
+ if (!cacheServiceProfiles.isEmpty()) {
+ DataSerializer.writeObject(cacheServiceProfiles, out);
+ }
}
- private void writeSet(Set<String> set, DataOutput out) throws IOException {
+ private void writeSet(Set<?> set, DataOutput out) throws IOException {
// to fix bug 47205 always serialize the Set as a HashSet.
out.writeByte(DSCODE.HASH_SET);
InternalDataSerializer.writeSet(set, out);
@@ -853,6 +869,9 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
asyncEventQueueIds = DataSerializer.readObject(in);
}
this.filterProfile = DataSerializer.readObject(in);
+ if (hasCacheServiceProfiles(bits)) {
+ cacheServiceProfiles = DataSerializer.readObject(in);
+ }
}
@Override
@@ -885,6 +904,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
sb.append("; gatewaySenderIds =" + this.gatewaySenderIds);
sb.append("; asyncEventQueueIds =" + this.asyncEventQueueIds);
sb.append("; IsOffHeap=" + this.isOffHeap);
+ sb.append("; cacheServiceProfiles=" + this.cacheServiceProfiles);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java
new file mode 100644
index 0000000..d25e92a
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.cache.Region;
+
+/**
+ * CacheServiceProfiles track additions to a {@link Region} made by a {@link CacheService}.
+ * They are added to the {@link CacheDistributionAdvisor.CacheProfile} during {@link Region}
+ * creation and are exchanged by the {@link CreateRegionProcessor}.
+ */
+public interface CacheServiceProfile {
+
+ /**
+ * Return the id of this profile
+ * @return the id of this profile
+ */
+ String getId();
+
+ /**
+ * @param regionPath The path of the region to which this profile is associated
+ * @param profile The CacheServiceProfile to check compatibility against
+ * @return A string message of incompatibility or null if the profiles are compatible
+ */
+ String checkCompatibility(String regionPath, CacheServiceProfile profile);
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
index d063a54..bc44c1c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
@@ -572,8 +572,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
if (!rgn.getFullPath().contains(
DynamicRegionFactoryImpl.dynamicRegionListName)) {
result = LocalizedStrings.CreateRegionProcessor_CANNOT_CREATE_REGION_0_WITH_1_GATEWAY_SENDER_IDS_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_REGION_WITH_2_GATEWAY_SENDER_IDS
- .toLocalizedString(new Object[] { this.regionPath,
- otherGatewaySenderIds, myGatewaySenderIds });
+ .toLocalizedString(this.regionPath, myGatewaySenderIds, otherGatewaySenderIds);
}
}
@@ -582,8 +581,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
if (!isLocalOrRemoteAccessor(rgn, profile) && !otherAsynEventQueueIds
.equals(myAsyncEventQueueIds)) {
result = LocalizedStrings.CreateRegionProcessor_CANNOT_CREATE_REGION_0_WITH_1_ASYNC_EVENT_IDS_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_REGION_WITH_2_ASYNC_EVENT_IDS
- .toLocalizedString(new Object[] { this.regionPath,
- otherAsynEventQueueIds, myAsyncEventQueueIds });
+ .toLocalizedString(this.regionPath, myAsyncEventQueueIds, otherAsynEventQueueIds);
}
final PartitionAttributes pa = rgn.getAttributes()
@@ -611,7 +609,22 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
result = LocalizedStrings.CreateRegionProcessor_CANNOT_CREATE_REGION_0_WITH_OFF_HEAP_EQUALS_1_BECAUSE_ANOTHER_CACHE_2_HAS_SAME_THE_REGION_WITH_OFF_HEAP_EQUALS_3
.toLocalizedString(new Object[] { this.regionPath, profile.isOffHeap, myId, otherIsOffHeap });
}
-
+
+ String cspResult = null;
+ // TODO Compares set sizes and equivalent entries.
+ if (profile.cacheServiceProfiles != null) {
+ for (CacheServiceProfile remoteProfile : profile.cacheServiceProfiles) {
+ CacheServiceProfile localProfile = ((LocalRegion) rgn).getCacheServiceProfile(remoteProfile.getId());
+ cspResult = remoteProfile.checkCompatibility(rgn.getFullPath(), localProfile);
+ if (cspResult != null) {
+ break;
+ }
+ }
+ // Don't overwrite result with null in case it has already been set in a previous compatibility check.
+ if (cspResult != null) {
+ result = cspResult;
+ }
+ }
if (logger.isDebugEnabled()) {
logger.debug("CreateRegionProcessor.checkCompatibility: this={}; other={}; result={}", rgn, profile, result);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index b08c480..5355a2b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -1066,7 +1066,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
this.services.put(service.getInterface(), service);
}
}
-
+
private boolean isNotJmxManager(){
return (this.system.getConfig().getJmxManagerStart() != true);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
index 7974418..3a254d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
@@ -17,7 +17,10 @@
package com.gemstone.gemfire.internal.cache;
import java.io.InputStream;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
@@ -66,6 +69,7 @@ public final class InternalRegionArguments
private List indexes;
private boolean declarativeIndexCreation;
+ private Map<String,CacheServiceProfile> cacheServiceProfiles;
/* methods that set and retrieve internal state used to configure a Region */
@@ -317,4 +321,16 @@ public final class InternalRegionArguments
public boolean getDeclarativeIndexCreation() {
return this.declarativeIndexCreation;
}
+
+ public InternalRegionArguments addCacheServiceProfile(CacheServiceProfile profile) {
+ if(this.cacheServiceProfiles == null) {
+ this.cacheServiceProfiles = new HashMap<>();
+ }
+ this.cacheServiceProfiles.put(profile.getId(), profile);
+ return this;
+ }
+
+ public Map<String,CacheServiceProfile> getCacheServiceProfiles() {
+ return this.cacheServiceProfiles;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 31a0aae..6b664fe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -452,6 +452,8 @@ public class LocalRegion extends AbstractRegion
return this.stopper;
}
+ protected Map<String,CacheServiceProfile> cacheServiceProfiles;
+
////////////////// Public Methods ///////////////////////////////////////////
static String calcFullPath(String regionName, LocalRegion parentRegion) {
@@ -550,7 +552,10 @@ public class LocalRegion extends AbstractRegion
this.isUsedForSerialGatewaySenderQueue = internalRegionArgs.isUsedForSerialGatewaySenderQueue();
this.isUsedForParallelGatewaySenderQueue = internalRegionArgs.isUsedForParallelGatewaySenderQueue();
this.serialGatewaySender = internalRegionArgs.getSerialGatewaySender();
-
+ this.cacheServiceProfiles = internalRegionArgs.getCacheServiceProfiles() == null
+ ? null
+ : Collections.unmodifiableMap(internalRegionArgs.getCacheServiceProfiles());
+
if (!isUsedForMetaRegion && !isUsedForPartitionedRegionAdmin
&& !isUsedForPartitionedRegionBucket
&& !isUsedForSerialGatewaySenderQueue
@@ -10989,6 +10994,10 @@ public class LocalRegion extends AbstractRegion
|| isUsedForPartitionedRegionBucket();
}
+ public CacheServiceProfile getCacheServiceProfile(String id) {
+ return this.cacheServiceProfiles.get(id);
+ }
+
public LoaderHelper createLoaderHelper(Object key, Object callbackArgument,
boolean netSearchAllowed, boolean netLoadAllowed,
SearchLoadAndWriteProcessor searcher)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
index 667c765..9375d04 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
@@ -5181,7 +5181,13 @@ public class PartitionedRegion extends LocalRegion implements
}
fillInProfile((PartitionProfile) profile);
-
+
+ if (cacheServiceProfiles != null) {
+ for (CacheServiceProfile csp : cacheServiceProfiles.values()) {
+ profile.addCacheServiceProfile(csp);
+ }
+ }
+
profile.isOffHeap = getOffHeap();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index 954d2c8..13eca56 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -3761,7 +3761,15 @@ public class LocalizedStrings {
public static final StringId SwaggerConfig_DOC_TITLE = new StringId(6621, "Apache Geode Documentation");
public static final StringId SwaggerConfig_DOC_LINK = new StringId(6622, "http://geode.incubator.apache.org/docs/");
- public static final StringId LuceneXmlParser_CLASS_0_IS_NOT_AN_INSTANCE_OF_ANALYZER = new StringId(6623, "Class \"{0}\" is not an instance of Analyzer.");
+ public static final StringId LuceneXmlParser_CLASS_0_IS_NOT_AN_INSTANCE_OF_ANALYZER = new StringId(6623, "Class {0} is not an instance of Analyzer.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELDS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELDS_3 = new StringId(6624, "Cannot create Lucene index {0} on region {1} with fields {2} because another member defines the same index with fields {3}.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3 = new StringId(6625, "Cannot create Lucene index {0} on region {1} with analyzer {2} because another member defines the same index with analyzer {3}.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_FIELD_ANALYZERS = new StringId(6626, "Cannot create Lucene index {0} on region {1} with field analyzers {2} because another member defines the same index with no field analyzers.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_FIELD_ANALYZERS_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_2 = new StringId(6627, "Cannot create Lucene index {0} on region {1} with no field analyzers because another member defines the same index with field analyzers {2}.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_3 = new StringId(6628, "Cannot create Lucene index {0} on region {1} with field analyzers {2} because another member defines the same index with field analyzers {3}.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_ANALYZER_ON_FIELD_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3_ON_THAT_FIELD = new StringId(6629, "Cannot create Lucene index {0} on region {1} with no analyzer on field {2} because another member defines the same index with analyzer {3} on that field.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_ANALYZER_ON_THAT_FIELD = new StringId(6630, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with no analyzer on that field.");
+ public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_4_ON_THAT_FIELD = new StringId(6631, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with analyzer {4} on that field.");
/** Testing strings, messageId 90000-99999 **/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index d2204a0..cd659e6 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -285,12 +285,12 @@ fromData,16,2a2bb700172a2bb900180100b50008b1
toData,16,2a2bb700192b2ab40008b9001a0200b1
com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember,6
-fromData,33,2a2bb6009a2ab4001ab20090b60070a100112ab400282bb900910200a700044db1
-fromDataPre_GFE_7_1_0_0,292,2bb8009b4d2bb9009c01003e2a2bb80088b500062ab2000399000e2c2ab40006b8009da700072cb60007b500062bb9009e010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b500392a2bb9009c0100b500102a2bb9009c0100b500022a2bb9009e0100b500122a2bb8008ab5001f2a2bb80088b500172ab40012100da0000e2a2bb80088b50018a700172bb800883a071907c6000c2a1907b8009fb500132bb800883a072bb8008bb6008c36082abb008d5919071508b7008eb5001dbb0033592ab400102ab400022ab400122ab400132ab400172ab4001f2ab4001db700343a092a2c1d150515062bb800a0b600701909b80027b500282ab7000b2ab400129e000704a7000403b80042b1
-fromDataPre_GFE_9_0_0_0,296,2bb8009b4d2bb9009c01003e2a2bb80088b500062ab2000399000e2c2ab40006b8009da700072cb60007b500062bb9009e010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b500392a2bb9009c0100b500102a2bb9009c0100b500022a2bb9009e0100b500122a2bb8008ab5001f2a2bb80088b500172ab40012100da0000e2a2bb80088b50018a700172bb800883a071907c6000c2a1907b8009fb500132bb800883a072bb8008bb6008c36082abb008d5919071508b7008eb5001d2a15042bb7008fbb0033592ab400102ab400022ab400122ab400132ab400172ab4001f2ab4001db700343a092a2c1d150515062ab4001a1909b80027b500282ab7000b2ab400129e000704a7000403b80042b1
-toData,29,2a2bb600942ab4001ab20090b60070a1000d2ab600952bb900840200b1
-toDataPre_GFE_7_1_0_0,226,2ab400129e000704a7000403b800422ab6004e2bb800962b2ab6004db9009702002ab400062bb8007b033d2ab40028b9007c01009900071c04803d2ab40028b9006b01009900071c05803d2ab400399900071c07803d2b1c1100ff7e91b9009802002b2ab40010b9009702002b2ab40002b9009702002b2ab40012b9009802002ab4001f2bb8007e2ab400172bb8007b2ab40012100da0000e2ab400182bb8007ba7000e2ab40013b800992bb8007b2ab4001dc700081246a7000a2ab4001db6007f2bb8007b2ab4001dc7000911012ca7000a2ab4001db60080b800812bb80082b1
-toDataPre_GFE_9_0_0_0,240,2ab400129e000704a7000403b800422ab6004e2bb800962b2ab6004db9009702002ab400062bb8007b033d2ab40028b9007c01009900071c04803d2ab40028b9006b01009900071c05803d2ab400399900071c07803d1c1008803d2b1c1100ff7e91b9009802002b2ab40010b9009702002b2ab40002b9009702002b2ab40012b9009802002ab4001f2bb8007e2ab400172bb8007b2ab40012100da0000e2ab400182bb8007ba7000e2ab40013b800992bb8007b2ab4001dc700081246a7000a2ab4001db6007f2bb8007b2ab4001dc7000911012ca7000a2ab4001db60080b800812bb800822b2ab4001a04b80083b1
+fromData,33,2a2bb6009b2ab4001bb20091b60071a100112ab400292bb900920200a700044db1
+fromDataPre_GFE_7_1_0_0,292,2bb8009c4d2bb9009d01003e2a2bb80089b500062ab2000399000e2c2ab40006b8009ea700072cb60007b500062bb9009f010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009d0100b500112a2bb9009d0100b500022a2bb9009f0100b500132a2bb8008bb500202a2bb80089b500182ab40013100da0000e2a2bb80089b50019a700172bb800893a071907c6000c2a1907b800a0b500142bb800893a072bb8008cb6008d36082abb008e5919071508b7008fb5001ebb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062bb800a1b600711909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
+fromDataPre_GFE_9_0_0_0,296,2bb8009c4d2bb9009d01003e2a2bb80089b500062ab2000399000e2c2ab40006b8009ea700072cb60007b500062bb9009f010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009d0100b500112a2bb9009d0100b500022a2bb9009f0100b500132a2bb8008bb500202a2bb80089b500182ab40013100da0000e2a2bb80089b50019a700172bb800893a071907c6000c2a1907b800a0b500142bb800893a072bb8008cb6008d36082abb008e5919071508b7008fb5001e2a15042bb70090bb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062ab4001b1909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
+toData,29,2a2bb600952ab4001bb20091b60071a1000d2ab600962bb900850200b1
+toDataPre_GFE_7_1_0_0,226,2ab400139e000704a7000403b800432ab6004f2bb800972b2ab6004eb9009802002ab400062bb8007c033d2ab40029b9007d01009900071c04803d2ab40029b9006c01009900071c05803d2ab4003a9900071c07803d2b1c1100ff7e91b9009902002b2ab40011b9009802002b2ab40002b9009802002b2ab40013b9009902002ab400202bb8007f2ab400182bb8007c2ab40013100da0000e2ab400192bb8007ca7000e2ab40014b8009a2bb8007c2ab4001ec700081247a7000a2ab4001eb600802bb8007c2ab4001ec7000911012ca7000a2ab4001eb60081b800822bb80083b1
+toDataPre_GFE_9_0_0_0,240,2ab400139e000704a7000403b800432ab6004f2bb800972b2ab6004eb9009802002ab400062bb8007c033d2ab40029b9007d01009900071c04803d2ab40029b9006c01009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009902002b2ab40011b9009802002b2ab40002b9009802002b2ab40013b9009902002ab400202bb8007f2ab400182bb8007c2ab40013100da0000e2ab400192bb8007ca7000e2ab40014b8009a2bb8007c2ab4001ec700081247a7000a2ab4001eb600802bb8007c2ab4001ec7000911012ca7000a2ab4001eb60081b800822bb800832b2ab4001b04b80084b1
com/gemstone/gemfire/distributed/internal/membership/NetView,2
fromData,69,2a2bb8005bc00023b5000e2a2bb9005c0100b500032a2bb8005db500062abb0007592ab40006b70008b500092a2bb8005eb5000b2a2bb8005eb5000d2a2bb8005fb50002b1
@@ -687,8 +687,8 @@ fromData,217,2a2bb900420100b500032a2bb900430100b5000a2a2bb900430100b500102a2bb90
toData,217,2b2ab40003b9003b02002b2ab4000ab9003c02002b2ab40010b9003c02002b2ab40012b9003b02002b2ab40016b9003b02002b2ab4000eb9003b02002b2ab40018b9003b02002b2ab4001ab9003b02002b2ab40014b9003b02002ab400052bb8003d2ab4001c2bb8003e2ab400072bb8003d2ab4001f2bb8003f2ab400212bb800402b2ab4000cb9003b02002b2ab40023b9003c02002b2ab60041b900280100b9003b02002ab60041b9002601002bb8003d2ab60041b9002a01002bb8003d2ab60041b9002a0100c700102ab60041b9002c01002bb8003db1
com/gemstone/gemfire/internal/admin/remote/RemoteCacheInfo,2
-fromData,106,2a2bb8002fb500032a2bb900300100b500052a2bb900310100b500072a2bb900300100b500092a2bb900300100b5000b2a2bb900300100b5000d2a2bb900300100b5000f2a2bb80032b500102a2bb80033c0001fb500112a2bb80034b500122a2bb900310100b50028b1
-toData,103,2ab400032bb800292b2ab40005b9002a02002b2ab40007b9002b02002b2ab40009b9002a02002b2ab4000bb9002a02002b2ab4000db9002a02002b2ab4000fb9002a02002ab400102bb8002c2ab400112bb8002d2ab400122bb8002e2b2ab40028b9002b0200b1
+fromData,106,2a2bb80030b500032a2bb900310100b500052a2bb900320100b500072a2bb900310100b500092a2bb900310100b5000b2a2bb900310100b5000d2a2bb900310100b5000f2a2bb80033b500102a2bb80034c00020b500112a2bb80035b500122a2bb900320100b50029b1
+toData,103,2ab400032bb8002a2b2ab40005b9002b02002b2ab40007b9002c02002b2ab40009b9002b02002b2ab4000bb9002b02002b2ab4000db9002b02002b2ab4000fb9002b02002ab400102bb8002d2ab400112bb8002e2ab400122bb8002f2b2ab40029b9002c0200b1
com/gemstone/gemfire/internal/admin/remote/RemoteCacheStatistics,2
fromData,51,2a2bb900100100b500032a2bb900100100b500052a2bb900100100b500072a2bb900100100b500092a2bb900110100b5000bb1
@@ -747,8 +747,8 @@ fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
com/gemstone/gemfire/internal/admin/remote/RootRegionResponse,2
-fromData,34,2a2bb700222a2bb80023c00018c00018b500192a2bb80023c00018c00018b5001ab1
-toData,22,2a2bb700202ab400192bb800212ab4001a2bb80021b1
+fromData,34,2a2bb700232a2bb80024c00019c00019b5001a2a2bb80024c00019c00019b5001bb1
+toData,22,2a2bb700212ab4001a2bb800222ab4001b2bb80022b1
com/gemstone/gemfire/internal/admin/remote/ShutdownAllGatewayHubsRequest,2
fromData,16,2a2bb700072a2bb900080100b50005b1
@@ -871,8 +871,8 @@ fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb600
toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1
com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor$CacheProfile,2
-fromData,94,2a2bb700662bb9006701003d2a1cb6001c2a1cb700689900162abb006959b7006ab500272ab400272bb8006b2a1cb7006c99000e2a2bb8006dc0006eb5000e2a1cb7006f99000e2a2bb8006dc0006eb5000f2a2bb8006dc00070b50017b1
-toData,81,2a2bb7005e2b2ab6001bb9005f02002ab40027c6000b2ab400272bb800602ab4000eb9002d01009a000c2a2ab4000e2bb700612ab4000fb9002d01009a000c2a2ab4000f2bb700612ab400172bb80062b1
+fromData,113,2a2bb7006c2bb9006d01003d2a1cb6001f2a1cb7006e9900162abb006f59b70070b5002a2ab4002a2bb800712a1cb7007299000e2a2bb80073c00074b5000e2a1cb7007599000e2a2bb80073c00074b5000f2a2bb80073c00076b5001a2a1cb7007799000e2a2bb80073c00078b50019b1
+toData,101,2a2bb700642b2ab6001eb9006502002ab4002ac6000b2ab4002a2bb800662ab4000eb9003001009a000c2a2ab4000e2bb700672ab4000fb9003001009a000c2a2ab4000f2bb700672ab4001a2bb800682ab40019b9003401009a000b2ab400192bb80068b1
com/gemstone/gemfire/internal/cache/CacheServerAdvisor$CacheServerProfile,2
fromData,53,2a2bb700112a2bb80012b500042a2bb900130100b500062abb001459b70015b500052ab400052bb800162a2bb900170100b60018b1
@@ -891,8 +891,8 @@ fromData,6,2a2bb70007b1
toData,6,2a2bb70006b1
com/gemstone/gemfire/internal/cache/CreateRegionProcessor$CreateRegionMessage,2
-fromData,45,2a2bb7008c2a2bb8008db5000a2a2bb8008ec00055b500432a2bb9008f0100b500032a2bb900900100b50064b1
-toData,42,2a2bb700922ab4000a2bb800932ab400432bb800942b2ab40003b9009502002b2ab40064b900960200b1
+fromData,45,2a2bb700942a2bb80095b5000a2a2bb80096c00055b500432a2bb900970100b500032a2bb900980100b50064b1
+toData,42,2a2bb7009a2ab4000a2bb8009b2ab400432bb8009c2b2ab40003b9009d02002b2ab40064b9009e0200b1
com/gemstone/gemfire/internal/cache/CreateRegionProcessor$CreateRegionReplyMessage,2
fromData,161,2a2bb700062bb90007010099000e2a2bb80008c00009b5000a2bb9000b01003d1c9a000b2a01b5000ca700352abb000d591cb7000eb5000c033e1d1ca20022bb000f59b700103a0419042bb800112ab4000c1904b6001257840301a7ffdf2bb90007010099000c2a2b03b80013b500142bb9000701009900162abb001559b70016b500172ab400172bb800112a2bb900070100b500182a2bb900190100b50004b1
@@ -947,8 +947,8 @@ fromData,14,2a2bb7001a2a2bb8001bb50004b1
toData,14,2a2bb700182ab400042bb80019b1
com/gemstone/gemfire/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
-fromData,318,2bb9009501003d2bb9009501003e2a1cb500962a1c2bb600972a2bb80098b500232a2bb900990100b8009ab500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009bb500882a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001d2ab4001d9900382bb900990100360415049a000b2a03b5001ea7001b150404a0000b2a04b5001ea7000dbb009c59129db7009ebf2a2bb8009fb5001f1c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a015049900162abb00a159b700a2b5000e2ab4000e2bb800a31c1110007e99001c1c1120007e99000704a700040336052a15052bb800a4b5000a1d1104007e9900232a04b5000f2ac100a59900172ac000a51d1101007e99000704a7000403b600a6b1
-toData,202,033d033e2a1cb600a73d2a1db600a83e2b1cb900a902002b1db900a902002ab4000d9e000d2b2ab4000db900aa02002ab400232bb800ab2b2ab40009b400acb900ad02002ab40088c6000b2ab400882bb800ae2ab4001d9900542b2ab4001e99000704a7000403b900ad02002ab4001eb800af36042ab4001e9a001f2ab4001fc10020990015013a052ab4001fc00020c000203a06a7000c2ab4001f3a05013a061504190519062bb800b02ab4000ec6000b2ab4000e2bb800b12ab4000ac6000b2ab4000a2bb800b1b1
+fromData,318,2bb9009301003d2bb9009301003e2a1cb500942a1c2bb600952a2bb80096b500212a2bb900970100b80098b500072a1c1100807e99000704a7000403b500022a1c10087e99000704a7000403b500561c1102007e99000b2a2bb8009ab500862a1c1104007e99000704a7000403b500052a1c10407e99000704a7000403b5001b2ab4001b9900382bb900970100360415049a000b2a03b5001ca7001b150404a0000b2a04b5001ca7000dbb009b59129cb7009dbf2a2bb8009eb5001d1c1101007e99000704a700040336042a1c1108007e99000704a7000403b5009f15049900162abb00a059b700a1b5000c2ab4000c2bb800a21c1110007e99001c1c1120007e99000704a700040336052a15052bb800a3b500081d1104007e9900232a04b5000d2ac100a49900172ac000a41d1101007e99000704a7000403b600a5b1
+toData,202,033d033e2a1cb600a63d2a1db600a73e2b1cb900a802002b1db900a802002ab4000b9e000d2b2ab4000bb900a902002ab400212bb800aa2b2ab40007b400abb900ac02002ab40086c6000b2ab400862bb800ad2ab4001b9900542b2ab4001c99000704a7000403b900ac02002ab4001cb800ae36042ab4001c9a001f2ab4001dc1001e990015013a052ab4001dc0001ec0001e3a06a7000c2ab4001d3a05013a061504190519062bb800af2ab4000cc6000b2ab4000c2bb800b02ab40008c6000b2ab400082bb800b0b1
com/gemstone/gemfire/internal/cache/DistributedClearOperation$ClearRegionMessage,2
fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1
@@ -966,19 +966,19 @@ com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
toData,236,2ab4000a4e2ab4000c3a042d2bb8003d1904c1003e9a00081904c700192b03b9003f02001904c0003ec0003e2bb80040a700341904c1004199001f1904c000413a052b04b9003f02001905b9004201002bb80040a700102b04b9003f020019042bb800432b2ab40012b40044b9003f02002ab4000636052ab40026c6000a150507809136052ab40017c6001d15051008809136052ab40017c1004599000b150510208091360515051080809136052b1505b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllMessage,2
-fromData,197,2a2bb7003e2a2bb8003fc00040b500072a2bb8004188b500172a2ab40017bd0042b500082ab400179e00722bb800434dbb004459b700454e03360415042ab40017a200202ab400081504bb0042592b2ab4000715042c2db7004653840401a7ffdd2bb9004701003604150499002f2bb800483a0503360615062ab40017a2001d2ab4000815063219051506b60049c0004ab50030840601a7ffe02ab4004b1140007e99000e2a2bb8003fc0004cb5000d2a2ab4004b1180007e99000704a7000403b5001cb1
-toData,181,2a2bb7004d2ab400072bb8004e2ab40017852bb8004f2ab400179e008bbb0050592ab40017b700514d033e2ab400080332b40052c10026360403360515052ab40017a200531d9a00122ab40008150532b40030c60005043e2ab40008150532b400303a062c1906b60053572ab4000815053201b500302ab400081505322b1504b600542ab400081505321906b50030840501a7ffaa2b1db9005502001d9900082c2bb800562ab4000dc6000b2ab4000d2bb8004eb1
+fromData,197,2a2bb7003c2a2bb8003dc0003eb500052a2bb8003f88b500152a2ab40015bd0040b500062ab400159e00722bb800414dbb004259b700434e03360415042ab40015a200202ab400061504bb0040592b2ab4000515042c2db7004453840401a7ffdd2bb9004501003604150499002f2bb800463a0503360615062ab40015a2001d2ab4000615063219051506b60047c00048b5002e840601a7ffe02ab400491140007e99000e2a2bb8003dc0004bb5000b2a2ab400491180007e99000704a7000403b5001ab1
+toData,181,2a2bb7004c2ab400052bb8004d2ab40015852bb8004e2ab400159e008bbb004f592ab40015b700504d033e2ab400060332b40051c10024360403360515052ab40015a200531d9a00122ab40006150532b4002ec60005043e2ab40006150532b4002e3a062c1906b60052572ab4000615053201b5002e2ab400061505322b1504b600532ab400061505321906b5002e840501a7ffaa2b1db9005402001d9900082c2bb800552ab4000bc6000b2ab4000b2bb8004db1
com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage,2
-fromData,171,2a2bb700622bb9006301003d1c047e9900142a2bb900640100b500092ab40009b800651c077e99000d2a2bb900640100b500061c057e99000e2a2bb80066c00067b500072bb800664e2dc100689900252a03b5000e2a2dc00068b80069b500082ab40008c7001b2a2dc00068b5004da700102a2dc0006ab500082a04b5000e2a2bb80066c0006bb5000a2a2bb8006cb5000c2a2bb8006db5000b2a1c10407e99000704a7000403b5000db1
-toData,173,2a2bb7006f033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007002002ab4000999000d2b2ab40009b9007102002ab40006029f000d2b2ab40006b9007102002ab40007c6000b2ab400072bb800722ab4000e99000e2ab400082bb80072a700102ab40008b9005801002bb800722ab4000a2bb800722ab4000cc000732bb800742ab4000b2bb80075b1
+fromData,171,2a2bb700612bb9006201003d1c047e9900142a2bb900640100b500082ab40008b800651c077e99000d2a2bb900640100b500051c057e99000e2a2bb80066c00067b500062bb800664e2dc100689900252a03b5000d2a2dc00068b80069b500072ab40007c7001b2a2dc00068b5004ca700102a2dc0006ab500072a04b5000d2a2bb80066c0006bb500092a2bb8006cb5000b2a2bb8006db5000a2a1c10407e99000704a7000403b5000cb1
+toData,173,2a2bb7006f033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000c9900091c104080933d2b1cb9007002002ab4000899000d2b2ab40008b9007102002ab40005029f000d2b2ab40005b9007102002ab40006c6000b2ab400062bb800722ab4000d99000e2ab400072bb80072a700102ab40007b9005701002bb800722ab400092bb800722ab4000bc000732bb800742ab4000a2bb80075b1
com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
toData,146,2ab4000a4e2d2bb8003f2b2ab40010b40040b9004102002ab4000636042ab40022c6000a150407809136042ab40015c6001d15041008809136042ab40015c1004299000b150410208091360415041080809136042b1504b9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
-fromData,197,2a2bb7003a2a2bb8003bc0003cb500052a2bb8003d88b500152a2ab40015bd003eb500062ab400159e00722bb8003f4dbb004059b700414e03360415042ab40015a200202ab400061504bb003e592b2ab4000515042c2db7004253840401a7ffdd2bb9004301003604150499002f2bb800443a0503360615062ab40015a2001d2ab4000615063219051506b60045c00046b5002d840601a7ffe02ab400471140007e99000e2a2bb8003bc00048b5000b2a2ab400471180007e99000704a7000403b5001ab1
-toData,181,2a2bb700492ab400052bb8004a2ab40015852bb8004b2ab400159e008bbb004c592ab40015b7004d4d033e2ab400060332b4004ec10028360403360515052ab40015a200531d9a00122ab40006150532b4002dc60005043e2ab40006150532b4002d3a062c1906b6004f572ab4000615053201b5002d2ab400061505322b1504b600502ab400061505321906b5002d840501a7ffaa2b1db9005102001d9900082c2bb800522ab4000bc6000b2ab4000b2bb8004ab1
+fromData,197,2a2bb700382a2bb80039c0003ab500032a2bb8003b88b500132a2ab40013bd003cb500042ab400139e00722bb8003d4dbb003e59b7003f4e03360415042ab40013a200202ab400041504bb003c592b2ab4000315042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40013a2001d2ab4000415063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00047b500092a2ab400451180007e99000704a7000403b50018b1
+toData,181,2a2bb700482ab400032bb800492ab40013852bb8004a2ab400139e008bbb004b592ab40013b7004c4d033e2ab400040332b4004dc10026360403360515052ab40013a200531d9a00122ab40004150532b4002bc60005043e2ab40004150532b4002b3a062c1906b6004e572ab4000415053201b5002b2ab400041505322b1504b6004f2ab400041505321906b5002b840501a7ffaa2b1db9005002001d9900082c2bb800512ab40009c6000b2ab400092bb80049b1
com/gemstone/gemfire/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2
fromData,125,2a2bb700162ab800172bb90018010032b500192bb9001a01003d2abb001b591cb7001cb500112bb9001d01003e03360415041ca2003e1d990019bb001e59b7001f3a0619062bb8002019063a05a700092bb800213a052ab4001119052bb900220100b80023b90024030057840401a7ffc22a2bb80025c00026b50003b1
@@ -989,8 +989,8 @@ fromData,17,2a2bb80005b500022a2bb80005b50003b1
toData,17,2ab400022bb800042ab400032bb80004b1
com/gemstone/gemfire/internal/cache/EntryEventImpl,2
-fromData,214,2a2bb8001bc0001cb5001d2bb8001b4d2bb8001b4e2abb001e592c2d01b7001fb500202a2bb900210100b80022b500232a2bb900240100b500092ab400202bb8001bb600252a2bb8001bc00026b5000a2bb9002701009900112a2bb8001bc00028b50008a700322bb9002701009900212a2bb80029b5002a2a2ab4002ab500062a2ab4002ab8002bb50005a7000b2a2bb8001bb500052bb9002701009900192a2bb80029b5002c2a2ab4002cb8002bb50007a7000b2a2bb8001bb500072a2bb8002db5002e2a2bb8002fb5000b2a2bb80030b50014b1
-toData,312,2ab4001d2bb801602ab6008c2bb801602ab40020b6018d2bb801602b2ab40023b4018eb9018f02002b2ab4000911c03f7eb9019002002ab6004b2bb801602ab4000a2bb801602ab40008c6000704a70004033d2b1cb9019102001c99000e2ab400082bb80160a700682ab600414e2dc100823604150499000e2dc00082b900b8010036042b1504b901910200150499003b2ab4002ac6000e2ab4002a2bb80192a7002e2ab40006c6000e2ab400062bb80192a7001c2dc000823a051905b900c601002bb80193a700082d2bb801602ab700434d2cc100823e1d99000d2cc00082b900b801003e2b1db9019102001d9900292ab4002cc6000e2ab4002c2bb80192a7001c2cc000823a041904b900c601002bb80193a700082c2bb801602ab4002ec001942bb801952ab600582bb801602ab400142bb80196b1
+fromData,214,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500092ab4001b2bb80016b600202a2bb80016c00021b5000a2bb9002201009900112a2bb80016c00023b50008a700322bb9002201009900212a2bb80024b500252a2ab40025b500062a2ab40025b80026b50005a7000b2a2bb80016b500052bb9002201009900192a2bb80024b500272a2ab40027b80026b50007a7000b2a2bb80016b500072a2bb80028b500292a2bb8002ab5000b2a2bb8002bb50014b1
+toData,312,2ab400182bb8015a2ab600882bb8015a2ab4001bb601872bb8015a2b2ab4001eb40188b9018902002b2ab4000911c03f7eb9018a02002ab600462bb8015a2ab4000a2bb8015a2ab40008c6000704a70004033d2b1cb9018b02001c99000e2ab400082bb8015aa700682ab6003c4e2dc1007e3604150499000e2dc0007eb900b4010036042b1504b9018b0200150499003b2ab40025c6000e2ab400252bb8018ca7002e2ab40006c6000e2ab400062bb8018ca7001c2dc0007e3a051905b900c201002bb8018da700082d2bb8015a2ab7003e4d2cc1007e3e1d99000d2cc0007eb900b401003e2b1db9018b02001d9900292ab40027c6000e2ab400272bb8018ca7001c2cc0007e3a041904b900c201002bb8018da700082c2bb8015a2ab40029c0018e2bb8018f2ab600542bb8015a2ab400142bb80190b1
com/gemstone/gemfire/internal/cache/EntrySnapshot,2
fromData,50,2a03b500052bb9004101003d1c9900112abb000759b70042b50004a7000e2abb000359b70043b500042ab400042bb60044b1
@@ -1063,8 +1063,8 @@ fromData,64,2a2bb700112a2bb900120100b5000c2a2bb900130100b5000d2a2bb900120100b500
toData,90,2a2bb700192b2ab4000cb9001a02002b2ab4000db9001b02002b2ab40004b9001a02002ab4000e2bb8001ca7002e4d2cc1001d99000cbb001e592cb7001fbfbb0016592ab4000eb60020b60021b700224e2d2cb60018572dbfb1
com/gemstone/gemfire/internal/cache/GridAdvisor$GridProfile,2
-fromData,26,2a2bb7001f2a2bb80020b500052a2bb80021b500062ab60007b1
-toData,22,2a2bb7001c2ab400052bb8001d2ab400062bb8001eb1
+fromData,26,2a2bb7001e2a2bb8001fb500052a2bb80020b500062ab60007b1
+toData,22,2a2bb7001b2ab400052bb8001c2ab400062bb8001db1
com/gemstone/gemfire/internal/cache/HARegion$HARegionAdvisor$HAProfile,2
fromData,47,2a2bb700032bb9000401003d2a1cb200057e99000704a7000403b500062a1cb200077e99000704a7000403b50008b1
@@ -1139,8 +1139,8 @@ fromData,26,2a2bb700242a2bb900250100b500042a2bb900250100b50002b1
toData,26,2a2bb700222b2ab40004b9002302002b2ab40002b900230200b1
com/gemstone/gemfire/internal/cache/MemberFunctionStreamingMessage,2
-fromData,163,2a2bb700512bb9005201003d1c047e9900142a2bb900530100b500082ab40008b800541c077e99000d2a2bb900530100b500051c057e99000e2a2bb80055c00056b500062bb800554e2dc1002a9900252a03b5000a2a2dc0002ab80057b500072ab40007c7001b2a2dc0002ab5001aa700102a2dc00058b500072a04b5000a2a2bb80055b500092a2bb80055c00059b500102a1c10407e99000704a7000403b5000bb1
-toData,162,2a2bb7005b033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000b9900091c104080933d2b1cb9005c02002ab4000899000d2b2ab40008b9005d02002ab40005029f000d2b2ab40005b9005d02002ab40006c6000b2ab400062bb8005e2ab4000a99000e2ab400072bb8005ea700102ab40007b9001f01002bb8005e2ab400092bb8005e2ab400102bb8005eb1
+fromData,163,2a2bb700502bb9005101003d1c047e9900142a2bb900530100b500072ab40007b800541c077e99000d2a2bb900530100b500041c057e99000e2a2bb80055c00056b500052bb800554e2dc100299900252a03b500092a2dc00029b80057b500062ab40006c7001b2a2dc00029b50019a700102a2dc00058b500062a04b500092a2bb80055b500082a2bb80055c00059b5000f2a1c10407e99000704a7000403b5000ab1
+toData,162,2a2bb7005b033d2ab400079900081c0480933d2ab40004029f00081c0780933d2ab40005c600081c0580933d2ab4000a9900091c104080933d2b1cb9005c02002ab4000799000d2b2ab40007b9005d02002ab40004029f000d2b2ab40004b9005d02002ab40005c6000b2ab400052bb8005e2ab4000999000e2ab400062bb8005ea700102ab40006b9001e01002bb8005e2ab400082bb8005e2ab4000f2bb8005eb1
com/gemstone/gemfire/internal/cache/Node,2
fromData,60,2abb001c59b7001db500052ab400052bb8001e2a2bb9001f0100b500032a2bb900200100b500042a2bb900210100b500152a2bb9001f0100b50006b1
@@ -1171,8 +1171,8 @@ fromData,145,2a2bb80032b500032a2bb80032b500052a2bb80032b500072a2bb80032b500092a2
toData,145,2ab400032bb8002d2ab400052bb8002d2ab400072bb8002d2ab400092bb8002d2ab4000a2bb8002d2ab4000b2bb8002d2ab4000f2bb8002d2ab4000e2bb8002e2ab400122bb8002e2ab400162bb8002d2ab400182bb8002d2ab400082bb8002f2ab400142bb8002f2ab4001b2bb800302ab4001f2bb800312ab400202bb800312ab400132bb8002d2ab4001c2bb8002fb1
com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable,2
-fromData,9,2a2bb8000fb50003b1
-toData,9,2ab400032bb80010b1
+fromData,9,2a2bb8000eb50002b1
+toData,9,2ab400022bb8000fb1
com/gemstone/gemfire/internal/cache/QueuedOperation,1
toData,97,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900442ab400032bb800372ab40002b600169a000d2ab40002b600159900282b2ab40006b9003602002ab40006049f000e2ab400042bb80038a7000b2ab400052bb80037b1
@@ -1186,16 +1186,16 @@ fromData,24,2a2bb700222a2bb80023b500022a2bb900240100b50003b1
toData,24,2a2bb700252ab400022bb800262b2ab40003b900270200b1
com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage,2
-fromData,33,2a2bb700312a2bb80032b500062a2ab4003310407e99000704a7000403b50005b1
-toData,14,2a2bb700342ab400062bb80035b1
+fromData,33,2a2bb700302a2bb80031b500052a2ab4003210407e99000704a7000403b50004b1
+toData,14,2a2bb700332ab400052bb80034b1
com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage$RemoteContainsKeyValueReplyMessage,2
fromData,16,2a2bb700152a2bb900160100b50003b1
toData,16,2a2bb700172b2ab40003b900180200b1
com/gemstone/gemfire/internal/cache/RemoteDestroyMessage,2
-fromData,131,2a2bb7008b2a2bb8008cb7008d2a2bb8008cb5000c2a2bb9008e0100b8008fb5000e2ab400901102007e99000e2a2bb8008cc00091b500102ab400901104007e99000e2a2bb8008cc00034b500662a2bb8008cc00092b500122ab400059900122bb9008e0100572a2bb80093b700222a2bb8008cb500082a2bb8008cc00094b50017b1
-toData,135,2a2bb700952ab6006c2bb800962ab4000c2bb800962b2ab4000eb40097b9009802002ab40010c6000b2ab400102bb800962ab40066c6000b2ab400662bb800962ab400122bb800962ab4000599002a2b2ab4000699000704a7000403b9009802002ab40006b800993d1c2ab7009a2ab600702bb8009b2ab400082bb800962ab400172bb80096b1
+fromData,131,2a2bb7008b2a2bb8008cb7008d2a2bb8008cb5000a2a2bb9008e0100b8008fb5000c2ab400901102007e99000e2a2bb8008cc00091b5000e2ab400901104007e99000e2a2bb8008cc00033b500662a2bb8008cc00092b500102ab400039900122bb9008e0100572a2bb80093b700202a2bb8008cb500062a2bb8008cc00094b50015b1
+toData,135,2a2bb700952ab6006c2bb800962ab4000a2bb800962b2ab4000cb40097b9009802002ab4000ec6000b2ab4000e2bb800962ab40066c6000b2ab400662bb800962ab400102bb800962ab4000399002a2b2ab4000499000704a7000403b9009802002ab40004b800993d1c2ab7009a2ab600702bb8009b2ab400062bb800962ab400152bb80096b1
com/gemstone/gemfire/internal/cache/RemoteDestroyMessage$DestroyReplyMessage,2
fromData,52,2a2bb700232bb9002401003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80025b50009b1
@@ -1230,20 +1230,20 @@ fromData,52,2a2bb700242bb9002501003d1c047e99000704a70004033e1c057e99000704a70004
toData,57,2a2bb70020033d2ab40003c600081c0480913d2ab40003c100219900081c0580913d2b1cb9002202002ab40003c6000b2ab400032bb80023b1
com/gemstone/gemfire/internal/cache/RemoteOperationMessage,2
-fromData,43,2a2bb700542a2bb900550100b500562a2ab400562bb600572a2bb80058b5000a2a2bb900590100b50006b1
-toData,103,2a2bb7005a2ab6005b3d2b1cb9005c02002ab4000c99000d2b2ab4000cb9005d02002ab4005e99000d2b2ab4005eb9005f02002ab60015029f000d2b2ab60015b9005d02002ab60016c6000b2ab600162bb800602ab4000a2bb800612b2ab40006b900620200b1
+fromData,43,2a2bb7005c2a2bb9005d0100b5005e2a2ab4005e2bb6005f2a2bb80060b5000a2a2bb900610100b50006b1
+toData,103,2a2bb700622ab600633d2b1cb9006402002ab4000c99000d2b2ab4000cb9006502002ab4006699000d2b2ab40066b9006702002ab60015029f000d2b2ab60015b9006502002ab60016c6000b2ab600162bb800682ab4000a2bb800692b2ab40006b9006a0200b1
com/gemstone/gemfire/internal/cache/RemotePutAllMessage,2
-fromData,243,2a2bb700522a2bb80053c00054b500392a2bb80053b5003b2a2ab4005510087e99000704a7000403b500062ab4005510407e99000e2a2bb80053c00056b500502a2ab400551100807e99000704a7000403b500052a2ab400551101007e99000704a7000403b500042a2bb8005788b500082a2ab40008bd0058b500072ab400089e00722bb800594dbb005a59b7005b4e03360415042ab40008a200202ab400071504bb0058592b2ab4003915042c2db7005c53840401a7ffdd2bb9005d01003604150499002f2bb8005e3a0503360615062ab40008a2001d2ab4000715063219051506b6005fc00020b50021840601a7ffe0b1
-toData,189,2a2bb700602ab400392bb800612ab4003b2bb800612ab40050c6000b2ab400502bb800612ab40008852bb800622ab400089e008bbb0063592ab40008b700644d033e2ab400070332b40065c10066360403360515052ab40008a200531d9a00122ab40007150532b40021c60005043e2ab40007150532b400213a062c1906b60067572ab4000715053201b500212ab400071505322b1504b600682ab400071505321906b50021840501a7ffaa2b1db9006902001d9900082c2bb8006ab1
+fromData,243,2a2bb700512a2bb80052c00053b500372a2bb80052b500392a2ab4005410087e99000704a7000403b500042ab4005410407e99000e2a2bb80052c00056b5004f2a2ab400541100807e99000704a7000403b500032a2ab400541101007e99000704a7000403b500022a2bb8005788b500062a2ab40006bd0058b500052ab400069e00722bb800594dbb005a59b7005b4e03360415042ab40006a200202ab400051504bb0058592b2ab4003715042c2db7005c53840401a7ffdd2bb9005d01003604150499002f2bb8005e3a0503360615062ab40006a2001d2ab4000515063219051506b6005fc0001eb5001f840601a7ffe0b1
+toData,189,2a2bb700602ab400372bb800612ab400392bb800612ab4004fc6000b2ab4004f2bb800612ab40006852bb800622ab400069e008bbb0063592ab40006b700644d033e2ab400050332b40065c10066360403360515052ab40006a200531d9a00122ab40005150532b4001fc60005043e2ab40005150532b4001f3a062c1906b60067572ab4000515053201b5001f2ab400051505322b1504b600682ab400051505321906b5001f840501a7ffaa2b1db9006902001d9900082c2bb8006ab1
com/gemstone/gemfire/internal/cache/RemotePutAllMessage$PutAllReplyMessage,2
fromData,17,2a2bb7001a2a2bb8001bc0001cb50001b1
toData,14,2a2bb7001d2ab400012bb8001eb1
com/gemstone/gemfire/internal/cache/RemotePutMessage,2
-fromData,242,2a2bb700752a2bb80076b600772bb9007801003d2a1cb200797e91b500072a2bb80076b500222a2bb9007a0100b500232a2bb9007b0100b8007cb500251cb2007d7e99000e2a2bb80076c0007eb500271cb2007f7e99000e2a2bb80076c00041b500802abb008159b70082b500292ab400292bb800832ab400841120007e99000b2a2bb80076b500112ab4000a99001e2a2bb9007b010004a0000704a7000403b500082a2bb80085b700862ab4000704a0000e2a2bb80076b70087a7000b2a2bb80085b700882ab400841104007e9900102a04b5000c2a2bb80085b500891cb2008a7e99000e2a2bb80076c0008bb5002eb1
-toData,252,2a03b5000b2a2bb7008d2ab6008e2bb8008f2ab400073d2ab40027c600091cb2007d803d2ab40080c600091cb2007f803d2ab4002ec600091cb2008a803d2b1cb9009002002ab600912bb8008f2b2ab40023b9009203002b2ab40025b40093b9009002002ab40027c6000b2ab400272bb8008f2ab40080c6000b2ab400802bb8008f2ab400292bb800942ab40011c6000b2ab400112bb8008f2ab4000a99002a2b2ab4000899000704a7000403b9009002002ab40008b800953e1d2ab700962ab600972bb800982ab400072ab400722ab600992bb800982ab4000eb6009ac6000e2ab4000eb6009a2bb8009b2ab4002ec6000b2ab4002e2bb8008fb1
+fromData,242,2a2bb700742a2bb80075b600762bb9007701003d2a1cb200787e91b500052a2bb80075b500202a2bb900790100b500212a2bb9007a0100b8007bb500231cb2007c7e99000e2a2bb80075c0007db500251cb2007e7e99000e2a2bb80075c0003fb5007f2abb008059b70081b500272ab400272bb800822ab400831120007e99000b2a2bb80075b5000f2ab4000899001e2a2bb9007a010004a0000704a7000403b500062a2bb80084b700852ab4000504a0000e2a2bb80075b70086a7000b2a2bb80084b700872ab400831104007e9900102a04b5000a2a2bb80084b500881cb200897e99000e2a2bb80075c0008ab5002cb1
+toData,252,2a03b500092a2bb7008c2ab6008d2bb8008e2ab400053d2ab40025c600091cb2007c803d2ab4007fc600091cb2007e803d2ab4002cc600091cb20089803d2b1cb9008f02002ab600902bb8008e2b2ab40021b9009103002b2ab40023b40092b9008f02002ab40025c6000b2ab400252bb8008e2ab4007fc6000b2ab4007f2bb8008e2ab400272bb800932ab4000fc6000b2ab4000f2bb8008e2ab4000899002a2b2ab4000699000704a7000403b9008f02002ab40006b800943e1d2ab700952ab600962bb800972ab400052ab400712ab600982bb800972ab4000cb60099c6000e2ab4000cb600992bb8009a2ab4002cc6000b2ab4002c2bb8008eb1
com/gemstone/gemfire/internal/cache/RemotePutMessage$PutReplyMessage,2
fromData,81,2a2bb700262bb9002701001100ff7e913d2a1c047e99000704a7000403b500032a2bb900270100b80028b500022a2bb80029b500061c057e9900181c077e99000704a70004033e2a1d2bb8002ab50007b1
@@ -1258,8 +1258,8 @@ fromData,6,2a2bb70014b1
toData,6,2a2bb70015b1
com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage,2
-fromData,203,2a2bb7004e2a2bb8004fc00050b500362a2bb8004fb500382a2ab4005110087e99000704a7000403b500032ab4005110407e99000e2a2bb8004fc00052b5004c2a2bb8005388b500052a2ab40005bd0054b500042ab400059e00722bb800554dbb005659b700574e03360415042ab40005a200202ab400041504bb0054592b2ab4003615042c2db7005853840401a7ffdd2bb9005901003604150499002f2bb8005a3a0503360615062ab40005a2001d2ab4000415063219051506b6005bc0001db5001e840601a7ffe0b1
-toData,189,2a2bb7005c2ab400362bb8005d2ab400382bb8005d2ab4004cc6000b2ab4004c2bb8005d2ab40005852bb8005e2ab400059e008bbb005f592ab40005b700604d033e2ab400040332b40061c10062360403360515052ab40005a200531d9a00122ab40004150532b4001ec60005043e2ab40004150532b4001e3a062c1906b60063572ab4000415053201b5001e2ab400041505322b1504b600642ab400041505321906b5001e840501a7ffaa2b1db9006502001d9900082c2bb80066b1
+fromData,203,2a2bb7004d2a2bb8004ec0004fb500352a2bb8004eb500372a2ab4005010087e99000704a7000403b500022ab4005010407e99000e2a2bb8004ec00052b5004b2a2bb8005388b500042a2ab40004bd0054b500032ab400049e00722bb800554dbb005659b700574e03360415042ab40004a200202ab400031504bb0054592b2ab4003515042c2db7005853840401a7ffdd2bb9005901003604150499002f2bb8005a3a0503360615062ab40004a2001d2ab4000315063219051506b6005bc0001cb5001d840601a7ffe0b1
+toData,189,2a2bb7005c2ab400352bb8005d2ab400372bb8005d2ab4004bc6000b2ab4004b2bb8005d2ab40004852bb8005e2ab400049e008bbb005f592ab40004b700604d033e2ab400030332b40061c10062360403360515052ab40004a200531d9a00122ab40003150532b4001dc60005043e2ab40003150532b4001d3a062c1906b60063572ab4000315053201b5001d2ab400031505322b1504b600642ab400031505321906b5001d840501a7ffaa2b1db9006502001d9900082c2bb80066b1
com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage$RemoveAllReplyMessage,2
fromData,17,2a2bb7001a2a2bb8001bc0001cb50001b1
@@ -1282,8 +1282,8 @@ fromData,131,2a2bb700252a2bb900260100b500072a2bb80027b500082ab40008c6000c2a2ab40
toData,145,2a2bb7001d2b2ab40007b9001e02002ab40009c6000e2ab400092bb8001fa7000f2ab400082ab4000a2bb800202b2ab4000bb900210300033d2ab4000c9900081c0480913d2ab4000d9900081c0580913d2ab4000e9900081c0780913d2ab4000fc600091c100880913d2ab4000fc100229900091c101080913d2b1cb9002302002ab4000fc6000b2ab4000f2bb80024b1
com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$NetSearchRequestMessage,2
-fromData,97,2a2bb7001c2bb9001d01003d1c047e9900142a2bb9001e0100b5000b2ab4000bb8001f2a2bb900200100b5000c2a2bb80021b5000d2a2bb9001e0100b5000e1c10407e99000c2a2bb8002288b5000f1c1100807e99000c2a2bb8002288b50010b1
-toData,131,2a2bb70016033d2ab4000b9900081c0480933d2ab4000f9900091c104080933d2ab4001099000a1c11008080933d2b1cb9001702002ab4000b99000d2b2ab4000bb9001802002b2ab4000cb9001902002ab4000d2bb8001a2b2ab4000eb9001802002ab4000f99000c2ab4000f852bb8001b2ab4001099000c2ab40010852bb8001bb1
+fromData,97,2a2bb7001c2bb9001d01003d1c047e9900142a2bb9001e0100b5000a2ab4000ab8001f2a2bb900200100b5000b2a2bb80021b5000c2a2bb9001e0100b5000d1c10407e99000c2a2bb8002288b5000e1c1100807e99000c2a2bb8002288b5000fb1
+toData,131,2a2bb70015033d2ab4000a9900081c0480933d2ab4000e9900091c104080933d2ab4000f99000a1c11008080933d2b1cb9001702002ab4000a99000d2b2ab4000ab9001802002b2ab4000bb9001902002ab4000c2bb8001a2b2ab4000db9001802002ab4000e99000c2ab4000e852bb8001b2ab4000f99000c2ab4000f852bb8001bb1
com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$NetWriteReplyMessage,2
fromData,47,2a2bb700182a2bb900190100b500072a2bb9001a0100b500082a2bb8001bc0001cb500092a2bb9001a0100b5000ab1
@@ -1294,8 +1294,8 @@ fromData,57,2a2bb700182a2bb900190100b5000a2a2bb9001a0100b5000b2a2bb900190100b500
toData,54,2a2bb700142b2ab4000ab9001502002b2ab4000bb9001602002b2ab4000cb9001502002ab4000d2bb800172b2ab4000eb900150200b1
com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$QueryMessage,2
-fromData,114,2a2bb7001f2bb9002001003d1c047e9900142a2bb900210100b5000c2ab4000cb800222a2bb900230100b5000d2a2bb80024b5000f2a2bb900210100b500101c10407e99000c2a2bb8002588b500111c1100807e99000c2a2bb8002588b500122a1c1101007e99000704a7000403b50008b1
-toData,145,2a2bb70019033d2ab4000c9900081c0480933d2ab400119900091c104080933d2ab4001299000a1c11008080933d2ab4000899000a1c11010080933d2b1cb9001a02002ab4000c99000d2b2ab4000cb9001b02002b2ab4000db9001c02002ab4000f2bb8001d2b2ab40010b9001b02002ab4001199000c2ab40011852bb8001e2ab4001299000c2ab40012852bb8001eb1
+fromData,114,2a2bb7001f2bb9002001003d1c047e9900142a2bb900210100b5000b2ab4000bb800222a2bb900230100b5000c2a2bb80024b5000e2a2bb900210100b5000f1c10407e99000c2a2bb8002588b500101c1100807e99000c2a2bb8002588b500112a1c1101007e99000704a7000403b50007b1
+toData,145,2a2bb70018033d2ab4000b9900081c0480933d2ab400109900091c104080933d2ab4001199000a1c11008080933d2ab4000799000a1c11010080933d2b1cb9001a02002ab4000b99000d2b2ab4000bb9001b02002b2ab4000cb9001c02002ab4000e2bb8001d2b2ab4000fb9001b02002ab4001099000c2ab40010852bb8001e2ab4001199000c2ab40011852bb8001eb1
com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$ResponseMessage,2
fromData,83,2a2bb7001f2a2bb80020b500072a2bb900210100b500082a2bb80020b500092a2bb900220100b5000a2a2bb900230100b5000b2a2bb900230100b5000c2a2bb900230100b5000d2a2bb80020c00024b5000eb1
@@ -1322,8 +1322,8 @@ fromData,17,2a2bb7000e2a2bb8000fc00010b50002b1
toData,14,2a2bb7000b2ab400022bb8000cb1
com/gemstone/gemfire/internal/cache/StoreAllCachedDeserializable,2
-fromData,20,2a2bb8000fb500072a2ab40007b80008b50009b1
-toData,9,2ab400072bb80010b1
+fromData,20,2a2bb8000eb500062a2ab40006b80007b50008b1
+toData,9,2ab400062bb8000fb1
com/gemstone/gemfire/internal/cache/TXCommitMessage,2
fromData,211,2bb900f601003d2ab700049900122a1cb5009f2ab4009fb800f7a700082a02b5009f2a2bb800f8b500152bb900f9010099000b2a2bb800fab500162bb900f601003e2a2bb800fbb5001f2a2bb900fc0100b500202a2bb900fc0100b500212a2bb900f90100b800fdb500022bb900f6010036042abb00d9591504b700dbb500172abb00d9591db700dbb500ae03360515051504a2002fbb0025592ab700fe3a0619062bb600ffa7000c3a072a1907b600bcb12ab400171906b6004957840501a7ffd02a2bb80100b500032a2bb80101b5001bb1
@@ -1426,19 +1426,19 @@ fromData,14,2a2bb700132a2bb80014b50009b1
toData,14,2a2bb700152ab400092bb80016b1
com/gemstone/gemfire/internal/cache/VMCachedDeserializable,2
-fromData,17,2bb800214d2a2cbeb500092a2cb50007b1
-toData,9,2ab600222bb80023b1
+fromData,17,2bb800204d2a2cbeb500082a2cb50006b1
+toData,9,2ab600212bb80022b1
com/gemstone/gemfire/internal/cache/WrappedCallbackArgument,2
fromData,9,2a2bb80005b50003b1
toData,24,2ab4000299000e2ab400032bb80004a70008012bb80004b1
com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable,2
-fromData,18,2a2ab600082bb8000fb900090200b50003b1
-toData,18,2ab600082ab40003b9000d02002bb8000eb1
+fromData,18,2a2ab600072bb8000eb900080200b50002b1
+toData,18,2ab600072ab40002b9000c02002bb8000db1
com/gemstone/gemfire/internal/cache/control/MemoryThresholds,1
-toData,31,2b2ab4000cb9003803002b2ab4000db9003902002b2ab40013b900390200b1
+toData,31,2b2ab4000bb9003703002b2ab4000cb9003802002b2ab40012b900380200b1
com/gemstone/gemfire/internal/cache/control/MemoryThresholds$MemoryState,1
toData,12,2ab60009b8000a2bb8000bb1
@@ -1552,8 +1552,8 @@ fromData,6,2a2bb7001db1
toData,6,2a2bb7001bb1
com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage,2
-fromData,134,2a2bb700682a2bb80069b7006a2a2bb80069b500092a2bb9006b0100b8006cb5000b2a2bb9006d0100b5000c2a2bb8006eb5000e2a2bb80069c0006fb500192a2bb80069c00070b500102a2bb80069b500052ab400711104007e99000704a70004033d1c9900162abb007259b70073b500742ab400742bb800752a2bb80069c00076b50012b1
-toData,100,2a2bb700772ab600782bb800792ab400092bb800792b2ab4000bb4007ab9007b02002b2ab4000cb9007c02002ab4000e2bb800792ab400192bb800792ab400102bb800792ab400052bb800792ab40074c6000b2ab400742bb8007d2ab400122bb80079b1
+fromData,134,2a2bb700672a2bb80068b700692a2bb80068b500082a2bb9006a0100b8006bb5000a2a2bb9006c0100b5000b2a2bb8006db5000d2a2bb80068c0006eb500182a2bb80068c0006fb5000f2a2bb80068b500042ab400701104007e99000704a70004033d1c9900162abb007259b70073b500742ab400742bb800752a2bb80068c00076b50011b1
+toData,100,2a2bb700772ab600782bb800792ab400082bb800792b2ab4000ab4007ab9007b02002b2ab4000bb9007c02002ab4000d2bb800792ab400182bb800792ab4000f2bb800792ab400042bb800792ab40074c6000b2ab400742bb8007d2ab400112bb80079b1
com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage$DestroyReplyMessage,2
fromData,52,2a2bb700262bb9002701003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80028b5000bb1
@@ -1584,8 +1584,8 @@ fromData,67,2a2bb700282a2bb80029b6002ab500082ab4000804a0000e2a2bb8002bb50004a700
toData,67,2a2bb7002f2ab40008b800302bb800312ab4000804a0000e2ab400042bb80032a700122ab400089a000b2ab400052bb800332ab400062bb800342ab400092bb80035b1
com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage$FetchBulkEntriesReplyMessage,2
-fromData,40,2a2bb700542a2bb900550100b500062a2bb80056b500022a2bb80057b500582a2bb80059b50001b1
-toData,40,2a2bb7004f2b2ab40006b9005002002ab400022bb800312ab400072bb800512ab400012bb80052b1
+fromData,40,2a2bb700552a2bb900560100b500062a2bb80057b500022a2bb80058b500592a2bb8005ab50001b1
+toData,40,2a2bb700502b2ab40006b9005102002ab400022bb800322ab400072bb800522ab400012bb80053b1
com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage,2
fromData,16,2a2bb7002e2a2bb9002f0100b50004b1
@@ -1596,8 +1596,8 @@ fromData,74,2a2bb700522a2bb900530100b500062a2bb900530100b500072a2bb900530100b500
toData,74,2a2bb7004d2b2ab40006b9004e02002b2ab40007b9004e02002b2ab40008b9004e02002b2ab40009b9004e02002b2ab4000ab9004f02002ab4000b2bb800502b2ab40001b9004f0200b1
com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage,2
-fromData,14,2a2bb7003b2a2bb8003cb50005b1
-toData,14,2a2bb7003e2ab400052bb8003fb1
+fromData,14,2a2bb7003a2a2bb8003bb50004b1
+toData,14,2a2bb7003d2ab400042bb8003eb1
com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage$FetchEntryReplyMessage,2
fromData,58,2a2bb700202bb9002101003d1c9a002c2ab40003b80022c000234e2dc7000dbb0024591225b70026bf2abb0027592b2db40028b70029b50004b1
@@ -1624,8 +1624,8 @@ fromData,36,2a2bb700252a2bb900260100b500022a2bb900260100b500032a2bb900260100b500
toData,36,2a2bb700272b2ab40002b9002802002b2ab40003b9002802002b2ab40004b900280200b1
com/gemstone/gemfire/internal/cache/partitioned/GetMessage,2
-fromData,43,2a2bb700542a2bb80055b500052a2bb80055b500062a2bb80055c00056b500072a2bb900570100b50008b1
-toData,40,2a2bb700582ab400052bb800592ab400062bb800592ab400072bb800592b2ab40008b9005a0200b1
+fromData,43,2a2bb700532a2bb80054b500042a2bb80054b500052a2bb80054c00055b500062a2bb900560100b50007b1
+toData,40,2a2bb700572ab400042bb800582ab400052bb800582ab400062bb800582b2ab40007b900590200b1
com/gemstone/gemfire/internal/cache/partitioned/GetMessage$GetReplyMessage,2
fromData,77,2a2bb7002a2bb9002b01003d1c10087e99000704a7000403593e9900091c10f77e913d2a1cb500072a2bb8002cb5002d1c049f000b2a2bb8002eb5002f1d99000e2a2bb80030c00031b5000ab1
@@ -1712,8 +1712,8 @@ fromData,49,2a2bb700392a2bb8003ab500062a2bb9003b0100b8003cb500082a2bb8003ac0003d
toData,43,2a2bb7003f2ab700122bb800402b2ab40008b40041b9004202002ab4000a2bb800402ab4000c2bb80040b1
com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage,2
-fromData,58,2a2bb700742a2bb900750100b500052a2ab400052bb600762a2bb900770100b5000e2bb80078b20079b6007a9b000d2a2bb9007b0100b5000ab1
-toData,104,2a2bb7007f033d2a1cb600803d2b1cb9008102002ab4001099000d2b2ab40010b9008202002ab40008029f000d2b2ab40008b9008202002ab40006c6000b2ab400062bb800832b2ab4000eb9008202002bb80084b20079b6007a9b000d2b2ab4000ab900850200b1
+fromData,58,2a2bb7007b2a2bb9007c0100b500032a2ab400032bb6007d2a2bb9007e0100b5000c2bb8007fb20080b600819b000d2a2bb900820100b50008b1
+toData,104,2a2bb70088033d2a1cb600893d2b1cb9008a02002ab4000e99000d2b2ab4000eb9008b02002ab40006029f000d2b2ab40006b9008b02002ab40004c6000b2ab400042bb8008c2b2ab4000cb9008b02002bb8008db20080b600819b000d2b2ab40008b9008e0200b1
com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage,2
fromData,17,2a2bb7003c2a2bb8003dc0003eb50003b1
@@ -1728,16 +1728,16 @@ fromData,16,2a2bb700092a2bb9000a0100b50007b1
toData,16,2a2bb7000b2b2ab40007b9000c0200b1
com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage,2
-fromData,183,2a2bb7003f2a2bb8004088b80009b5000a2ab400411110007e99000e2a2bb80042c00043b5003d2a2bb80042b500102a2bb8004488b500052a2ab40005bd000bb5000c2ab400059e006f2bb800454dbb004659b700474e03360415042ab40005a2001d2ab4000c1504bb000b592b0115042c2db7004853840401a7ffe02bb9004901003604150499002f2bb8004a3a0503360615062ab40005a2001d2ab4000c15063219051506b6004bc0004cb5004d840601a7ffe0b1
-toData,210,2a2bb7004e2ab4000ac7000d14004f2bb80051a7000f2ab4000ab60052852bb800512ab4003dc6000b2ab4003d2bb800532ab400102bb800532ab40005852bb800542ab400059e008bbb0055592ab40005b700564d033e2ab4000c0332b60022c10057360403360515052ab40005a200531d9a00122ab4000c150532b4004dc60005043e2ab4000c150532b4004d3a062c1906b60058572ab4000c15053201b5004d2ab4000c1505322b1504b600592ab4000c1505321906b5004d840501a7ffaa2b1db9005a02001d9900082c2bb8005bb1
+fromData,183,2a2bb7003d2a2bb8003e88b80007b500082ab4003f1110007e99000e2a2bb80041c00042b5003b2a2bb80041b5000e2a2bb8004388b500032a2ab40003bd0009b5000a2ab400039e006f2bb800444dbb004559b700464e03360415042ab40003a2001d2ab4000a1504bb0009592b0115042c2db7004753840401a7ffe02bb9004801003604150499002f2bb800493a0503360615062ab40003a2001d2ab4000a15063219051506b6004ac0004bb5004c840601a7ffe0b1
+toData,210,2a2bb7004d2ab40008c7000d14004e2bb80050a7000f2ab40008b60051852bb800502ab4003bc6000b2ab4003b2bb800522ab4000e2bb800522ab40003852bb800532ab400039e008bbb0054592ab40003b700554d033e2ab4000a0332b60020c10056360403360515052ab40003a200531d9a00122ab4000a150532b4004cc60005043e2ab4000a150532b4004c3a062c1906b60057572ab4000a15053201b5004c2ab4000a1505322b1504b600582ab4000a1505321906b5004c840501a7ffaa2b1db9005902001d9900082c2bb8005ab1
com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage$PutAllReplyMessage,2
fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1
toData,24,2a2bb7001f2b2ab40003b9002002002ab400022bb80021b1
com/gemstone/gemfire/internal/cache/partitioned/PutMessage,2
-fromData,260,2a2bb7005d2bb9005e01003d2a2bb8005fb600602a2bb8005fb500172a2bb900610100b500182a2bb900620100b80063b500191cb200647e99000b2a2bb80065b5001a1cb200667e99000e2a2bb8005fc00067b5001c2abb006859b70069b5001d2ab4001d2bb8006a2ab4006b1120007e99000b2a2bb8005fb500222ab4006c9900162abb006d59b7006eb500282ab400282bb8006a2a1cb2006f7e91b500072ab4000999000e2a2bb80070b5000da7002e2ab4000704a0000e2a2bb8005fb70071a7000b2a2bb80070b700721cb200737e99000b2a2bb80070b5000d2ab4006b1140007e99000e2a2bb8005fc00074b500252ab4006b1180007e9900082a04b50075b1
-toData,358,014d2ab40021b60076b9007701003e2ab4000cb60078c600161d9900122ab4000b99000b2a04b50009a700082a03b50009a7000d4ebb007a592db7007bbf2a2bb7007c2ab400073e2ab4001ac600091db20064803e2ab400079900282ab40011c7000a2ab6007dc6001a2ab4007e9900132ab4000cb60078c600091db20073803e2ab4001cc600091db20066803e2b1db9007f02002ab600802bb800812ab600822bb800812b2ab40018b9008303002b2ab40019b40084b9007f02002ab4001ac6000b2ab4001a2bb800812ab4001cc6000b2ab4001c2bb800812ab4001d2bb800852ab40022c6000b2ab400222bb800812ab4006c99000b2ab400282bb800852ab4000999002f2ab40086b800874da7000f3a04bb008959128ab7008bbf2ab4000cb600782bb8008c2cb6008db6008ea700262ab400072ab400112ab6007d2bb8008f1db200737e99000e2ab4000cb600782bb8008c2ab40025c6000b2ab400252bb80081b1
+fromData,260,2a2bb7005c2bb9005d01003d2a2bb8005eb6005f2a2bb8005eb500152a2bb900600100b500162a2bb900610100b80062b500171cb200637e99000b2a2bb80064b500181cb200657e99000e2a2bb8005ec00066b5001a2abb006759b70068b5001b2ab4001b2bb800692ab4006a1120007e99000b2a2bb8005eb500202ab4006b9900162abb006c59b7006db500262ab400262bb800692a1cb2006e7e91b500052ab4000799000e2a2bb8006fb5000ba7002e2ab4000504a0000e2a2bb8005eb70070a7000b2a2bb8006fb700711cb200727e99000b2a2bb8006fb5000b2ab4006a1140007e99000e2a2bb8005ec00073b500232ab4006a1180007e9900082a04b50074b1
+toData,358,014d2ab4001fb60075b9007601003e2ab4000ab60077c600161d9900122ab4000999000b2a04b50007a700082a03b50007a7000d4ebb0079592db7007abf2a2bb7007b2ab400053e2ab40018c600091db20063803e2ab400059900282ab4000fc7000a2ab6007cc6001a2ab4007d9900132ab4000ab60077c600091db20072803e2ab4001ac600091db20065803e2b1db9007e02002ab6007f2bb800802ab600812bb800802b2ab40016b9008203002b2ab40017b40083b9007e02002ab40018c6000b2ab400182bb800802ab4001ac6000b2ab4001a2bb800802ab4001b2bb800842ab40020c6000b2ab400202bb800802ab4006b99000b2ab400262bb800842ab4000799002f2ab40085b800864da7000f3a04bb0088591289b7008abf2ab4000ab600772bb8008b2cb6008cb6008da700262ab400052ab4000f2ab6007c2bb8008e1db200727e99000e2ab4000ab600772bb8008b2ab40023c6000b2ab400232bb80080b1
com/gemstone/gemfire/internal/cache/partitioned/PutMessage$PutReplyMessage,2
fromData,48,2a2bb700252a2bb900260100b500032a2bb900270100b80028b500022a2bb80029b500062a2bb80029c0002ab50007b1
@@ -1772,8 +1772,8 @@ fromData,16,2a2bb7001e2a2bb9001f0100b50003b1
toData,16,2a2bb7001b2b2ab40003b9001c0200b1
com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage,2
-fromData,190,2a2bb7003e2a2bb8003f88b80009b5000a2ab400401110007e99000e2a2bb80041c00042b5003c2bb800434d2a2bb80041b500102a2bb8004488b500052a2ab40005bd000bb5000c2ab400059e00712bb800454ebb004659b700473a0403360515052ab40005a2001e2ab4000c1505bb000b592b0115052d1904b7004853840501a7ffdf2bb9004901003605150599002f2bb8004a3a0603360715072ab40005a2001d2ab4000c15073219061507b6004bc0004cb5004d840701a7ffe0b1
-toData,210,2a2bb7004e2ab4000ac7000d14004f2bb80051a7000f2ab4000ab60052852bb800512ab4003cc6000b2ab4003c2bb800532ab400102bb800532ab40005852bb800542ab400059e008bbb0055592ab40005b700564d033e2ab4000c0332b60021c10057360403360515052ab40005a200531d9a00122ab4000c150532b4004dc60005043e2ab4000c150532b4004d3a062c1906b60058572ab4000c15053201b5004d2ab4000c1505322b1504b600592ab4000c1505321906b5004d840501a7ffaa2b1db9005a02001d9900082c2bb8005bb1
+fromData,190,2a2bb7003c2a2bb8003d88b80007b500082ab4003e1110007e99000e2a2bb80040c00041b5003a2bb800424d2a2bb80040b5000e2a2bb8004388b500032a2ab40003bd0009b5000a2ab400039e00712bb800444ebb004559b700463a0403360515052ab40003a2001e2ab4000a1505bb0009592b0115052d1904b7004753840501a7ffdf2bb9004801003605150599002f2bb800493a0603360715072ab40003a2001d2ab4000a15073219061507b6004ac0004bb5004c840701a7ffe0b1
+toData,210,2a2bb7004d2ab40008c7000d14004e2bb80050a7000f2ab40008b60051852bb800502ab4003ac6000b2ab4003a2bb800522ab4000e2bb800522ab40003852bb800532ab400039e008bbb0054592ab40003b700554d033e2ab4000a0332b6001fc10056360403360515052ab40003a200531d9a00122ab4000a150532b4004cc60005043e2ab4000a150532b4004c3a062c1906b60057572ab4000a15053201b5004c2ab4000a1505322b1504b600582ab4000a1505321906b5004c840501a7ffaa2b1db9005902001d9900082c2bb8005ab1
com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage$RemoveAllReplyMessage,2
fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1
@@ -1796,8 +1796,8 @@ fromData,36,2a2bb700082a2bb900090100b500032a2bb9000a0100b500042a2bb9000a0100b500
toData,36,2a2bb7000b2b2ab40003b9000c02002b2ab40004b9000d02002b2ab40005b9000d0200b1
com/gemstone/gemfire/internal/cache/partitioned/SizeMessage,2
-fromData,14,2a2bb700362a2bb80037b50006b1
-toData,14,2a2bb700382ab400062bb80039b1
+fromData,14,2a2bb700352a2bb80036b50005b1
+toData,14,2a2bb700372ab400052bb80038b1
com/gemstone/gemfire/internal/cache/partitioned/SizeMessage$SizeReplyMessage,2
fromData,17,2a2bb7001d2a2bb8001ec0001fb50003b1
@@ -1904,8 +1904,8 @@ fromData,1,b1
toData,1,b1
com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID,2
-fromData,19,2a2bb8004fb500082a2bb900500100b5000ab1
-toData,19,2ab400082bb8004d2b2ab4000ab9004e0200b1
+fromData,19,2a2bb80051b500092a2bb900520100b5000bb1
+toData,19,2ab400092bb8004f2b2ab4000bb900500200b1
com/gemstone/gemfire/internal/cache/tier/sockets/ClientTombstoneMessage,2
fromData,63,2ab800222bb90023010032b500072a2bb900230100b80024b5001c2a2bb80025b6000a2a2bb80026b500082a2bb80027b500202a2bb80026c00028b50021b1
@@ -2001,8 +2001,8 @@ fromData,6,2a2bb7001fb1
toData,6,2a2bb7001db1
com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage,2
-fromData,14,2a2bb700582a2bb80059b50002b1
-toData,14,2a2bb700562ab400022bb80057b1
+fromData,14,2a2bb700592a2bb8005ab50002b1
+toData,14,2a2bb700572ab400022bb80058b1
com/gemstone/gemfire/internal/cache/wan/serial/BatchDestroyOperation$DestroyMessage,2
fromData,45,2a2bb700452a2bb80046c00047b500022a2bb80046b5000d2bb800484d2cb6004999000b2a2bb8004ab50005b1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
new file mode 100644
index 0000000..ceb7aa9
--- /dev/null
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
@@ -0,0 +1,189 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import com.gemstone.gemfire.DataSerializable;
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.CacheServiceProfile;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.lucene.analysis.Analyzer;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.*;
+
+public class LuceneIndexCreationProfile implements CacheServiceProfile, DataSerializable {
+
+ private String indexName;
+
+ private String[] fieldNames;
+
+ private Class<? extends Analyzer> analyzerClass;
+
+ private Map<String, Class<? extends Analyzer>> fieldAnalyzers;
+
+ /* Used by DataSerializer */
+ public LuceneIndexCreationProfile() {}
+
+ public LuceneIndexCreationProfile(String indexName, String[] fieldNames, Analyzer analyzer,
+ Map<String, Analyzer> fieldAnalyzers) {
+ this.indexName = indexName;
+ this.fieldNames = fieldNames;
+ this.analyzerClass = analyzer.getClass();
+ initializeFieldAnalyzers(fieldAnalyzers);
+ }
+
+ public String getIndexName() {
+ return this.indexName;
+ }
+
+ public String[] getFieldNames() {
+ return this.fieldNames;
+ }
+
+ public Class<? extends Analyzer> getAnalyzerClass() {
+ return this.analyzerClass;
+ }
+
+ public Map<String, Class<? extends Analyzer>> getFieldAnalyzers() {
+ return this.fieldAnalyzers;
+ }
+
+ protected void initializeFieldAnalyzers(Map<String, Analyzer> fieldAnalyzers) {
+ if (fieldAnalyzers != null && !fieldAnalyzers.isEmpty()) {
+ this.fieldAnalyzers = new HashMap<>();
+ for (Map.Entry<String, Analyzer> entry : fieldAnalyzers.entrySet()) {
+ // Null values are allowed in analyzers which means the default Analyzer is used
+ this.fieldAnalyzers.put(entry.getKey(), entry.getValue() == null ? null : entry.getValue().getClass());
+ }
+ }
+ }
+
+ @Override
+ public String getId() {
+ return this.indexName;
+ }
+
+ @Override
+ public String checkCompatibility(String regionPath, CacheServiceProfile profile) {
+ String result = null;
+ LuceneIndexCreationProfile myProfile = (LuceneIndexCreationProfile) profile;
+ if (myProfile == null) {
+ // TODO This can occur if one member defines no indexes but another one does. Currently this is caught by the async event id checks.
+ } else {
+ // Verify fields are the same
+ if (!Arrays.equals(myProfile.getFieldNames(), getFieldNames())) {
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELDS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELDS_3
+ .toString(myProfile.getIndexName(), regionPath, Arrays.toString(getFieldNames()),
+ Arrays.toString(myProfile.getFieldNames()));
+ }
+
+ // Verify the analyzer class is the same
+ // Note: This test will currently only fail if per-field analyzers are used in one member but not another,
+ // This condition will be caught in the tests below so this test is commented out. If we ever allow the user
+ // to configure a single analyzer for all fields, then this test will be useful again.
+ /*
+ if (!remoteLuceneIndexProfile.getAnalyzerClass().isInstance(getAnalyzer())) {
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3
+ .toString(indexName, regionPath, remoteLuceneIndexProfile.getAnalyzerClass().getName(), analyzer.getClass().getName());
+ }
+ */
+
+ // Verify the field analyzer fields and classes are the same if either member sets field analyzers
+ if (myProfile.getFieldAnalyzers() != null || getFieldAnalyzers() != null) {
+ // Check for one member defining field analyzers while the other member does not
+ if (myProfile.getFieldAnalyzers() == null) {
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_FIELD_ANALYZERS
+ .toString(myProfile.getIndexName(), regionPath, getFieldAnalyzers());
+ } else if (getFieldAnalyzers() == null) {
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_FIELD_ANALYZERS_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_2
+ .toString(myProfile.getIndexName(), regionPath, myProfile.getFieldAnalyzers());
+ } else {
+ // Both local and remote analyzers are set. Verify the sizes of the field analyzers are identical
+ if (myProfile.getFieldAnalyzers().size() != getFieldAnalyzers().size()) {
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_3
+ .toString(myProfile.getIndexName(), regionPath, getFieldAnalyzers(),
+ myProfile.getFieldAnalyzers());
+ }
+
+ // Iterate the existing analyzers and compare them to the input analyzers
+ // Note: This is currently destructive to the input field analyzers map which should be ok since its a transient object.
+ for (Iterator<Map.Entry<String, Class<? extends Analyzer>>> i = myProfile.getFieldAnalyzers().entrySet().iterator(); i.hasNext(); ) {
+ Map.Entry<String, Class<? extends Analyzer>> entry = i.next();
+ // Remove the existing field's analyzer from the input analyzers
+ Class<? extends Analyzer> analyzerClass = getFieldAnalyzers().remove(entry.getKey());
+
+ // Verify the input field analyzer matches the current analyzer
+ if (analyzerClass == null && entry.getValue() != null) {
+ // The input field analyzers do not include the existing field analyzer
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_ANALYZER_ON_FIELD_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3_ON_THAT_FIELD
+ .toString(myProfile.getIndexName(), regionPath, entry.getKey(), entry.getValue().getName());
+ break;
+ } else if (analyzerClass != null && entry.getValue() == null) {
+ // The existing field analyzers do not include the input field analyzer
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_ANALYZER_ON_THAT_FIELD
+ .toString(myProfile.getIndexName(), regionPath, analyzerClass.getName(), entry.getKey());
+ break;
+ } else {
+ if (analyzerClass != entry.getValue()) {
+ // The class of the input analyzer does not match the existing analyzer for the field
+ result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_4_ON_THAT_FIELD
+ .toString(myProfile.getIndexName(), regionPath, analyzerClass.getName(), entry.getKey(), entry.getValue().getName());
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public void toData(DataOutput out) throws IOException {
+ DataSerializer.writeString(this.indexName, out);
+ DataSerializer.writeStringArray(this.fieldNames, out);
+ DataSerializer.writeClass(this.analyzerClass, out);
+ DataSerializer.writeHashMap(this.fieldAnalyzers, out);
+ }
+
+ @Override
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ this.indexName = DataSerializer.readString(in);
+ this.fieldNames = DataSerializer.readStringArray(in);
+ this.analyzerClass = (Class<? extends Analyzer>) DataSerializer.readClass(in);
+ this.fieldAnalyzers = DataSerializer.readHashMap(in);
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append(getClass().getSimpleName())
+ .append("[")
+ .append("indexName=")
+ .append(this.indexName)
+ .append("; fieldNames=")
+ .append(Arrays.toString(this.fieldNames))
+ .append("; analyzerClass=")
+ .append(this.analyzerClass)
+ .append("; fieldAnalyzers=")
+ .append(this.fieldAnalyzers)
+ .append("]")
+ .toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 67edc6d..47c4d76 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -47,12 +47,12 @@ import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.xml.LuceneServiceXmlGenerator;
import com.gemstone.gemfire.internal.DSFIDFactory;
import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.cache.extension.Extensible;
import com.gemstone.gemfire.internal.cache.CacheService;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.RegionListener;
-import com.gemstone.gemfire.internal.cache.extension.Extensible;
import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogService;
@@ -65,10 +65,10 @@ import com.gemstone.gemfire.internal.logging.LogService;
*/
public class LuceneServiceImpl implements InternalLuceneService {
private static final Logger logger = LogService.getLogger();
-
+
private GemFireCacheImpl cache;
private final HashMap<String, LuceneIndex> indexMap = new HashMap<String, LuceneIndex>();;
-
+
public LuceneServiceImpl() {
}
@@ -116,7 +116,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
createIndex(indexName, regionPath, analyzer, fieldAnalyzers, fields);
}
- private void createIndex(final String indexName, String regionPath,
+ public void createIndex(final String indexName, String regionPath,
final Analyzer analyzer, final Map<String, Analyzer> fieldAnalyzers,
final String... fields) {
@@ -127,7 +127,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
if(region != null) {
throw new IllegalStateException("The lucene index must be created before region");
}
-
+
final String dataRegionPath = regionPath;
cache.addRegionListener(new RegionListener() {
@Override
@@ -142,6 +142,9 @@ public class LuceneServiceImpl implements InternalLuceneService {
af.addAsyncEventQueueId(aeqId);
updatedRA = af.create();
}
+
+ // Add index creation profile
+ internalRegionArgs.addCacheServiceProfile(new LuceneIndexCreationProfile(indexName, fields, analyzer, fieldAnalyzers));
}
return updatedRA;
}
@@ -284,7 +287,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
DSFIDFactory.registerDSFID(
DataSerializableFixedID.LUCENE_TOP_ENTRIES,
TopEntries.class);
-
+
DSFIDFactory.registerDSFID(
DataSerializableFixedID.LUCENE_TOP_ENTRIES_COLLECTOR,
TopEntriesCollector.class);
[30/55] [abbrv] incubator-geode git commit: GEODE-1377: Fixed Test
Posted by hi...@apache.org.
GEODE-1377: Fixed Test
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/05ed0167
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/05ed0167
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/05ed0167
Branch: refs/heads/feature/GEODE-1372
Commit: 05ed0167821fe16f77ba40447daaa721e71c04a2
Parents: 07ba286
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Jun 2 04:20:57 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../gemfire/management/internal/cli/help/utils/HelpUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05ed0167/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
index 5d74fa0..1d10fea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
@@ -75,7 +75,7 @@ public class HelpUtils {
public static Help getHelp(CommandTarget commandTarget) {
List<Block> blocks = new ArrayList<Block>();
// First we will have the block for NAME of the command
- blocks.add(block(NAME, row(commandTarget.getCommandName())));
+ blocks.add(block(NAME_NAME, row(commandTarget.getCommandName())));
// Now add synonyms if any
if (commandTarget.getSynonyms() != null) {
blocks.add(block(SYNONYMS_NAME, row(commandTarget.getSynonyms())));
@@ -187,7 +187,7 @@ public class HelpUtils {
public static NewHelp getNewHelp(CommandTarget commandTarget, boolean withinShell) {
DataNode root = new DataNode(null, new ArrayList<DataNode>());
// First we will have the block for NAME of the command
- DataNode name = new DataNode(NAME, new ArrayList<DataNode>());
+ DataNode name = new DataNode(NAME_NAME, new ArrayList<DataNode>());
name.addChild(new DataNode(commandTarget.getCommandName(), null));
root.addChild(name);
if (withinShell) {// include availabilty info
[40/55] [abbrv] incubator-geode git commit: GEODE-1468 client/server
messaging can create large objects
Posted by hi...@apache.org.
GEODE-1468 client/server messaging can create large objects
After a Message has been sent we invoke clear() on each Part contained by
the Message. This was nulling out the "part" variable of the Part objects
but if one of these "parts" was a HeapDataOutputStream it might hold a
list of large buffers. This change set alters Part to close these
streams so that their buffers can be cleared.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/61ad7e44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/61ad7e44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/61ad7e44
Branch: refs/heads/feature/GEODE-1372
Commit: 61ad7e4451aa5504c2f5d92b5d41ce1ffbcec239
Parents: 711fc35
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Jun 3 08:42:00 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Jun 3 08:43:59 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/HeapDataOutputStream.java | 5 ++-
.../internal/cache/tier/sockets/Message.java | 33 ++++++++++----------
.../internal/cache/tier/sockets/Part.java | 7 ++++-
.../cache/tier/sockets/MessageJUnitTest.java | 18 +++++++++++
4 files changed, 45 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61ad7e44/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
old mode 100644
new mode 100755
index 4bf39b6..eaad26e
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
@@ -366,7 +366,10 @@ public class HeapDataOutputStream extends OutputStream implements
public final void reset() {
this.size = 0;
- this.chunks = null;
+ if (this.chunks != null) {
+ this.chunks.clear();
+ this.chunks = null;
+ }
this.buffer.clear();
this.writeMode = true;
this.ignoreWrites = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61ad7e44/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
index 139ccde..459cf5f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
@@ -513,18 +513,21 @@ public class Message {
// Keep track of the fact that we are making progress.
this.sc.updateProcessingMessage();
}
- if (this.socket != null) {
+ if (this.socket == null) {
+ throw new IOException(LocalizedStrings.Message_DEAD_CONNECTION.toLocalizedString());
+ }
+ try {
final ByteBuffer cb = getCommBuffer();
if (cb == null) {
throw new IOException("No buffer");
}
int msgLen = 0;
- synchronized(cb) {
+ synchronized (cb) {
long totalPartLen = 0;
long headerLen = 0;
int partsToTransmit = this.numberOfParts;
-
- for (int i=0; i < this.numberOfParts; i++) {
+
+ for (int i = 0; i < this.numberOfParts; i++) {
Part part = this.partsList[i];
headerLen += PART_HEADER_SIZE;
totalPartLen += part.getLength();
@@ -540,27 +543,27 @@ public class Message {
partsToTransmit++;
}
- if ( (headerLen + totalPartLen) > Integer.MAX_VALUE ) {
- throw new MessageTooLargeException("Message size (" + (headerLen + totalPartLen)
+ if ((headerLen + totalPartLen) > Integer.MAX_VALUE) {
+ throw new MessageTooLargeException("Message size (" + (headerLen + totalPartLen)
+ ") exceeds maximum integer value");
}
-
- msgLen = (int)(headerLen + totalPartLen);
-
+
+ msgLen = (int) (headerLen + totalPartLen);
+
if (msgLen > MAX_MESSAGE_SIZE) {
throw new MessageTooLargeException("Message size (" + msgLen
+ ") exceeds gemfire.client.max-message-size setting (" + MAX_MESSAGE_SIZE + ")");
}
-
+
cb.clear();
packHeaderInfoForSending(msgLen, (securityPart != null));
- for (int i=0; i < partsToTransmit; i++) {
+ for (int i = 0; i < partsToTransmit; i++) {
Part part = (i == this.numberOfParts) ? securityPart : partsList[i];
if (cb.remaining() < PART_HEADER_SIZE) {
flushBuffer();
}
-
+
int partLen = part.getLength();
cb.putInt(partLen);
cb.put(part.getTypeCode());
@@ -586,13 +589,11 @@ public class Message {
this.os.flush();
}
}
- if(clearMessage) {
+ } finally {
+ if (clearMessage) {
clearParts();
}
}
- else {
- throw new IOException(LocalizedStrings.Message_DEAD_CONNECTION.toLocalizedString());
- }
}
protected void flushBuffer() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61ad7e44/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
index 5e52f96..1c3819e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
@@ -67,7 +67,12 @@ public class Part {
public void clear() {
- this.part = null;
+ if (this.part != null) {
+ if (this.part instanceof HeapDataOutputStream) {
+ ((HeapDataOutputStream)this.part).close();
+ }
+ this.part = null;
+ }
this.typeCode = BYTE_CODE;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61ad7e44/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
index 9f05aa7..24f665f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -102,6 +102,24 @@ public class MessageJUnitTest {
}
}
+ /**
+ * geode-1468: Message should clear the chunks in its Parts when
+ * performing cleanup.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void streamBuffersAreClearedDuringCleanup() throws Exception {
+ Part[] parts = new Part[2];
+ Part mockPart1 = mock(Part.class);
+ when(mockPart1.getLength()).thenReturn(100);
+ parts[0] = mockPart1;
+ parts[1] = mockPart1;
+ message.setParts(parts);
+ message.clearParts();
+ verify(mockPart1, times(2)).clear();
+ }
+
// TODO many more tests are needed
}
[29/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/07ba2864
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/07ba2864
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/07ba2864
Branch: refs/heads/feature/GEODE-1372
Commit: 07ba2864f4cbdb5f44ecf3e6b54da8feaa890cec
Parents: 690ca40
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Jun 1 20:22:59 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../internal/security/JSONAuthorization.java | 26 ++------------------
.../internal/security/MultiUserDUnitTest.java | 4 +--
2 files changed, 4 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07ba2864/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 2582bc1..8893a99 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
@@ -43,26 +43,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-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.internal.logging.LogService;
-import com.gemstone.gemfire.security.AccessControl;
-import com.gemstone.gemfire.security.AuthenticationFailedException;
-import com.gemstone.gemfire.security.Authenticator;
-import com.gemstone.gemfire.security.NotAuthorizedException;
-import com.gemstone.gemfire.util.test.TestUtil;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import javax.management.remote.JMXPrincipal;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.security.Principal;
-import java.util.*;
import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
@@ -116,10 +96,8 @@ public class JSONAuthorization implements AccessControl, Authenticator {
user.pwd = user.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));
+ for (JsonNode r : u.get(ROLES)) {
+ user.roles.add(roleMap.get(r.asText()));
}
acl.put(user.name, user);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07ba2864/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
index 010db07..c20f5df 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
@@ -51,8 +51,8 @@ public class MultiUserDUnitTest extends CliCommandTestBase {
public void testMultiUser() throws IOException, JSONException, InterruptedException {
Properties properties = new Properties();
properties.put(NAME, MultiUserDUnitTest.class.getSimpleName());
- properties.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, JSONAuthorization.class.getName() + ".create");
- properties.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
+ properties.put(SECURITY_CLIENT_AUTHENTICATOR, JSONAuthorization.class.getName() + ".create");
+ properties.put(SECURITY_CLIENT_ACCESSOR, JSONAuthorization.class.getName() + ".create");
// set up vm_0 the secure jmx manager
Object[] results = setUpJMXManagerOnVM(0, properties, "cacheServer.json");
[18/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
index c20f5df..fdaa75d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.management.internal.security;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.management.cli.Result.Status;
import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
@@ -42,7 +41,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category({ DistributedTest.class, SecurityTest.class })
public class MultiUserDUnitTest extends CliCommandTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
index 2887195..c0efddd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
@@ -18,12 +18,11 @@ package com.gemstone.gemfire.management.internal.security;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import org.junit.rules.ExternalResource;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class ShiroCacheStartRule extends ExternalResource {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
index 7a463d6..5a3d0a8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
@@ -45,8 +45,8 @@ import java.util.HashMap;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
index a9419cc..98aa90d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
@@ -30,7 +30,7 @@ import java.net.InetSocketAddress;
import java.util.concurrent.Future;
import java.util.logging.Logger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
index d9f3077..dc6bc07 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
@@ -39,7 +39,7 @@ import java.util.concurrent.Future;
import java.util.logging.Logger;
import java.util.logging.StreamHandler;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
index 0d60e81..63e7b3f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
@@ -29,7 +29,7 @@ import java.net.InetSocketAddress;
import java.util.Properties;
import java.util.concurrent.Future;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
index 37ab246..fccfbcf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
@@ -43,7 +43,7 @@ import java.net.URLClassLoader;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 4ae62da..90f51d9 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,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
index 6ae9d88..f1adbce 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.pdx;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
@@ -24,7 +23,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistributedSystemIdDUnitTest extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
index 35739ff..40a1071 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
@@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category;
import java.text.SimpleDateFormat;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index 1c4db64..0800dde 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -43,7 +43,7 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
index 4c0a2aa..4547e9c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
@@ -36,7 +36,7 @@ import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
index 5f5465f..d029557 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
@@ -34,7 +34,7 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
index de3a3bf..6027565 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
@@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category;
import java.io.*;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
index 0ae185a..aba891e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
@@ -37,7 +37,7 @@ import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
index b56bb01..418a819 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
@@ -37,7 +37,7 @@ import java.io.*;
import java.nio.ByteBuffer;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
index f847c19..f8b3806 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
@@ -32,7 +32,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 a1e8e04..6c64663 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
@@ -18,7 +18,7 @@ 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.DistributedSystemConfigProperties;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -32,7 +32,7 @@ import redis.clients.jedis.exceptions.JedisDataException;
import java.io.IOException;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
@@ -64,7 +64,7 @@ public class AuthJUnitTest {
cf.set(LOG_LEVEL, "error");
cf.set(MCAST_PORT, "0");
cf.set(LOCATORS, "");
- cf.set(SystemConfigurationProperties.REDIS_PASSWORD, PASSWORD);
+ cf.set(DistributedSystemConfigProperties.REDIS_PASSWORD, PASSWORD);
cache = cf.create();
server = new GemFireRedisServer("localhost", port);
server.start();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
index 6b91763..45bd1dd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertFalse;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 9c94abf..8b095a0 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
@@ -30,7 +30,7 @@ import redis.clients.jedis.Jedis;
import java.io.IOException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 6c9fcdc..4bfef66 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
@@ -32,7 +32,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 2ed26cf..f4a7308 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
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.redis;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.SocketCreator;
import com.gemstone.gemfire.test.dunit.*;
@@ -27,7 +27,7 @@ import redis.clients.jedis.Jedis;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class RedisDistDUnitTest extends DistributedTestCase {
@@ -80,8 +80,8 @@ public class RedisDistDUnitTest extends DistributedTestCase {
CacheFactory cF = new CacheFactory();
String locator = SocketCreator.getLocalHost().getHostName() + "[" + locatorPort + "]";
cF.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
- cF.set(SystemConfigurationProperties.REDIS_BIND_ADDRESS, localHost);
- cF.set(SystemConfigurationProperties.REDIS_PORT, "" + port);
+ cF.set(DistributedSystemConfigProperties.REDIS_BIND_ADDRESS, localHost);
+ cF.set(DistributedSystemConfigProperties.REDIS_PORT, "" + port);
cF.set(MCAST_PORT, "0");
cF.set(LOCATORS, locator);
cF.create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 850e68f..02a9d9f 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
@@ -33,7 +33,7 @@ import java.util.HashSet;
import java.util.Random;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 06c8596..7885fdf 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
@@ -32,7 +32,7 @@ import java.io.IOException;
import java.util.*;
import java.util.Map.Entry;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 54eeeee..600af1b 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
@@ -30,7 +30,7 @@ import redis.clients.jedis.Jedis;
import java.io.IOException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
index 1ee8768..c02a8bb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.Region;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR;
import static com.gemstone.gemfire.security.SecurityTestUtils.*;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
index 4131fd4..56dbd14 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
import java.util.*;
import java.util.concurrent.Callable;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static com.gemstone.gemfire.security.SecurityTestUtils.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index cd11c7a..b9d2d2d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -19,8 +19,8 @@
package com.gemstone.gemfire.security;
import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManagerHelper;
@@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category;
import javax.net.ssl.SSLHandshakeException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static com.gemstone.gemfire.security.SecurityTestUtils.startLocator;
@@ -92,9 +92,9 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "26753");
- props.setProperty(SystemConfigurationProperties.LOCATORS, getIPLiteral() + "[" + port + "]");
- props.setProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create");
- props.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(DistributedSystemConfigProperties.LOCATORS, getIPLiteral() + "[" + port + "]");
+ props.setProperty(DistributedSystemConfigProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create");
+ props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
try {
Locator.startLocatorAndDS(port, null, null, props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
index 56da24a..71a0e55 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
@@ -53,7 +53,7 @@ import java.util.*;
import java.util.concurrent.Callable;
import static com.gemstone.gemfire.cache30.ClientServerTestCase.configureConnectionPoolWithNameAndFactory;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static com.gemstone.gemfire.test.dunit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
index 582d084..502b765 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
@@ -29,7 +29,7 @@ import java.security.Principal;
import java.util.Properties;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class LdapUserCredentialGenerator extends CredentialGenerator {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 ab8890b..a15a3e3 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
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.security.generator;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.security.AuthenticationFailedException;
import org.apache.logging.log4j.Logger;
@@ -26,7 +25,7 @@ import java.io.IOException;
import java.security.Principal;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class SSLCredentialGenerator extends CredentialGenerator {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
index f4a5897..bc967db 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
@@ -29,7 +29,7 @@ import java.util.Properties;
import static org.junit.Assert.assertEquals;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* <code>DistributedTestUtils</code> provides static utility methods that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 373797c..425bd64 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,7 +16,7 @@
*/
package com.gemstone.gemfire.test.dunit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
index ea8e02c..bc74ec1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -42,7 +42,7 @@ import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This class is the base class for all distributed tests using JUnit 4 that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 8bb9b78..705fa4e 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,7 +16,7 @@
*/
package com.gemstone.gemfire.test.dunit.internal;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
import com.gemstone.gemfire.cache.Cache;
@@ -54,8 +54,8 @@ import java.io.Serializable;
import java.text.DecimalFormat;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 99990be..cb517bb 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,7 +50,7 @@ import java.rmi.server.UnicastRemoteObject;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* A class to build a fake test configuration and launch some DUnit VMS.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
index 4245baa..b191013 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
@@ -33,7 +33,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
index ed6fe0c..62feeb9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -23,7 +23,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
index bde503b..2bd1f75 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 deb3e76..5915eb7 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,7 +16,7 @@
*/
package com.gemstone.gemfire.test.golden;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.process.ProcessWrapper;
@@ -29,7 +29,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.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Test framework for launching processes and comparing output to expected golden output.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 02169be..645dd30 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,7 @@
*/
package com.gemstone.gemfire.test.process;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 1ba65ce..51c4d0d 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
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This is a member representing site 1 who wants to send data to site 2
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 c002a2c..afe22bb 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,7 +16,7 @@
*/
package com.main;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -24,7 +24,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.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is a stand alone locator with a distributed-system-id = -1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 b2d14b9..7f82750 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
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.wan.GatewayReceiver;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This is a member representing site 2 who wants to receive data from site 1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 8abaa9e..467af82 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.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This is a stand alone locator with a distributed-system-id = -2
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 f71e51b..ce67542 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
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(IntegrationTest.class)
public class CQJUnitTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 15dbbf6..b94c7e4 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
@@ -41,7 +41,7 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index e2f5d99..5c993ce 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -37,8 +37,8 @@ import com.gemstone.gemfire.test.dunit.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index faa7433..a4842de 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -40,8 +40,8 @@ import com.gemstone.gemfire.test.dunit.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 5f51611..b69d9ae 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
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
import com.gemstone.gemfire.cache.query.CqQuery;
import com.gemstone.gemfire.cache.query.dunit.CloseCacheAuthorization;
import com.gemstone.gemfire.cache.query.dunit.HelperTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.security.templates.DummyAuthenticator;
import com.gemstone.gemfire.security.templates.UserPasswordAuthInit;
@@ -27,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class CqStateDUnitTest extends HelperTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 3afa0a4..acede33 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
@@ -33,7 +33,7 @@ import hydra.Log;
import java.io.IOException;
import java.util.HashSet;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test class for Partitioned Region and CQs
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index 86a8324..ab4c203 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -41,8 +41,8 @@ import com.gemstone.gemfire.test.dunit.VM;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public abstract class PdxQueryCQTestBase extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 9d6c3cb..9d487dc 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
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import java.io.File;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class ClientSnapshotDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index cc7c7a1..8614a80 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -42,8 +42,8 @@ import java.io.DataOutput;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index a9ad6e5..c4d2a44 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -41,8 +41,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests putAll for c/s. Also tests removeAll
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 8e36e92..5c2f723 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
@@ -44,7 +44,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 43090f4..7e6d760 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -39,8 +39,8 @@ import java.io.File;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index a39543b..9837cf6 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -43,8 +43,8 @@ import java.io.IOException;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static com.gemstone.gemfire.test.dunit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 17e85ec..1da4e96 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -40,7 +40,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test client to server flow for delta propogation
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index 76aa0d9..acb4094 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -36,8 +36,8 @@ import com.gemstone.gemfire.test.dunit.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
@@ -232,7 +232,7 @@ public class DeltaPropagationWithCQDUnitTest extends DistributedTestCase {
cache = CacheFactory.create(ds);
assertNotNull(cache);
// Properties props = new Properties();
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10333");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10333");
// cache = new CacheFactory(props).create();
RegionFactory<Object, Object> rf = ((Cache)cache)
.createRegionFactory(RegionShortcut.REPLICATE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 160a460..1488bce 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -33,8 +33,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This tests the flag setting for region ( DataPolicy as Empty ) for
* Delta propogation for a client while registering CQ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 c1680f5..840f593 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,7 +41,7 @@ import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Class <code>DurableClientTestCase</code> tests durable client
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 bc83d7d..cab3849 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
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqService;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -41,7 +40,7 @@ import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Cache Server related management test cases
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 453ef21..129c146 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
@@ -58,7 +58,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
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;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 3042e76..c51f875 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
@@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
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;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index 8f8a2a7..2015ee4 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.security;
import com.gemstone.gemfire.DataSerializable;
import com.gemstone.gemfire.Instantiator;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.security.FilterPostAuthorization;
import com.gemstone.gemfire.internal.security.FilterPreAuthorization;
@@ -212,13 +212,13 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestCase {
private Properties buildProperties(final String authenticator, final Properties extraProps, final String preAccessor, final String postAccessor) {
Properties authProps = new Properties();
if (authenticator != null) {
- authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
+ authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
}
if (preAccessor != null) {
- authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_ACCESSOR, preAccessor);
+ authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR, preAccessor);
}
if (postAccessor != null) {
- authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor);
+ authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor);
}
if (extraProps != null) {
authProps.putAll(extraProps);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
index 28b3707..3ed8c1b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.query.CqAttributesFactory;
import com.gemstone.gemfire.cache.query.CqException;
import com.gemstone.gemfire.cache.query.CqQuery;
import com.gemstone.gemfire.cache.query.Query;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
import com.gemstone.gemfire.security.generator.CredentialGenerator;
@@ -297,7 +297,7 @@ public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase {
}
if (authenticator != null) {
- authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
+ authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
}
return SecurityTestUtils.createCacheServer(authProps, javaProps, dsPort, locatorString, 0, NO_EXCEPTION);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
index 9867325..7f26156 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.lucene;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -49,7 +49,7 @@ public class LuceneIndexCreationOffHeapIntegrationTest extends LuceneIntegration
@Override
protected CacheFactory getCacheFactory() {
CacheFactory factory = super.getCacheFactory();
- factory.set(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "100m");
+ factory.set(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "100m");
return factory;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
index cb51ff5..ff91873 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
@@ -23,11 +23,11 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import org.junit.After;
import org.junit.Before;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class LuceneIntegrationTest {
@@ -53,8 +53,8 @@ public class LuceneIntegrationTest {
protected CacheFactory getCacheFactory() {
CacheFactory cf = new CacheFactory();
cf.set(MCAST_PORT, "0");
- cf.set(SystemConfigurationProperties.LOCATORS, "");
- cf.set(SystemConfigurationProperties.LOG_LEVEL, System.getProperty("logLevel", "info"));
+ cf.set(DistributedSystemConfigProperties.LOCATORS, "");
+ cf.set(DistributedSystemConfigProperties.LOG_LEVEL, System.getProperty("logLevel", "info"));
return cf;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
index 1362a19..65e296d 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
@@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category;
import java.io.IOException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
index 67853f9..9ecaaa3 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 98675d0..da9735f 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
@@ -56,7 +56,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Microbenchmark of the IndexRepository to compare an
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
index 28a364d..8329a47 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
@@ -36,7 +36,7 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
import java.nio.charset.Charset;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 3205dd3..e88a3ee 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
@@ -47,7 +47,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
index dbac007..ce338d6 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
index 4d9e959..39c934d 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
@@ -44,7 +44,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class Server {
private static final String DEFAULT_HOST = "127.0.0.1"; //"localhost"
[54/55] [abbrv] incubator-geode git commit: GEODE-1464: fix
AnalyzeSerializablesJUnitTest
Posted by hi...@apache.org.
GEODE-1464: fix AnalyzeSerializablesJUnitTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/103a6bcd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/103a6bcd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/103a6bcd
Branch: refs/heads/feature/GEODE-1372
Commit: 103a6bcdf9932dfe0ed5c34c71d942db0e2e02e1
Parents: 880f864
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jun 7 10:01:28 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jun 7 10:01:28 2016 -0700
----------------------------------------------------------------------
.../sanctionedDataSerializables.txt | 40 ++++++++++----------
1 file changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/103a6bcd/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index 37eee1b..fdad3a8 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -947,8 +947,8 @@ fromData,14,2a2bb7001a2a2bb8001bb50004b1
toData,14,2a2bb700182ab400042bb80019b1
com/gemstone/gemfire/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
-fromData,318,2bb9009301003d2bb9009301003e2a1cb500942a1c2bb600952a2bb80096b500212a2bb900970100b80098b500072a1c1100807e99000704a7000403b500022a1c10087e99000704a7000403b500561c1102007e99000b2a2bb8009ab500862a1c1104007e99000704a7000403b500052a1c10407e99000704a7000403b5001b2ab4001b9900382bb900970100360415049a000b2a03b5001ca7001b150404a0000b2a04b5001ca7000dbb009b59129cb7009dbf2a2bb8009eb5001d1c1101007e99000704a700040336042a1c1108007e99000704a7000403b5009f15049900162abb00a059b700a1b5000c2ab4000c2bb800a21c1110007e99001c1c1120007e99000704a700040336052a15052bb800a3b500081d1104007e9900232a04b5000d2ac100a49900172ac000a41d1101007e99000704a7000403b600a5b1
-toData,202,033d033e2a1cb600a63d2a1db600a73e2b1cb900a802002b1db900a802002ab4000b9e000d2b2ab4000bb900a902002ab400212bb800aa2b2ab40007b400abb900ac02002ab40086c6000b2ab400862bb800ad2ab4001b9900542b2ab4001c99000704a7000403b900ac02002ab4001cb800ae36042ab4001c9a001f2ab4001dc1001e990015013a052ab4001dc0001ec0001e3a06a7000c2ab4001d3a05013a061504190519062bb800af2ab4000cc6000b2ab4000c2bb800b02ab40008c6000b2ab400082bb800b0b1
+fromData,291,2bb9009501003d2bb9009501003e2a1cb500962a1c2bb600972a2bb80098b500232a2bb900990100b8009ab500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009bb500882a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001d2ab4001d9900382bb900990100360415049a000b2a03b5001ea7001b150404a0000b2a04b5001ea7000dbb009c59129db7009ebf2a2bb8009fb5001f1c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a015049900162abb00a159b700a2b5000e2ab4000e2bb800a31c1110007e99001c1c1120007e99000704a700040336052a15052bb800a4b5000a1d1104007e9900082a04b5000fb1
+toData,202,033d033e2a1cb600a53d2a1db600a63e2b1cb900a702002b1db900a702002ab4000d9e000d2b2ab4000db900a802002ab400232bb800a92b2ab40009b400aab900ab02002ab40088c6000b2ab400882bb800ac2ab4001d9900542b2ab4001e99000704a7000403b900ab02002ab4001eb800ad36042ab4001e9a001f2ab4001fc10020990015013a052ab4001fc00020c000203a06a7000c2ab4001f3a05013a061504190519062bb800ae2ab4000ec6000b2ab4000e2bb800af2ab4000ac6000b2ab4000a2bb800afb1
com/gemstone/gemfire/internal/cache/DistributedClearOperation$ClearRegionMessage,2
fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1
@@ -966,8 +966,8 @@ com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
toData,229,2ab4000a4d2ab4000c4e2c2bb8003d2dc1003e9a00072dc700182b03b9003f02002dc0003ec0003e2bb80040a700312dc1004199001e2dc000413a042b04b9003f02001904b9004201002bb80040a7000f2b04b9003f02002d2bb800432b2ab40012b40044b9003f02002ab4000636042ab40026c6000a150407809136042ab40017c6001d15041008809136042ab40017c1004599000b150410208091360415041080809136042b1504b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllMessage,2
-fromData,197,2a2bb7003c2a2bb8003dc0003eb500052a2bb8003f88b500152a2ab40015bd0040b500062ab400159e00722bb800414dbb004259b700434e03360415042ab40015a200202ab400061504bb0040592b2ab4000515042c2db7004453840401a7ffdd2bb9004501003604150499002f2bb800463a0503360615062ab40015a2001d2ab4000615063219051506b60047c00048b5002e840601a7ffe02ab400491140007e99000e2a2bb8003dc0004bb5000b2a2ab400491180007e99000704a7000403b5001ab1
-toData,181,2a2bb7004c2ab400052bb8004d2ab40015852bb8004e2ab400159e008bbb004f592ab40015b700504d033e2ab400060332b40051c10024360403360515052ab40015a200531d9a00122ab40006150532b4002ec60005043e2ab40006150532b4002e3a062c1906b60052572ab4000615053201b5002e2ab400061505322b1504b600532ab400061505321906b5002e840501a7ffaa2b1db9005402001d9900082c2bb800552ab4000bc6000b2ab4000b2bb8004db1
+fromData,197,2a2bb7003a2a2bb8003bc0003cb500062a2bb8003d88b500162a2ab40016bd003eb500072ab400169e00722bb8003f4dbb004059b700414e03360415042ab40016a200202ab400071504bb003e592b2ab4000615042c2db7004253840401a7ffdd2bb9004301003604150499002f2bb800443a0503360615062ab40016a2001d2ab4000715063219051506b60045c00046b5002c840601a7ffe02ab400471140007e99000e2a2bb8003bc00048b5000c2a2ab400471180007e99000704a7000403b5001bb1
+toData,165,2a2bb700492ab400062bb8004a2ab40016852bb8004b2ab400169e007bbb004c592ab40016b7004d4d033e03360415042ab40016a200511d9a00122ab40007150432b4002cc60005043e2ab40007150432b4002c3a052c1905b6004e572ab4000715043201b5002c2ab400071504322bb6004f2ab400071504321905b5002c840401a7ffac2b1db9005002001d9900082c2bb800512ab4000cc6000b2ab4000c2bb8004ab1
com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage,2
fromData,171,2a2bb700612bb9006201003d1c047e9900142a2bb900640100b500082ab40008b800651c077e99000d2a2bb900640100b500051c057e99000e2a2bb80066c00067b500062bb800664e2dc100689900252a03b5000d2a2dc00068b80069b500072ab40007c7001b2a2dc00068b5004ca700102a2dc0006ab500072a04b5000d2a2bb80066c0006bb500092a2bb8006cb5000b2a2bb8006db5000a2a1c10407e99000704a7000403b5000cb1
@@ -978,8 +978,8 @@ com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllEntry
toData,136,2ab4000a4d2c2bb8003f2b2ab40010b40040b9004102002ab400063e2ab40022c600081d0780913e2ab40015c600191d100880913e2ab40015c100429900091d102080913e1d108080913e2b1db9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
-fromData,197,2a2bb700382a2bb80039c0003ab500032a2bb8003b88b500132a2ab40013bd003cb500042ab400139e00722bb8003d4dbb003e59b7003f4e03360415042ab40013a200202ab400041504bb003c592b2ab4000315042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40013a2001d2ab4000415063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00047b500092a2ab400451180007e99000704a7000403b50018b1
-toData,181,2a2bb700482ab400032bb800492ab40013852bb8004a2ab400139e008bbb004b592ab40013b7004c4d033e2ab400040332b4004dc10026360403360515052ab40013a200531d9a00122ab40004150532b4002bc60005043e2ab40004150532b4002b3a062c1906b6004e572ab4000415053201b5002b2ab400041505322b1504b6004f2ab400041505321906b5002b840501a7ffaa2b1db9005002001d9900082c2bb800512ab40009c6000b2ab400092bb80049b1
+fromData,197,2a2bb700382a2bb80039c0003ab500052a2bb8003b88b500152a2ab40015bd003cb500062ab400159e00722bb8003d4dbb003e59b7003f4e03360415042ab40015a200202ab400061504bb003c592b2ab4000515042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40015a2001d2ab4000615063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00046b5000b2a2ab400451180007e99000704a7000403b5001ab1
+toData,165,2a2bb700472ab400052bb800482ab40015852bb800492ab400159e007bbb004a592ab40015b7004b4d033e03360415042ab40015a200511d9a00122ab40006150432b4002bc60005043e2ab40006150432b4002b3a052c1905b6004c572ab4000615043201b5002b2ab400061504322bb6004d2ab400061504321905b5002b840401a7ffac2b1db9004e02001d9900082c2bb8004f2ab4000bc6000b2ab4000b2bb80048b1
com/gemstone/gemfire/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2
fromData,125,2a2bb700162ab800172bb90018010032b500192bb9001a01003d2abb001b591cb7001cb500112bb9001d01003e03360415041ca2003e1d990019bb001e59b7001f3a0619062bb8002019063a05a700092bb800213a052ab4001119052bb900220100b80023b90024030057840401a7ffc22a2bb80025c00026b50003b1
@@ -990,8 +990,8 @@ fromData,17,2a2bb80005b500022a2bb80005b50003b1
toData,17,2ab400022bb800042ab400032bb80004b1
com/gemstone/gemfire/internal/cache/EntryEventImpl,2
-fromData,214,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500092ab4001b2bb80016b600202a2bb80016c00021b5000a2bb9002201009900112a2bb80016c00023b50008a700322bb9002201009900212a2bb80024b500252a2ab40025b500062a2ab40025b80026b50005a7000b2a2bb80016b500052bb9002201009900192a2bb80024b500272a2ab40027b80026b50007a7000b2a2bb80016b500072a2bb80028b500292a2bb8002ab5000b2a2bb8002bb50014b1
-toData,312,2ab400182bb8015a2ab600882bb8015a2ab4001bb601872bb8015a2b2ab4001eb40188b9018902002b2ab4000911c03f7eb9018a02002ab600462bb8015a2ab4000a2bb8015a2ab40008c6000704a70004033d2b1cb9018b02001c99000e2ab400082bb8015aa700682ab6003c4e2dc1007e3604150499000e2dc0007eb900b4010036042b1504b9018b0200150499003b2ab40025c6000e2ab400252bb8018ca7002e2ab40006c6000e2ab400062bb8018ca7001c2dc0007e3a051905b900c201002bb8018da700082d2bb8015a2ab7003e4d2cc1007e3e1d99000d2cc0007eb900b401003e2b1db9018b02001d9900292ab40027c6000e2ab400272bb8018ca7001c2cc0007e3a041904b900c201002bb8018da700082c2bb8015a2ab40029c0018e2bb8018f2ab600542bb8015a2ab400142bb80190b1
+fromData,216,2a2bb80013c00014b500152bb800134d2bb800134e2abb0016592c2d01b70017b500182a2bb900190100b8001ab5001b2a2bb9001c0100b500082ab400182bb80013b6001d2a2bb80013c0001eb500092bb9001f0100990013b200209a003cbb0021591222b70023bf2bb9001f01009900212a2bb80024b500252a2ab40025b500062a2ab40025b80026b50005a7000b2a2bb80013b500052bb9001f01009900192a2bb80024b500272a2ab40027b80026b50007a7000b2a2bb80013b500072a2bb80028b500292a2bb8002ab5000a2a2bb8002bb50011b1
+toData,279,2ab400152bb801452ab600882bb801452ab40018b601722bb801452b2ab4001bb40173b9017402002b2ab4000811c03f7eb9017502002ab600462bb801452ab400092bb801452b03b9017602002ab6003c4d2cc1007e3e1d99000d2cc0007eb900a801003e2b1db9017602001d99003b2ab40025c6000e2ab400252bb80177a7002e2ab40006c6000e2ab400062bb80177a7001c2cc0007e3a041904b900b601002bb80178a700082c2bb801452ab7003e4d2cc1007e3e1d99000d2cc0007eb900a801003e2b1db9017602001d9900292ab40027c6000e2ab400272bb80177a7001c2cc0007e3a041904b900b601002bb80178a700082c2bb801452ab40029c001792bb8017a2ab600542bb801452ab400112bb8017bb1
com/gemstone/gemfire/internal/cache/EntrySnapshot,2
fromData,50,2a03b500052bb9004101003d1c9900112abb000759b70042b50004a7000e2abb000359b70043b500042ab400042bb60044b1
@@ -1235,16 +1235,16 @@ fromData,43,2a2bb7005c2a2bb9005d0100b5005e2a2ab4005e2bb6005f2a2bb80060b5000a2a2b
toData,103,2a2bb700622ab600633d2b1cb9006402002ab4000c99000d2b2ab4000cb9006502002ab4006699000d2b2ab40066b9006702002ab60015029f000d2b2ab60015b9006502002ab60016c6000b2ab600162bb800682ab4000a2bb800692b2ab40006b9006a0200b1
com/gemstone/gemfire/internal/cache/RemotePutAllMessage,2
-fromData,243,2a2bb700512a2bb80052c00053b500372a2bb80052b500392a2ab4005410087e99000704a7000403b500042ab4005410407e99000e2a2bb80052c00056b5004f2a2ab400541100807e99000704a7000403b500032a2ab400541101007e99000704a7000403b500022a2bb8005788b500062a2ab40006bd0058b500052ab400069e00722bb800594dbb005a59b7005b4e03360415042ab40006a200202ab400051504bb0058592b2ab4003715042c2db7005c53840401a7ffdd2bb9005d01003604150499002f2bb8005e3a0503360615062ab40006a2001d2ab4000515063219051506b6005fc0001eb5001f840601a7ffe0b1
-toData,189,2a2bb700602ab400372bb800612ab400392bb800612ab4004fc6000b2ab4004f2bb800612ab40006852bb800622ab400069e008bbb0063592ab40006b700644d033e2ab400050332b40065c10066360403360515052ab40006a200531d9a00122ab40005150532b4001fc60005043e2ab40005150532b4001f3a062c1906b60067572ab4000515053201b5001f2ab400051505322b1504b600682ab400051505321906b5001f840501a7ffaa2b1db9006902001d9900082c2bb8006ab1
+fromData,223,2a2bb700502a2bb80051c00052b500382a2bb80051b5003a2a2ab4005310087e99000704a7000403b500052ab4005310407e99000e2a2bb80051c00054b5004e2a2ab400531100807e99000704a7000403b500042a2bb8005588b500072a2ab40007bd0056b500062ab400079e00722bb800574dbb005859b700594e03360415042ab40007a200202ab400061504bb0056592b2ab4003815042c2db7005a53840401a7ffdd2bb9005b01003604150499002f2bb8005c3a0503360615062ab40007a2001d2ab4000615063219051506b6005dc0001fb50020840601a7ffe0b1
+toData,173,2a2bb7005e2ab400382bb8005f2ab4003a2bb8005f2ab4004ec6000b2ab4004e2bb8005f2ab40007852bb800602ab400079e007bbb0061592ab40007b700624d033e03360415042ab40007a200511d9a00122ab40006150432b40020c60005043e2ab40006150432b400203a052c1905b60063572ab4000615043201b500202ab400061504322bb600642ab400061504321905b50020840401a7ffac2b1db9006502001d9900082c2bb80066b1
com/gemstone/gemfire/internal/cache/RemotePutAllMessage$PutAllReplyMessage,2
fromData,17,2a2bb7001a2a2bb8001bc0001cb50001b1
toData,14,2a2bb7001d2ab400012bb8001eb1
com/gemstone/gemfire/internal/cache/RemotePutMessage,2
-fromData,242,2a2bb700742a2bb80075b600762bb9007701003d2a1cb200787e91b500052a2bb80075b500202a2bb900790100b500212a2bb9007a0100b8007bb500231cb2007c7e99000e2a2bb80075c0007db500251cb2007e7e99000e2a2bb80075c0003fb5007f2abb008059b70081b500272ab400272bb800822ab400831120007e99000b2a2bb80075b5000f2ab4000899001e2a2bb9007a010004a0000704a7000403b500062a2bb80084b700852ab4000504a0000e2a2bb80075b70086a7000b2a2bb80084b700872ab400831104007e9900102a04b5000a2a2bb80084b500881cb200897e99000e2a2bb80075c0008ab5002cb1
-toData,252,2a03b500092a2bb7008c2ab6008d2bb8008e2ab400053d2ab40025c600091cb2007c803d2ab4007fc600091cb2007e803d2ab4002cc600091cb20089803d2b1cb9008f02002ab600902bb8008e2b2ab40021b9009103002b2ab40023b40092b9008f02002ab40025c6000b2ab400252bb8008e2ab4007fc6000b2ab4007f2bb8008e2ab400272bb800932ab4000fc6000b2ab4000f2bb8008e2ab4000899002a2b2ab4000699000704a7000403b9008f02002ab40006b800943e1d2ab700952ab600962bb800972ab400052ab400712ab600982bb800972ab4000cb60099c6000e2ab4000cb600992bb8009a2ab4002cc6000b2ab4002c2bb8008eb1
+fromData,223,2a2bb700732a2bb80074b600752bb9007601003d2a1cb200777e91b500072a2bb80074b500202a2bb900780100b500212a2bb900790100b8007ab500231cb2007b7e99000e2a2bb80074c0007cb500251cb2007d7e99000e2a2bb80074c0003fb5007e2abb007f59b70080b500272ab400272bb800812ab400821120007e99000b2a2bb80074b500112ab4000a99001e2a2bb90079010004a0000704a7000403b500082a2bb80083b700842a2bb80083b700852ab400821104007e9900102a04b5000c2a2bb80083b500861cb200877e99000e2a2bb80074c00088b5002cb1
+toData,252,2a03b5000b2a2bb7008a2ab6008b2bb8008c2ab400073d2ab40025c600091cb2007b803d2ab4007ec600091cb2007d803d2ab4002cc600091cb20087803d2b1cb9008d02002ab6008e2bb8008c2b2ab40021b9008f03002b2ab40023b40090b9008d02002ab40025c6000b2ab400252bb8008c2ab4007ec6000b2ab4007e2bb8008c2ab400272bb800912ab40011c6000b2ab400112bb8008c2ab4000a99002a2b2ab4000899000704a7000403b9008d02002ab40008b800923e1d2ab700932ab600942bb800952ab400072ab400702ab600962bb800952ab4000eb60097c6000e2ab4000eb600972bb800982ab4002cc6000b2ab4002c2bb8008cb1
com/gemstone/gemfire/internal/cache/RemotePutMessage$PutReplyMessage,2
fromData,81,2a2bb700262bb9002701001100ff7e913d2a1c047e99000704a7000403b500032a2bb900270100b80028b500022a2bb80029b500061c057e9900181c077e99000704a70004033e2a1d2bb8002ab50007b1
@@ -1259,8 +1259,8 @@ fromData,6,2a2bb70014b1
toData,6,2a2bb70015b1
com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage,2
-fromData,203,2a2bb7004d2a2bb8004ec0004fb500352a2bb8004eb500372a2ab4005010087e99000704a7000403b500022ab4005010407e99000e2a2bb8004ec00052b5004b2a2bb8005388b500042a2ab40004bd0054b500032ab400049e00722bb800554dbb005659b700574e03360415042ab40004a200202ab400031504bb0054592b2ab4003515042c2db7005853840401a7ffdd2bb9005901003604150499002f2bb8005a3a0503360615062ab40004a2001d2ab4000315063219051506b6005bc0001cb5001d840601a7ffe0b1
-toData,189,2a2bb7005c2ab400352bb8005d2ab400372bb8005d2ab4004bc6000b2ab4004b2bb8005d2ab40004852bb8005e2ab400049e008bbb005f592ab40004b700604d033e2ab400030332b40061c10062360403360515052ab40004a200531d9a00122ab40003150532b4001dc60005043e2ab40003150532b4001d3a062c1906b60063572ab4000315053201b5001d2ab400031505322b1504b600642ab400031505321906b5001d840501a7ffaa2b1db9006502001d9900082c2bb80066b1
+fromData,203,2a2bb7004e2a2bb8004fc00050b500362a2bb8004fb500382a2ab4005110087e99000704a7000403b500032ab4005110407e99000e2a2bb8004fc00052b5004c2a2bb8005388b500052a2ab40005bd0054b500042ab400059e00722bb800554dbb005659b700574e03360415042ab40005a200202ab400041504bb0054592b2ab4003615042c2db7005853840401a7ffdd2bb9005901003604150499002f2bb8005a3a0503360615062ab40005a2001d2ab4000415063219051506b6005bc0001db5001e840601a7ffe0b1
+toData,173,2a2bb7005c2ab400362bb8005d2ab400382bb8005d2ab4004cc6000b2ab4004c2bb8005d2ab40005852bb8005e2ab400059e007bbb005f592ab40005b700604d033e03360415042ab40005a200511d9a00122ab40004150432b4001ec60005043e2ab40004150432b4001e3a052c1905b60061572ab4000415043201b5001e2ab400041504322bb600622ab400041504321905b5001e840401a7ffac2b1db9006302001d9900082c2bb80064b1
com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage$RemoveAllReplyMessage,2
fromData,17,2a2bb7001a2a2bb8001bc0001cb50001b1
@@ -1729,16 +1729,16 @@ fromData,16,2a2bb700092a2bb9000a0100b50007b1
toData,16,2a2bb7000b2b2ab40007b9000c0200b1
com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage,2
-fromData,183,2a2bb7003d2a2bb8003e88b80007b500082ab4003f1110007e99000e2a2bb80041c00042b5003b2a2bb80041b5000e2a2bb8004388b500032a2ab40003bd0009b5000a2ab400039e006f2bb800444dbb004559b700464e03360415042ab40003a2001d2ab4000a1504bb0009592b0115042c2db7004753840401a7ffe02bb9004801003604150499002f2bb800493a0503360615062ab40003a2001d2ab4000a15063219051506b6004ac0004bb5004c840601a7ffe0b1
-toData,210,2a2bb7004d2ab40008c7000d14004e2bb80050a7000f2ab40008b60051852bb800502ab4003bc6000b2ab4003b2bb800522ab4000e2bb800522ab40003852bb800532ab400039e008bbb0054592ab40003b700554d033e2ab4000a0332b60020c10056360403360515052ab40003a200531d9a00122ab4000a150532b4004cc60005043e2ab4000a150532b4004c3a062c1906b60057572ab4000a15053201b5004c2ab4000a1505322b1504b600582ab4000a1505321906b5004c840501a7ffaa2b1db9005902001d9900082c2bb8005ab1
+fromData,183,2a2bb7003e2a2bb8003f88b80009b5000a2ab400401110007e99000e2a2bb80041c00042b5003c2a2bb80041b500102a2bb8004388b500052a2ab40005bd000bb5000c2ab400059e006f2bb800444dbb004559b700464e03360415042ab40005a2001d2ab4000c1504bb000b592b0115042c2db7004753840401a7ffe02bb9004801003604150499002f2bb800493a0503360615062ab40005a2001d2ab4000c15063219051506b6004ac0004bb5004c840601a7ffe0b1
+toData,194,2a2bb7004d2ab4000ac7000d14004e2bb80050a7000f2ab4000ab60051852bb800502ab4003cc6000b2ab4003c2bb800522ab400102bb800522ab40005852bb800532ab400059e007bbb0054592ab40005b700554d033e03360415042ab40005a200511d9a00122ab4000c150432b4004cc60005043e2ab4000c150432b4004c3a052c1905b60056572ab4000c15043201b5004c2ab4000c1504322bb600572ab4000c1504321905b5004c840401a7ffac2b1db9005802001d9900082c2bb80059b1
com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage$PutAllReplyMessage,2
fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1
toData,24,2a2bb7001f2b2ab40003b9002002002ab400022bb80021b1
com/gemstone/gemfire/internal/cache/partitioned/PutMessage,2
-fromData,260,2a2bb7005c2bb9005d01003d2a2bb8005eb6005f2a2bb8005eb500152a2bb900600100b500162a2bb900610100b80062b500171cb200637e99000b2a2bb80064b500181cb200657e99000e2a2bb8005ec00066b5001a2abb006759b70068b5001b2ab4001b2bb800692ab4006a1120007e99000b2a2bb8005eb500202ab4006b9900162abb006c59b7006db500262ab400262bb800692a1cb2006e7e91b500052ab4000799000e2a2bb8006fb5000ba7002e2ab4000504a0000e2a2bb8005eb70070a7000b2a2bb8006fb700711cb200727e99000b2a2bb8006fb5000b2ab4006a1140007e99000e2a2bb8005ec00073b500232ab4006a1180007e9900082a04b50074b1
-toData,358,014d2ab4001fb60075b9007601003e2ab4000ab60077c600161d9900122ab4000999000b2a04b50007a700082a03b50007a7000d4ebb0079592db7007abf2a2bb7007b2ab400053e2ab40018c600091db20063803e2ab400059900282ab4000fc7000a2ab6007cc6001a2ab4007d9900132ab4000ab60077c600091db20072803e2ab4001ac600091db20065803e2b1db9007e02002ab6007f2bb800802ab600812bb800802b2ab40016b9008203002b2ab40017b40083b9007e02002ab40018c6000b2ab400182bb800802ab4001ac6000b2ab4001a2bb800802ab4001b2bb800842ab40020c6000b2ab400202bb800802ab4006b99000b2ab400262bb800842ab4000799002f2ab40085b800864da7000f3a04bb0088591289b7008abf2ab4000ab600772bb8008b2cb6008cb6008da700262ab400052ab4000f2ab6007c2bb8008e1db200727e99000e2ab4000ab600772bb8008b2ab40023c6000b2ab400232bb80080b1
+fromData,225,2a2bb7005b2bb9005c01003d2a2bb8005db6005e2a2bb8005db500172a2bb9005f0100b500182a2bb900600100b80061b500191cb200627e99000b2a2bb80063b5001a1cb200647e99000e2a2bb8005dc00065b5001c2abb006659b70067b5001d2ab4001d2bb800682ab400691120007e99000b2a2bb8005db500222ab4006a9900162abb006b59b7006cb500282ab400282bb800682a1cb2006d7e91b500072ab4000999000e2a2bb8006eb5000da7001b2a2bb8006eb7006f1cb200707e99000b2a2bb8006eb5000d2ab400691140007e99000e2a2bb8005dc00071b50025b1
+toData,358,014d2ab40021b60072b9007301003e2ab4000cb60074c600161d9900122ab4000b99000b2a04b50009a700082a03b50009a7000d4ebb0076592db70077bf2a2bb700782ab400073e2ab4001ac600091db20062803e2ab400079900282ab40011c7000a2ab60079c6001a2ab4007a9900132ab4000cb60074c600091db20070803e2ab4001cc600091db20064803e2b1db9007b02002ab6007c2bb8007d2ab6007e2bb8007d2b2ab40018b9007f03002b2ab40019b40080b9007b02002ab4001ac6000b2ab4001a2bb8007d2ab4001cc6000b2ab4001c2bb8007d2ab4001d2bb800812ab40022c6000b2ab400222bb8007d2ab4006a99000b2ab400282bb800812ab4000999002f2ab40082b800834da7000f3a04bb0085591286b70087bf2ab4000cb600742bb800882cb60089b6008aa700262ab400072ab400112ab600792bb8008b1db200707e99000e2ab4000cb600742bb800882ab40025c6000b2ab400252bb8007db1
com/gemstone/gemfire/internal/cache/partitioned/PutMessage$PutReplyMessage,2
fromData,48,2a2bb700252a2bb900260100b500032a2bb900270100b80028b500022a2bb80029b500062a2bb80029c0002ab50007b1
@@ -1773,8 +1773,8 @@ fromData,16,2a2bb7001e2a2bb9001f0100b50003b1
toData,16,2a2bb7001b2b2ab40003b9001c0200b1
com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage,2
-fromData,190,2a2bb7003c2a2bb8003d88b80007b500082ab4003e1110007e99000e2a2bb80040c00041b5003a2bb800424d2a2bb80040b5000e2a2bb8004388b500032a2ab40003bd0009b5000a2ab400039e00712bb800444ebb004559b700463a0403360515052ab40003a2001e2ab4000a1505bb0009592b0115052d1904b7004753840501a7ffdf2bb9004801003605150599002f2bb800493a0603360715072ab40003a2001d2ab4000a15073219061507b6004ac0004bb5004c840701a7ffe0b1
-toData,210,2a2bb7004d2ab40008c7000d14004e2bb80050a7000f2ab40008b60051852bb800502ab4003ac6000b2ab4003a2bb800522ab4000e2bb800522ab40003852bb800532ab400039e008bbb0054592ab40003b700554d033e2ab4000a0332b6001fc10056360403360515052ab40003a200531d9a00122ab4000a150532b4004cc60005043e2ab4000a150532b4004c3a062c1906b60057572ab4000a15053201b5004c2ab4000a1505322b1504b600582ab4000a1505321906b5004c840501a7ffaa2b1db9005902001d9900082c2bb8005ab1
+fromData,190,2a2bb7003e2a2bb8003f88b80009b5000a2ab400401110007e99000e2a2bb80041c00042b5003c2bb800434d2a2bb80041b500102a2bb8004488b500052a2ab40005bd000bb5000c2ab400059e00712bb800454ebb004659b700473a0403360515052ab40005a2001e2ab4000c1505bb000b592b0115052d1904b7004853840501a7ffdf2bb9004901003605150599002f2bb8004a3a0603360715072ab40005a2001d2ab4000c15073219061507b6004bc0004cb5004d840701a7ffe0b1
+toData,194,2a2bb7004e2ab4000ac7000d14004f2bb80051a7000f2ab4000ab60052852bb800512ab4003cc6000b2ab4003c2bb800532ab400102bb800532ab40005852bb800542ab400059e007bbb0055592ab40005b700564d033e03360415042ab40005a200511d9a00122ab4000c150432b4004dc60005043e2ab4000c150432b4004d3a052c1905b60057572ab4000c15043201b5004d2ab4000c1504322bb600582ab4000c1504321905b5004d840401a7ffac2b1db9005902001d9900082c2bb8005ab1
com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage$RemoveAllReplyMessage,2
fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1
[20/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
index 7023a9b..4b31e49 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
@@ -30,8 +30,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* The Region Destroy Operation from Cache Client does not pass the Client side
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 6b3dcaa..14acf01 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -32,8 +32,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Bug Test for bug#36457
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
index 9bdb1e1..e53a1e0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -29,8 +29,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* bug test for bug 36805
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 f702d85..71c15d9 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
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class Bug36829DUnitTest extends DistributedTestCase {
private VM serverVM;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
index d841c22..ba57fb9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
@@ -31,8 +31,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class Bug36995DUnitTest extends DistributedTestCase
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 53d1aba..2fe3d67 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -30,8 +30,8 @@ import java.util.Iterator;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This tests the fix for bug 73210. Reason for the bug was that HARegionQueue's
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 32c27fe..d6905d9 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
@@ -33,7 +33,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index 398cee4..893354c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
@@ -36,8 +36,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 329bb0f..bae4e50 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,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.client.*;
@@ -42,8 +42,8 @@ import java.util.Iterator;
import java.util.LinkedList;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index e80a115..e416b3c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -30,8 +30,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests behaviour of transactions in client server model
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index 59fe5f9..8e25607 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -37,8 +37,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is the DUnit Test to verify clear and DestroyRegion operation in
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 a7cbe97..e05f9ff 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,7 +34,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This test verifies the per-client queue conflation override functionality
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index 1014063..0401f33 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -41,8 +41,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index ee10b2e..7e51fe4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -33,7 +33,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This test verifies the per-client notify-by-subscription (NBS) override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
index 23a4e2a..04a8568 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
@@ -40,8 +40,8 @@ import java.util.Properties;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.jayway.awaitility.Awaitility.with;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 0fd1bb4..d91e3f5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -40,8 +40,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests client server corner cases between Region and Pool
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index 4fb939c..0ab0116 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -33,8 +33,8 @@ import java.util.HashMap;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This test verifies the conflation functionality of the
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index 47d82a4..8cedd46 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -45,8 +45,8 @@ import org.junit.experimental.categories.Category;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index d469ec2..ba08e33 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -38,8 +38,8 @@ import java.io.DataOutput;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index cf1102a..592b179 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -39,8 +39,8 @@ import java.util.Iterator;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests propagation of destroy entry operation across the vms
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 7af3004..fb5a60d 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
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DurableClientBug39997DUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 4e16cad..11a3e45 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.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 8568a57..e8b24cf 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,7 +32,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.net.SocketException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 dc04cc5..c2145b3 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
@@ -32,7 +32,7 @@ import java.util.ArrayList;
import java.util.Properties;
import java.util.concurrent.RejectedExecutionException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 bc55b8e..5710ad2 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,7 +34,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 887e374..12ad99d 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
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index d6f9a07..1b81297 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -28,8 +28,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Test to verify EventID generated from Cache Client is correctly passed on to
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index fcbaf83..f0daf23 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Runs force invalidate eviction tests with off-heap regions.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
index 4b84a11..7120f28 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -36,8 +36,8 @@ import com.gemstone.gemfire.test.dunit.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests Interest Registration Functionality
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 57dcd6c..dae8d2a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -37,8 +37,8 @@ import java.util.Iterator;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Test to verify Startup. and failover during startup.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 4aedd58..28f70b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -39,8 +39,8 @@ import java.io.IOException;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.unregisterInstantiatorsInThisVM;
public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 38b3f48..b756100 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -35,7 +35,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test Scenario :
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index 34b43d6..6213e85 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -34,8 +34,8 @@ import java.io.IOException;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index facc6d1..0a44d60 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -36,8 +36,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 8ab5f53..a2536c1 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
@@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Written to test fix for Bug #47132
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index 2234634..eaa8433 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -30,8 +30,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* DUnit Test for use-cases of various {@link InterestResultPolicy} types.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 72850e2..83a9689 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
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index edfa3e2..0d2c80a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -32,8 +32,8 @@ import com.gemstone.gemfire.test.dunit.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests Redundancy Level Functionality
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 0d231d6..193e329 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -28,8 +28,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Test to verify that client side region.close() should unregister the client with the server.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index dad45f5..7b8cd12 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -29,8 +29,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This test tests the scenario whereby a register interest has been called before
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index b3c5506..f22544b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -28,8 +28,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Test code copied from UpdatePropagationDUnitTest
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index 38be211..f4a4fa5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -37,8 +37,8 @@ import java.util.Iterator;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests the reliable messaging functionality - Client sends a periodic
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index ee88dea..a5059f7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -35,8 +35,8 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.ArrayList;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index 0b91136..54d993f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -40,8 +40,8 @@ import java.io.IOException;
import java.util.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static junit.framework.TestCase.assertNotNull;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index bb947d5..897cd87 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -31,8 +31,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* One Client , two servers.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
index bc558ef..1e48447 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -35,7 +35,6 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.cache.wan.*;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
@@ -54,7 +53,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class AsyncEventQueueTestBase extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index dbed7ad..5ef8909 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -36,7 +36,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index 19cd517..2a7e57f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 b0fd781..26832db 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
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests configured and badly configured cache.xml files with regards to compression.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
index 9d48c16..e42a801 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@SuppressWarnings("serial")
public class CompressionCacheListenerOffHeapDUnitTest extends
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
index 854cf27..7e15b12 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
public class CompressionRegionOperationsOffHeapDUnitTest extends
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 d1a9fe5..01343f5 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,12 +22,11 @@
*/
package com.gemstone.gemfire.internal.datasource;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
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;
@@ -42,8 +41,8 @@ import javax.transaction.xa.XAResource;
import java.sql.Connection;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 0f420ed..a9a20c0 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
@@ -33,7 +33,7 @@ import javax.naming.Context;
import java.sql.Connection;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.fail;
//import javax.sql.PooledConnection;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 e7d2541..c69ddf0 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
@@ -38,7 +38,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.fail;
/*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 2719b0b..15832d9 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
@@ -40,7 +40,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 6cbde69..8b6243d 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
@@ -30,7 +30,7 @@ import javax.naming.Context;
import java.sql.Connection;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.fail;
/*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 bdbfa29..03673bc 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
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
import javax.transaction.TransactionManager;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 df10833..ce54aa1 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
@@ -39,7 +39,7 @@ import java.sql.Statement;
import java.util.Properties;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertNotNull;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 c2bd884..bbec7c4 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
@@ -39,7 +39,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
index b7f2bcf..b1f6b1b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
@@ -36,7 +36,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This test case is to test the following test scenarios: 1) Get Simple DS
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
index 78426c6..c056a5d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
@@ -24,7 +24,7 @@ import org.junit.experimental.categories.Category;
import javax.transaction.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
index 58cde28..1ede356 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
@@ -32,7 +32,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(IntegrationTest.class)
public class GlobalTransactionJUnitTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
index 24b7aee..7795056 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
index 33df027..0468821 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
@@ -29,7 +29,7 @@ import javax.transaction.Synchronization;
import javax.transaction.UserTransaction;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
index fa91ce9..c4a344e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
@@ -27,7 +27,7 @@ import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
index 9ac3f39..548b9b1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
@@ -37,7 +37,7 @@ import java.sql.Statement;
import java.util.Properties;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
//import java.sql.SQLException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
index 6f78b0e..303d4f4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
@@ -29,7 +29,7 @@ import javax.transaction.Transaction;
import javax.transaction.UserTransaction;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
index f5cd573..117f3e3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -34,7 +34,7 @@ import java.io.*;
import java.sql.SQLException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class ExceptionsDUnitTest extends DistributedTestCase {
@@ -128,7 +128,7 @@ public class ExceptionsDUnitTest extends DistributedTestCase {
wr.close();
props.setProperty(CACHE_XML_FILE, path);
// String tableName = "";
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10339");
try {
// ds = DistributedSystem.connect(props);
ds = (new ExceptionsDUnitTest("temp")).getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
index fc6d02a..ff97dd2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -33,7 +33,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class IdleTimeOutDUnitTest extends DistributedTestCase {
@@ -131,7 +131,7 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
wr.close();
props.setProperty(CACHE_XML_FILE, path);
String tableName = "";
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10339");
try {
// ds = DistributedSystem.connect(props);
ds = (new IdleTimeOutDUnitTest("temp")).getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 7d66a41..5d058d1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -35,7 +35,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class LoginTimeOutDUnitTest extends DistributedTestCase {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index a6ce3bd..544463c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -33,7 +33,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class MaxPoolSizeDUnitTest extends DistributedTestCase {
@@ -129,7 +129,7 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
wr.close();
props.setProperty(CACHE_XML_FILE, path);
String tableName = "";
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10339");
try {
// ds = DistributedSystem.connect(props);
ds = (new MaxPoolSizeDUnitTest("temp")).getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 1d3dde8..38745ba 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -35,7 +35,7 @@ import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*This test tests TransactionTimeOut functionality
@@ -63,7 +63,7 @@ public class TransactionTimeOutDUnitTest extends DistributedTestCase {
wr.close();
props.setProperty(CACHE_XML_FILE, path);
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10321");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10321");
try {
// ds = DistributedSystem.connect(props);
ds = (new TransactionTimeOutDUnitTest("temp")).getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index 3cd06e5..439c961 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -37,7 +37,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This test case is to test the following test scenarios: 1) Behaviour of
@@ -187,7 +187,7 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
wr.close();
props.setProperty(CACHE_XML_FILE, path);
String tableName = "";
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10339");
try {
// ds = DistributedSystem.connect(props);
ds = (new TxnManagerMultiThreadDUnitTest("temp")).getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
index 6cb3ce5..10afad8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
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.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.test.dunit.*;
@@ -32,7 +31,7 @@ import java.io.*;
import java.sql.SQLException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*This test sees if the TransactionTimeOut works properly
@@ -60,7 +59,7 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
wr.flush();
wr.close();
props.setProperty(CACHE_XML_FILE, path);
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10321");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10321");
props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
try {
// ds = DistributedSystem.connect(props);
[04/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
index 4d69eb3..f0bbb9b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
@@ -35,8 +35,7 @@ import java.util.Arrays;
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.*;
/**
* Tests the GridAdvisor
@@ -77,81 +76,81 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
final Keeper bsKeeper4 = freeTCPPorts.get(5);
final int bsPort4 = bsKeeper4.getPort();
- final String host0 = NetworkUtils.getServerHostName(host);
- final String locators = host0 + "[" + port1 + "]" + ","
- + host0 + "[" + port2 + "]";
+ final String host0 = NetworkUtils.getServerHostName(host);
+ final String locators = host0 + "[" + port1 + "]" + ","
+ + host0 + "[" + port2 + "]";
final Properties dsProps = new Properties();
dsProps.setProperty(LOCATORS, locators);
dsProps.setProperty(MCAST_PORT, "0");
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
-
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+
keeper1.release();
vm0.invoke(new SerializableRunnable("Start locator on " + port1) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" + port1
- + ".log");
- try {
- Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port1, ex);
- }
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" + port1
+ + ".log");
+ try {
+ Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port1, ex);
}
- });
-
+ }
+ });
+
//try { Thread.currentThread().sleep(4000); } catch (InterruptedException ie) { }
-
+
keeper2.release();
vm3.invoke(new SerializableRunnable("Start locators on " + port2) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" +
- port2 + ".log");
- try {
- Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" +
+ port2 + ".log");
+ try {
+ Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port2, ex);
- }
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port2, ex);
}
- });
+ }
+ });
SerializableRunnable connect =
- new SerializableRunnable("Connect to " + locators) {
+ new SerializableRunnable("Connect to " + locators) {
public void run() {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
CacheFactory.create(DistributedSystem.connect(props));
}
};
vm1.invoke(connect);
vm2.invoke(connect);
SerializableRunnable startBS1 =
- new SerializableRunnable("start bridgeServer on " + bsPort1) {
- public void run() {
- try {
- Cache c = CacheFactory.getAnyInstance();
- CacheServer bs = c.addCacheServer();
- bs.setPort(bsPort1);
- bs.setGroups(new String[] {"bs1Group1", "bs1Group2"});
- bs.start();
- } catch (IOException ex) {
- RuntimeException re = new RuntimeException();
- re.initCause(ex);
- throw re;
+ new SerializableRunnable("start bridgeServer on " + bsPort1) {
+ public void run() {
+ try {
+ Cache c = CacheFactory.getAnyInstance();
+ CacheServer bs = c.addCacheServer();
+ bs.setPort(bsPort1);
+ bs.setGroups(new String[] { "bs1Group1", "bs1Group2" });
+ bs.start();
+ } catch (IOException ex) {
+ RuntimeException re = new RuntimeException();
+ re.initCause(ex);
+ throw re;
+ }
}
- }
- };
- SerializableRunnable startBS3 =
+ };
+ SerializableRunnable startBS3 =
new SerializableRunnable("start bridgeServer on " + bsPort3) {
public void run() {
try {
Cache c = CacheFactory.getAnyInstance();
CacheServer bs = c.addCacheServer();
bs.setPort(bsPort3);
- bs.setGroups(new String[] {"bs3Group1", "bs3Group2"});
+ bs.setGroups(new String[] { "bs3Group1", "bs3Group2" });
bs.start();
} catch (IOException ex) {
RuntimeException re = new RuntimeException();
@@ -172,7 +171,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
Cache c = CacheFactory.getAnyInstance();
CacheServer bs = c.addCacheServer();
bs.setPort(bsPort2);
- bs.setGroups(new String[] {"bs2Group1", "bs2Group2"});
+ bs.setGroups(new String[] { "bs2Group1", "bs2Group2" });
bs.start();
} catch (IOException ex) {
RuntimeException re = new RuntimeException();
@@ -188,7 +187,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
Cache c = CacheFactory.getAnyInstance();
CacheServer bs = c.addCacheServer();
bs.setPort(bsPort4);
- bs.setGroups(new String[] {"bs4Group1", "bs4Group2"});
+ bs.setGroups(new String[] { "bs4Group1", "bs4Group2" });
bs.start();
} catch (IOException ex) {
RuntimeException re = new RuntimeException();
@@ -200,220 +199,220 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
// verify that locators know about each other
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
}
- });
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
+ }
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort1 + " and on " + bsPort3) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort2 + " and on " + bsPort4) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable stopBS =
- new SerializableRunnable("stop bridge server") {
+ new SerializableRunnable("stop bridge server") {
public void run() {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.stop();
}
};
vm1.invoke(stopBS);
-
+
// now check to see if everyone else noticed him going away
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
+ }
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
SerializableRunnable disconnect =
- new SerializableRunnable("Disconnect from " + locators) {
+ new SerializableRunnable("Disconnect from " + locators) {
public void run() {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
@@ -421,8 +420,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
DistributedSystem.connect(props).disconnect();
}
};
- SerializableRunnable stopLocator =
- new SerializableRunnable("Stop locator") {
+ SerializableRunnable stopLocator =
+ new SerializableRunnable("Stop locator") {
public void run() {
assertTrue(Locator.hasLocator());
Locator.getLocator().stop();
@@ -434,74 +433,74 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
// now make sure everyone else saw the locator go away
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(0, others.size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(0, others.size());
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- if (i == 0) {
- // skip this one since it is stopped
- continue;
- }
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ if (i == 0) {
+ // skip this one since it is stopped
+ continue;
+ }
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable restartBS =
- new SerializableRunnable("restart bridge server") {
+ new SerializableRunnable("restart bridge server") {
public void run() {
try {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.setHostnameForClients("nameForClients");
bs.start();
} catch (IOException ex) {
@@ -513,56 +512,57 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
};
// restart bridge server 1 and see if controller sees it
vm1.invoke(restartBS);
-
+
vm3.invoke(new SerializableRunnable("Verify bridge server restart ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- List others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertEquals("nameForClients", bsp.getHost());
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertFalse(bsp.getHost().equals("nameForClients"));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ List others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertEquals("nameForClients", bsp.getHost());
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertFalse(bsp.getHost().equals("nameForClients"));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm1.invoke(disconnect);
vm2.invoke(disconnect);
// now make sure controller saw all bridge servers stop
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- assertEquals(0, ca.fetchBridgeServers().size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ assertEquals(0, ca.fetchBridgeServers().size());
+ }
+ });
vm3.invoke(stopLocator);
}
+
public void test2by2usingGroups() throws Exception {
disconnectAllFromDS();
@@ -586,44 +586,44 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
final Keeper bsKeeper4 = freeTCPPorts.get(5);
final int bsPort4 = bsKeeper4.getPort();
- final String host0 = NetworkUtils.getServerHostName(host);
- final String locators = host0 + "[" + port1 + "]" + ","
- + host0 + "[" + port2 + "]";
+ final String host0 = NetworkUtils.getServerHostName(host);
+ final String locators = host0 + "[" + port1 + "]" + ","
+ + host0 + "[" + port2 + "]";
final Properties dsProps = new Properties();
dsProps.setProperty(LOCATORS, locators);
dsProps.setProperty(MCAST_PORT, "0");
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
-
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+
keeper1.release();
vm0.invoke(new SerializableRunnable("Start locators on " + port1) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" + port1
- + ".log");
- try {
- Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port1, ex);
- }
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" + port1
+ + ".log");
+ try {
+ Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port1, ex);
}
- });
-
+ }
+ });
+
//try { Thread.currentThread().sleep(4000); } catch (InterruptedException ie) { }
-
+
keeper2.release();
vm3.invoke(new SerializableRunnable("Start locators on " + port2) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" +
- port2 + ".log");
- try {
- Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" +
+ port2 + ".log");
+ try {
+ Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port2, ex);
- }
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port2, ex);
}
- });
+ }
+ });
vm1.invoke(new SerializableRunnable("Connect to " + locators) {
public void run() {
@@ -631,7 +631,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
props.setProperty(DistributionConfig.GROUPS_NAME, "bs1Group1, bs1Group2");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
CacheFactory.create(DistributedSystem.connect(props));
}
});
@@ -641,27 +641,27 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
props.setProperty(DistributionConfig.GROUPS_NAME, "bs2Group1, bs2Group2");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
CacheFactory.create(DistributedSystem.connect(props));
}
});
SerializableRunnable startBS1 =
- new SerializableRunnable("start bridgeServer on " + bsPort1) {
- public void run() {
- try {
- Cache c = CacheFactory.getAnyInstance();
- CacheServer bs = c.addCacheServer();
- bs.setPort(bsPort1);
- bs.start();
- } catch (IOException ex) {
- RuntimeException re = new RuntimeException();
- re.initCause(ex);
- throw re;
+ new SerializableRunnable("start bridgeServer on " + bsPort1) {
+ public void run() {
+ try {
+ Cache c = CacheFactory.getAnyInstance();
+ CacheServer bs = c.addCacheServer();
+ bs.setPort(bsPort1);
+ bs.start();
+ } catch (IOException ex) {
+ RuntimeException re = new RuntimeException();
+ re.initCause(ex);
+ throw re;
+ }
}
- }
- };
- SerializableRunnable startBS3 =
+ };
+ SerializableRunnable startBS3 =
new SerializableRunnable("start bridgeServer on " + bsPort3) {
public void run() {
try {
@@ -714,305 +714,305 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
// verify that locators know about each other
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
}
- });
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
+ }
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort1 + " and on " + bsPort3) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort2 + " and on " + bsPort4) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable stopBS =
- new SerializableRunnable("stop bridge server") {
+ new SerializableRunnable("stop bridge server") {
public void run() {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.stop();
}
};
vm1.invoke(stopBS);
-
+
// now check to see if everyone else noticed him going away
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
}
- });
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
+ }
+ }
+ });
SerializableRunnable disconnect =
- new SerializableRunnable("Disconnect from " + locators) {
+ new SerializableRunnable("Disconnect from " + locators) {
public void run() {
InternalDistributedSystem.getAnyInstance().disconnect();
}
};
- SerializableRunnable stopLocator =
- new SerializableRunnable("Stop locator") {
- public void run() {
- assertTrue(Locator.hasLocator());
- Locator.getLocator().stop();
- assertFalse(Locator.hasLocator());
- }
- };
+ SerializableRunnable stopLocator =
+ new SerializableRunnable("Stop locator") {
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ Locator.getLocator().stop();
+ assertFalse(Locator.hasLocator());
+ }
+ };
vm0.invoke(stopLocator);
// now make sure everyone else saw the locator go away
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(0, others.size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(0, others.size());
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- if (i == 0) {
- // skip this one since it is stopped
- continue;
- }
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ if (i == 0) {
+ // skip this one since it is stopped
+ continue;
+ }
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable restartBS =
- new SerializableRunnable("restart bridge server") {
+ new SerializableRunnable("restart bridge server") {
public void run() {
try {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.setHostnameForClients("nameForClients");
bs.start();
} catch (IOException ex) {
@@ -1024,54 +1024,54 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
};
// restart bridge server 1 and see if controller sees it
vm1.invoke(restartBS);
-
+
vm3.invoke(new SerializableRunnable("Verify bridge server restart ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- List others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertEquals("nameForClients", bsp.getHost());
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertFalse(bsp.getHost().equals("nameForClients"));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ List others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertEquals("nameForClients", bsp.getHost());
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertFalse(bsp.getHost().equals("nameForClients"));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm1.invoke(disconnect);
vm2.invoke(disconnect);
// now make sure controller saw all bridge servers stop
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- assertEquals(0, ca.fetchBridgeServers().size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ assertEquals(0, ca.fetchBridgeServers().size());
+ }
+ });
vm3.invoke(stopLocator);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
index cbba60b..aed01c1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.persistence.PersistentID;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.ClassBuilder;
import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.JarClassLoader;
@@ -36,6 +35,8 @@ import com.gemstone.gemfire.test.dunit.*;
import java.io.*;
import java.util.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Tests for the incremental backup feature.
*/
@@ -67,7 +68,7 @@ public class IncrementalBackupDUnitTest extends CacheTestCase {
private final SerializableRunnable createRegions = new SerializableRunnable() {
@Override
public void run() {
- Cache cache = getCache(new CacheFactory().set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()));
+ Cache cache = getCache(new CacheFactory().set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()));
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create("fooStore");
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create("barStore");
getRegionFactory(cache).setDiskStoreName("fooStore").create("fooRegion");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
index 4180a75..440bbf6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
@@ -34,8 +34,7 @@ import java.util.Properties;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-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.fail;
@@ -72,10 +71,10 @@ public class InterruptDiskJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "stats.gfs");
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "stats.gfs");
ds = DistributedSystem.connect(props);
cache = CacheFactory.create(ds);
File diskStore = new File("diskStore");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
index eaa6f57..95dd4a3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
@@ -30,7 +30,7 @@ public class InterruptsConserveSocketsFalseDUnitTest extends
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ props.setProperty(CONSERVE_SOCKETS, "false");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 6e59e06..4c3b709 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.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.internal.cache.lru.LRUStatistics;
import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,8 +29,7 @@ import org.junit.experimental.categories.Category;
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.*;
import static org.junit.Assert.*;
/**
@@ -82,7 +80,7 @@ public class LIFOEvictionAlgoEnabledRegionJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // to keep diskPerf logs smaller
+ props.setProperty(LOG_LEVEL, "info"); // to keep diskPerf logs smaller
distributedSystem = DistributedSystem.connect(props);
cache = CacheFactory.create(distributedSystem);
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index 4376c88..6fca17d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.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.internal.cache.lru.EnableLRU;
import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
import com.gemstone.gemfire.internal.cache.lru.LRUStatistics;
@@ -35,8 +34,7 @@ import java.io.File;
import java.util.Arrays;
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.*;
/**
@@ -95,7 +93,7 @@ public class LIFOEvictionAlgoMemoryEnabledRegionJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // to keep diskPerf logs smaller
+ props.setProperty(LOG_LEVEL, "info"); // to keep diskPerf logs smaller
distributedSystem = DistributedSystem.connect(props);
cache = CacheFactory.create(distributedSystem);
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
index 38123be..7f5f5b0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
@@ -25,7 +25,6 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.snapshot.RegionGenerator;
import com.gemstone.gemfire.cache.snapshot.RegionGenerator.RegionType;
import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -37,7 +36,7 @@ import java.io.FilenameFilter;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
@Category(IntegrationTest.class)
public class OfflineSnapshotJUnitTest {
@@ -122,7 +121,7 @@ public class OfflineSnapshotJUnitTest {
public void reset() {
CacheFactory cf = new CacheFactory()
.set(MCAST_PORT, "0")
- .set(DistributionConfig.LOG_LEVEL_NAME, "error")
+ .set(LOG_LEVEL, "error")
.setPdxSerializer(new MyPdxSerializer())
.setPdxPersistent(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
index b0e1fe6..6a6e2ba 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
@@ -37,7 +37,7 @@ public class PartitionedRegionAPIConserveSocketsFalseDUnitTest extends
public Properties getDistributedSystemProperties()
{
Properties ret = new Properties();
- ret.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ ret.setProperty(CONSERVE_SOCKETS, "false");
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
index 25aeccb..5621829 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
@@ -20,11 +20,12 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import java.util.Properties;
/**
@@ -50,7 +51,7 @@ public class PartitionedRegionCacheXMLExampleDUnitTest extends
Properties props = new Properties();
String xmlfilepath = TestUtil.getResourcePath(getClass(), "PartitionRegionCacheExample1.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, xmlfilepath);
+ props.setProperty(CACHE_XML_FILE, xmlfilepath);
getSystem(props);
cache = getCache();
@@ -105,7 +106,7 @@ public class PartitionedRegionCacheXMLExampleDUnitTest extends
Properties props = new Properties();
String xmlfilepath = TestUtil.getResourcePath(getClass(), "PartitionRegionCacheExample2.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, xmlfilepath);
+ props.setProperty(CACHE_XML_FILE, xmlfilepath);
getSystem(props);
cache = getCache();
}
[24/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
index 6bc2882..26083a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.CacheClosedException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
index aa0241e..e19c0ea 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -27,7 +27,6 @@ import com.gemstone.gemfire.distributed.LocatorLauncher;
import com.gemstone.gemfire.distributed.LocatorLauncher.LocatorState;
import com.gemstone.gemfire.distributed.ServerLauncher;
import com.gemstone.gemfire.distributed.ServerLauncher.ServerState;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
import com.gemstone.gemfire.internal.DistributionLocator;
@@ -91,7 +90,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The LauncherLifecycleCommands class encapsulates all GemFire launcher commands for GemFire tools (like starting
@@ -283,15 +282,15 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
Properties gemfireProperties = new Properties();
- gemfireProperties.setProperty(SystemConfigurationProperties.GROUPS, StringUtils.valueOf(group, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(SystemConfigurationProperties.LOCATORS, StringUtils.valueOf(locators, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(SystemConfigurationProperties.LOG_LEVEL, StringUtils.valueOf(logLevel, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(SystemConfigurationProperties.MCAST_ADDRESS, StringUtils.valueOf(mcastBindAddress, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(GROUPS, StringUtils.valueOf(group, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(LOCATORS, StringUtils.valueOf(locators, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(LOG_LEVEL, StringUtils.valueOf(logLevel, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(MCAST_ADDRESS, StringUtils.valueOf(mcastBindAddress, StringUtils.EMPTY_STRING));
gemfireProperties.setProperty(MCAST_PORT, StringUtils.valueOf(mcastPort, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, StringUtils.valueOf(enableSharedConfiguration, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(SystemConfigurationProperties.LOAD_CLUSTER_CONFIGURATION_FROM_DIR,
+ gemfireProperties.setProperty(ENABLE_CLUSTER_CONFIGURATION, StringUtils.valueOf(enableSharedConfiguration, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(LOAD_CLUSTER_CONFIGURATION_FROM_DIR,
StringUtils.valueOf(loadSharedConfigurationFromDirectory, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(SystemConfigurationProperties.CLUSTER_CONFIGURATION_DIR, StringUtils.valueOf(clusterConfigDir, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(CLUSTER_CONFIGURATION_DIR, StringUtils.valueOf(clusterConfigDir, StringUtils.EMPTY_STRING));
// read the OSProcess enable redirect system property here -- TODO: replace with new GFSH argument
final boolean redirectOutput = Boolean.getBoolean(OSProcess.ENABLE_OUTPUT_REDIRECTION_PROPERTY);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index d1ca03a..034d921 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -85,19 +85,7 @@ import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-import java.io.*;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.KeyStore;
-import java.util.*;
-import java.util.Map.Entry;
-
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
index 4977649..c4bbeef 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.cli.functions;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
index 3e62372..9006f8e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
@@ -35,7 +35,7 @@ import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/****
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
index 1d10fea..88c01f0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
@@ -29,8 +29,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
-
/**
* @since GemFire 7.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index 59554f5..4228373 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.management.internal.cli.i18n;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import java.text.MessageFormat;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**-*
* Contains 'String' constants used as key to the Localized strings to be used
@@ -1715,7 +1715,7 @@ public class CliStrings {
public static final String START_SERVER__J__HELP = "Argument passed to the JVM on which the server will run. For example, --J=-Dfoo.bar=true will set the system property \"foo.bar\" to \"true\".";
public static final String START_SERVER__LOCATORS = LOCATORS;
public static final String START_SERVER__LOCATORS__HELP = "Sets the list of Locators used by the Cache Server to join the appropriate GemFire cluster.";
- public static final String START_SERVER__LOCK_MEMORY = SystemConfigurationProperties.LOCK_MEMORY;
+ public static final String START_SERVER__LOCK_MEMORY = DistributedSystemConfigProperties.LOCK_MEMORY;
public static final String START_SERVER__LOCK_MEMORY__HELP = "Causes GemFire to lock heap and off-heap memory pages into RAM. This prevents the operating system from swapping the pages out to disk, which can cause severe performance degradation. When you use this option, also configure the operating system limits for locked memory.";
public static final String START_SERVER__LOCATOR_WAIT_TIME = "locator-wait-time";
public static final String START_SERVER__LOCATOR_WAIT_TIME_HELP = "Sets the number of seconds the server will wait for a locator to become available during startup before giving up.";
@@ -1735,15 +1735,15 @@ public class CliStrings {
public static final String START_SERVER__MEMCACHED_PROTOCOL__HELP = "Sets the protocol that the GemFire memcached service uses (ASCII or BINARY).";
public static final String START_SERVER__MEMCACHED_BIND_ADDRESS = MEMCACHED_BIND_ADDRESS;
public static final String START_SERVER__MEMCACHED_BIND_ADDRESS__HELP = "Sets the IP address the GemFire memcached service listens on for memcached clients. The default is to bind to the first non-loopback address for this machine.";
- public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE = SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+ public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE = DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE;
public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE__HELP = "The total size of off-heap memory specified as off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates whether the size should be interpreted as gigabytes or megabytes. A non-zero size causes that much memory to be allocated from the operating system and reserved for off-heap use.";
public static final String START_SERVER__PROPERTIES = "properties-file";
public static final String START_SERVER__PROPERTIES__HELP = "The gemfire.properties file for configuring the Cache Server's distributed system. The file's path can be absolute or relative to the gfsh working directory.";
- public static final String START_SERVER__REDIS_PORT = SystemConfigurationProperties.REDIS_PORT;
+ public static final String START_SERVER__REDIS_PORT = DistributedSystemConfigProperties.REDIS_PORT;
public static final String START_SERVER__REDIS_PORT__HELP = "Sets the port that the GemFire Redis service listens on for Redis clients.";
- public static final String START_SERVER__REDIS_BIND_ADDRESS = SystemConfigurationProperties.REDIS_BIND_ADDRESS;
+ public static final String START_SERVER__REDIS_BIND_ADDRESS = DistributedSystemConfigProperties.REDIS_BIND_ADDRESS;
public static final String START_SERVER__REDIS_BIND_ADDRESS__HELP = "Sets the IP address the GemFire Redis service listens on for Redis clients. The default is to bind to the first non-loopback address for this machine.";
- public static final String START_SERVER__REDIS_PASSWORD = SystemConfigurationProperties.REDIS_PASSWORD;
+ public static final String START_SERVER__REDIS_PASSWORD = DistributedSystemConfigProperties.REDIS_PASSWORD;
public static final String START_SERVER__REDIS_PASSWORD__HELP = "Sets the authentication password for GemFireRedisServer";
public static final String START_SERVER__SECURITY_PROPERTIES = "security-properties-file";
public static final String START_SERVER__SECURITY_PROPERTIES__HELP = "The gfsecurity.properties file for configuring the Server's security configuration in the distributed system. The file's path can be absolute or relative to gfsh directory.";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
index 7f3847a..d7c8f69 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.shell;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.lang.StringUtils;
import com.gemstone.gemfire.internal.util.ArrayUtils;
import com.gemstone.gemfire.internal.util.IOUtils;
@@ -46,7 +45,7 @@ import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* OperationInvoker JMX Implementation
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
index 3bf07d0..40b93eb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.web.controllers;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.lang.StringUtils;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
@@ -44,7 +44,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs")
@ResponseBody
- public String listDurableClientContinuousQueries(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
+ public String listDurableClientContinuousQueries(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
@RequestParam(value = CliStrings.LIST_DURABLE_CQS__MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.LIST_DURABLE_CQS__GROUP, required = false) final String[] groups)
{
@@ -65,7 +65,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs/events")
@ResponseBody
- public String countDurableClientContinuousQueryEvents(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
+ public String countDurableClientContinuousQueryEvents(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
@RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, required = false) final String[] groups)
{
@@ -74,7 +74,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs/{durable-cq-name}/events")
@ResponseBody
- public String countDurableClientContinuousQueryEvents(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
+ public String countDurableClientContinuousQueryEvents(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
@PathVariable("durable-cq-name") final String durableCqName,
@RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, required = false) final String[] groups)
@@ -108,7 +108,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.POST, value = "/durable-clients/{durable-client-id}", params = "op=close")
@ResponseBody
- public String closeDurableClient(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
+ public String closeDurableClient(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
@RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__GROUP, required = false) final String[] groups)
{
@@ -129,7 +129,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.POST, value = "/durable-clients/{durable-client-id}/cqs/{durable-cq-name}", params = "op=close")
@ResponseBody
- public String closeDurableContinuousQuery(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
+ public String closeDurableContinuousQuery(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
@PathVariable("durable-cq-name")final String durableCqName,
@RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__GROUP, required = false) final String[] groups)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
index 8649375..ce496eb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.redis;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
index 421ac7e..444d9c1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
@@ -30,7 +30,7 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
index dce254a..c4044f5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
@@ -31,7 +31,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
index 7e623e2..def39f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
@@ -25,7 +25,7 @@ import org.junit.rules.TestName;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertTrue;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
index a24708d..16a3d40 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
@@ -32,7 +32,7 @@ import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
index 5270738..ba515dd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
@@ -17,13 +17,12 @@
package com.gemstone.gemfire;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the functionality of JOM {@link Statistics}.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
index dedfa67..f675903 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
@@ -18,8 +18,6 @@ package com.gemstone.gemfire;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.LonerDistributionManager;
import com.gemstone.gemfire.internal.OSProcess;
@@ -33,7 +31,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
index b4743b3..8650e9a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
@@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
index cd32c3a..4487191 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.rules.TestName;
import javax.transaction.Synchronization;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
index 40633df..84a2de7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
@@ -27,7 +27,7 @@ import org.junit.Before;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Extracted from TXWriterJUnitTest to share with TXWriterOOMEJUnitTest.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
index dcefc2b..54eebab 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
@@ -25,8 +25,8 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.BIND_ADDRESS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
index 5e7671a..c3d665e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
@@ -22,7 +22,7 @@ import org.junit.Before;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Provides common setUp and tearDown for testing the Admin API.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
index 2ed2241..904a9b6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
@@ -23,7 +23,7 @@ import org.junit.Before;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Superclass of tests for the {@linkplain
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
index 9b19053..8b39409 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
@@ -31,8 +31,8 @@ import java.util.Arrays;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index 53a6189..34f6bbb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -26,8 +26,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* verifies the count of clear operation
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
index 2e97707..0932ff1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.Ignore;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
index ef09970..412d3ed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -28,8 +28,8 @@ import junit.framework.Assert;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This tests cases where we have both
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
index f782d66..424e219 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
@@ -20,7 +20,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.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
@@ -31,7 +30,7 @@ import org.junit.experimental.categories.Category;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
index dfbc54b..42ee559 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
@@ -29,8 +29,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
index 9a3ab17..7fa6cb7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
@@ -34,8 +34,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
index 4f87adc..fe607ab 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
@@ -39,7 +39,7 @@ import java.util.Arrays;
import java.util.Properties;
import static com.gemstone.gemfire.cache.RegionShortcut.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
index e99af37..4c5944b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
index aa8095a..79f58b7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
@@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
index b64a517..2fd5b79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.client.internal.ProxyCache;
import com.gemstone.gemfire.cache.client.internal.UserAttributes;
import com.gemstone.gemfire.cache.server.CacheServer;
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.distributed.internal.membership.gms.GMSMember;
@@ -52,7 +51,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.junit.runners.MethodSorters.NAME_ASCENDING;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
index 1435172..9494bbf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
@@ -36,8 +36,8 @@ import java.util.Arrays;
import java.util.Properties;
import static com.gemstone.gemfire.cache.client.ClientRegionShortcut.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 67675d0..8f82edd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.*;
@@ -30,7 +29,7 @@ import java.util.Stack;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the interaction between a
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index 72bed06..544d7b2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -52,8 +52,8 @@ import java.util.Properties;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index bcbd035..3c675b8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -22,7 +22,6 @@ 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.cache.server.CacheServer;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.security.AuthenticationRequiredException;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -35,7 +34,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests cacheserver ssl support added. See https://svn.gemstone.com/trac/gemfire/ticket/48995 for details
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
index 8f055d9..77e081f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -37,8 +37,8 @@ import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index 1ca6a81..7b1a513 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.server.ServerLoadProbe;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
import com.gemstone.gemfire.test.dunit.*;
@@ -34,7 +33,7 @@ import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
index 6ea0bdf..6839dcf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
@@ -45,8 +45,8 @@ import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
index 86691f9..e143462 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -22,7 +22,6 @@ 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.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -34,7 +33,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test for GEODE-396
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index 6321c14..c417ea6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -52,8 +52,8 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
index af13c04..c82d279 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.management;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import javax.management.Notification;
import javax.management.NotificationEmitter;
@@ -33,7 +33,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* An test class for exploring the various notification listener behaviors
@@ -102,10 +102,10 @@ public class MXMemoryPoolListenerExample implements NotificationListener {
Properties dsProps = new Properties();
dsProps.setProperty(MCAST_PORT, "0"); // Loner
- dsProps.setProperty(SystemConfigurationProperties.LOG_LEVEL, "info");
- dsProps.setProperty(SystemConfigurationProperties.STATISTIC_SAMPLE_RATE, "200");
- dsProps.setProperty(SystemConfigurationProperties.ENABLE_TIME_STATISTICS, "true");
- dsProps.setProperty(SystemConfigurationProperties.STATISTIC_SAMPLING_ENABLED, "true");
+ dsProps.setProperty(DistributedSystemConfigProperties.LOG_LEVEL, "info");
+ dsProps.setProperty(DistributedSystemConfigProperties.STATISTIC_SAMPLE_RATE, "200");
+ dsProps.setProperty(DistributedSystemConfigProperties.ENABLE_TIME_STATISTICS, "true");
+ dsProps.setProperty(DistributedSystemConfigProperties.STATISTIC_SAMPLING_ENABLED, "true");
DistributedSystem ds = DistributedSystem.connect(dsProps);
final LogWriter logger = ds.getLogWriter();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index 5ddf457..68dfedc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -52,8 +52,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests the Heap Memory thresholds of {@link ResourceManager}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 986bf5a..3cd1d98 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the Off-Heap Memory thresholds of {@link ResourceManager}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
index 6544bab..af87509 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
@@ -25,8 +25,8 @@ import org.junit.experimental.categories.Category;
import java.util.HashMap;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
index 97ec027..bf776e2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
@@ -25,8 +25,8 @@ import org.junit.experimental.categories.Category;
import java.util.HashMap;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index 50bb9f9..0e9256c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -28,8 +28,8 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
import java.util.TreeMap;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
index 71861d6..172ec73 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
@@ -32,8 +32,8 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
@Category(IntegrationTest.class)
public class PutOperationContextJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
index 86d2566..c2c2796 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
@@ -30,8 +30,8 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
@Category(IntegrationTest.class)
public class GetOperationContextImplJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
index bce7e3f..cb47fd5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
@@ -29,7 +29,7 @@ import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
index 63e4dbd..d001597 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
@@ -32,7 +32,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
index 2289061..795dd8f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
@@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
index 75acbb4..16784c4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
@@ -29,7 +29,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Utility class for testing supported queries
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
index a13b11d..dfde1a6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
@@ -32,8 +32,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class HelperTestCase extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index ab0a980..6421439 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.stream.IntStream;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(DistributedTest.class)
public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index e63ac6d..26cfc05 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -28,7 +28,6 @@ import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.data.Portfolio;
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.security.templates.DummyAuthenticator;
import com.gemstone.gemfire.security.templates.UserPasswordAuthInit;
@@ -38,7 +37,7 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
import org.junit.Ignore;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test for accessing query bind parameters from authorization callbacks
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index a1f4262..7774920 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -47,7 +47,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
/**
* Tests remote (client/server) query execution.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 4a8faa6..829f9ec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -43,8 +43,8 @@ import java.io.IOException;
import java.util.Comparator;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests remote (client/server) query execution.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index b54e5d6..1ea2c3f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -42,8 +42,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
index 12724ea..4c6aed1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
index 17763d2..792ef99 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
@@ -26,7 +26,7 @@
*/
package com.gemstone.gemfire.cache.query.functional;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.query.*;
@@ -44,8 +44,6 @@ import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl;
import com.gemstone.gemfire.cache.query.types.ObjectType;
import com.gemstone.gemfire.cache.query.types.StructType;
import com.gemstone.gemfire.distributed.DistributedSystem;
-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.FileUtil;
import com.gemstone.gemfire.internal.cache.LocalRegion;
@@ -59,7 +57,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index af66b86..5646250 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
index c202cc8..7218b1c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
@@ -34,7 +34,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
// TODO:TEST clean this up and add assertions
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
index 2b0df2e..245a5bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
[46/55] [abbrv] incubator-geode git commit: GEODE-1471:
GatewayEventFilter callbacks are now invoked on AsyncEventQueues
Posted by hi...@apache.org.
GEODE-1471: GatewayEventFilter callbacks are now invoked on AsyncEventQueues
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/001a4e16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/001a4e16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/001a4e16
Branch: refs/heads/feature/GEODE-1372
Commit: 001a4e167d287e66a944edf45ac9591b09104954
Parents: c742c4e
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Thu Jun 2 18:25:05 2016 -0700
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Mon Jun 6 09:56:48 2016 -0700
----------------------------------------------------------------------
.../cache/xmlcache/AsyncEventQueueCreation.java | 3 +-
.../cache/wan/MyAsyncEventListener.java | 7 +-
.../cache/wan/MyGatewayEventFilter.java | 69 ++++++++++++++++++++
.../AsyncEventQueueValidationsJUnitTest.java | 56 ++++++++++++++++
...ntQueueConfiguredFromXmlUsesFilter.cache.xml | 40 ++++++++++++
...ntQueueConfiguredFromXmlUsesFilter.cache.xml | 40 ++++++++++++
6 files changed, 213 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/001a4e16/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AsyncEventQueueCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AsyncEventQueueCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AsyncEventQueueCreation.java
index 4c2943e..e55ec3f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AsyncEventQueueCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AsyncEventQueueCreation.java
@@ -61,7 +61,8 @@ public class AsyncEventQueueCreation implements AsyncEventQueue {
this.dispatcherThreads = senderAttrs.dispatcherThreads;
this.orderPolicy = senderAttrs.policy;
this.asyncEventListener = eventListener;
- this.isBucketSorted = senderAttrs.isBucketSorted;
+ this.isBucketSorted = senderAttrs.isBucketSorted;
+ this.gatewayEventFilters = senderAttrs.eventFilters;
this.gatewayEventSubstitutionFilter = senderAttrs.eventSubstitutionFilter;
this.ignoreEvictionAndExpiration = senderAttrs.ignoreEvictionAndExpiration;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/001a4e16/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyAsyncEventListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyAsyncEventListener.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyAsyncEventListener.java
index f2401a5..9e8357d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyAsyncEventListener.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyAsyncEventListener.java
@@ -18,13 +18,15 @@ package com.gemstone.gemfire.internal.cache.wan;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import com.gemstone.gemfire.cache.Declarable;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-public class MyAsyncEventListener implements AsyncEventListener {
+public class MyAsyncEventListener implements AsyncEventListener, Declarable {
private final Map eventsMap;
@@ -50,4 +52,7 @@ public class MyAsyncEventListener implements AsyncEventListener {
public void close() {
}
+
+ @Override
+ public void init(Properties props) {}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/001a4e16/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyGatewayEventFilter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyGatewayEventFilter.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyGatewayEventFilter.java
new file mode 100644
index 0000000..39766e9
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/MyGatewayEventFilter.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.cache.wan;
+
+import com.gemstone.gemfire.cache.Declarable;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayQueueEvent;
+
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+
+// Note: This class is used by AsyncEventQueueValidationsJUnitTest testAsyncEventQueueConfiguredFromXmlUsesFilter
+public class MyGatewayEventFilter implements GatewayEventFilter, Declarable {
+
+ private AtomicInteger beforeEnqueueInvocations = new AtomicInteger();
+
+ private AtomicInteger beforeTransmitInvocations = new AtomicInteger();
+
+ private AtomicInteger afterAcknowledgementInvocations = new AtomicInteger();
+
+ @Override
+ public boolean beforeEnqueue(GatewayQueueEvent event) {
+ beforeEnqueueInvocations.incrementAndGet();
+ return true;
+ }
+
+ @Override
+ public boolean beforeTransmit(GatewayQueueEvent event) {
+ beforeTransmitInvocations.incrementAndGet();
+ return true;
+ }
+
+ @Override
+ public void afterAcknowledgement(GatewayQueueEvent event) {
+ afterAcknowledgementInvocations.incrementAndGet();
+ }
+
+ public int getBeforeEnqueueInvocations() {
+ return this.beforeEnqueueInvocations.get();
+ }
+
+ public int getBeforeTransmitInvocations() {
+ return this.beforeTransmitInvocations.get();
+ }
+
+ public int getAfterAcknowledgementInvocations() {
+ return this.afterAcknowledgementInvocations.get();
+ }
+
+ @Override
+ public void init(Properties props) {}
+
+ @Override
+ public void close() {}
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/001a4e16/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index 2a7e57f..3055c8e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@ -21,14 +21,29 @@ package com.gemstone.gemfire.internal.cache.wan.asyncqueue;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueConfigurationException;
+import com.gemstone.gemfire.internal.cache.wan.MyGatewayEventFilter;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+import com.jayway.awaitility.Awaitility;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.CACHE_XML_FILE;
import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static junitparams.JUnitParamsRunner.$;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -36,10 +51,18 @@ import static org.junit.Assert.fail;
*
*/
@Category(IntegrationTest.class)
+@RunWith(JUnitParamsRunner.class)
public class AsyncEventQueueValidationsJUnitTest {
private Cache cache;
+ @After
+ public void closeCache() {
+ if(this.cache != null) {
+ this.cache.close();
+ }
+ }
+
@Test
public void testConcurrentParallelAsyncEventQueueAttributesWrongDispatcherThreads() {
cache = new CacheFactory().set(MCAST_PORT, "0").create();
@@ -72,4 +95,37 @@ public class AsyncEventQueueValidationsJUnitTest {
}
}
+ @Test
+ @Parameters(method = "getCacheXmlFileBaseNames")
+ public void testAsyncEventQueueConfiguredFromXmlUsesFilter(String cacheXmlFileBaseName) {
+ // Create cache with xml
+ String cacheXmlFileName = TestUtil.getResourcePath(getClass(), getClass().getSimpleName() + "." + cacheXmlFileBaseName + ".cache.xml");
+ cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE, cacheXmlFileName).create();
+
+ // Get region and do puts
+ Region region = cache.getRegion(cacheXmlFileBaseName);
+ int numPuts = 10;
+ for (int i=0; i<numPuts; i++) {
+ region.put(i,i);
+ }
+
+ // Get AsyncEventQueue and GatewayEventFilter
+ AsyncEventQueue aeq = cache.getAsyncEventQueue(cacheXmlFileBaseName);
+ List<GatewayEventFilter> filters = aeq.getGatewayEventFilters();
+ assertTrue(filters.size() == 1);
+ MyGatewayEventFilter filter = (MyGatewayEventFilter) filters.get(0);
+
+ // Validate filter callbacks were invoked
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> filter.getBeforeEnqueueInvocations() == numPuts);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> filter.getBeforeTransmitInvocations() == numPuts);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> filter.getAfterAcknowledgementInvocations() == numPuts);
+ }
+
+ private final Object[] getCacheXmlFileBaseNames() {
+ return $(
+ new Object[] { "testSerialAsyncEventQueueConfiguredFromXmlUsesFilter" },
+ new Object[] { "testParallelAsyncEventQueueConfiguredFromXmlUsesFilter" }
+ );
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/001a4e16/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testParallelAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testParallelAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml b/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testParallelAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml
new file mode 100755
index 0000000..9d8ed7f
--- /dev/null
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testParallelAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!DOCTYPE cache PUBLIC
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
+ "http://www.gemstone.com/dtd/cache8_0.dtd">
+
+<cache>
+
+ <async-event-queue id="testParallelAsyncEventQueueConfiguredFromXmlUsesFilter" parallel="true">
+ <gateway-event-filter>
+ <class-name>com.gemstone.gemfire.internal.cache.wan.MyGatewayEventFilter</class-name>
+ </gateway-event-filter>
+ <async-event-listener>
+ <class-name>com.gemstone.gemfire.internal.cache.wan.MyAsyncEventListener</class-name>
+ </async-event-listener>
+ </async-event-queue>
+
+ <region name="testParallelAsyncEventQueueConfiguredFromXmlUsesFilter" refid="PARTITION">
+ <region-attributes async-event-queue-ids="testParallelAsyncEventQueueConfiguredFromXmlUsesFilter"/>
+ </region>
+
+</cache>
+
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/001a4e16/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testSerialAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testSerialAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml b/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testSerialAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml
new file mode 100755
index 0000000..1361036
--- /dev/null
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.testSerialAsyncEventQueueConfiguredFromXmlUsesFilter.cache.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!DOCTYPE cache PUBLIC
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
+ "http://www.gemstone.com/dtd/cache8_0.dtd">
+
+<cache>
+
+ <async-event-queue id="testSerialAsyncEventQueueConfiguredFromXmlUsesFilter" parallel="false">
+ <gateway-event-filter>
+ <class-name>com.gemstone.gemfire.internal.cache.wan.MyGatewayEventFilter</class-name>
+ </gateway-event-filter>
+ <async-event-listener>
+ <class-name>com.gemstone.gemfire.internal.cache.wan.MyAsyncEventListener</class-name>
+ </async-event-listener>
+ </async-event-queue>
+
+ <region name="testSerialAsyncEventQueueConfiguredFromXmlUsesFilter" refid="PARTITION">
+ <region-attributes async-event-queue-ids="testSerialAsyncEventQueueConfiguredFromXmlUsesFilter"/>
+ </region>
+
+</cache>
+
[55/55] [abbrv] incubator-geode git commit: Merge branch 'GEODE-1372'
into develop
Posted by hi...@apache.org.
Merge branch 'GEODE-1372' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ba436185
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ba436185
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ba436185
Branch: refs/heads/feature/GEODE-1372
Commit: ba436185945a293dd38321929ebeaae06506e98c
Parents: 103a6bc 48566a9
Author: Hitesh Khamesra <hi...@yahoo.com>
Authored: Tue Jun 7 10:25:16 2016 -0700
Committer: Hitesh Khamesra <hi...@yahoo.com>
Committed: Tue Jun 7 10:25:16 2016 -0700
----------------------------------------------------------------------
.../internal/membership/NetView.java | 33 +-
.../membership/gms/interfaces/Messenger.java | 20 +
.../gms/locator/FindCoordinatorRequest.java | 22 +-
.../gms/locator/FindCoordinatorResponse.java | 70 +-
.../membership/gms/locator/GMSLocator.java | 12 +-
.../membership/gms/membership/GMSJoinLeave.java | 145 +++-
.../gms/messages/InstallViewMessage.java | 25 +
.../gms/messages/JoinRequestMessage.java | 42 +-
.../gms/messages/JoinResponseMessage.java | 63 +-
.../membership/gms/messenger/GMSEncrypt.java | 578 +++++++++++++++
.../gms/messenger/JGroupsMessenger.java | 298 +++++++-
.../internal/InternalDataSerializer.java | 18 +
.../DistributedMulticastRegionDUnitTest.java | 2 +
.../gemfire/cache30/ReconnectDUnitTest.java | 4 +
.../ReconnectWithUDPSecurityDUnitTest.java | 17 +
.../gemfire/distributed/LocatorDUnitTest.java | 31 +-
.../LocatorUDPSecurityDUnitTest.java | 28 +
.../membership/MembershipJUnitTest.java | 137 ++++
.../gms/membership/GMSJoinLeaveJUnitTest.java | 44 +-
.../gms/messenger/GMSEncryptJUnitTest.java | 711 +++++++++++++++++++
.../messenger/JGroupsMessengerJUnitTest.java | 192 ++++-
21 files changed, 2389 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
----------------------------------------------------------------------
diff --cc geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
index 078281a,92fbcac..531d2f9
mode 100644,100755..100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
----------------------------------------------------------------------
diff --cc geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index fc81049,eedfc5f..f60a0af
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@@ -16,10 -16,68 +16,16 @@@
*/
package com.gemstone.gemfire.distributed.internal.membership.gms.messenger;
+import com.gemstone.gemfire.*;
+ import static com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil.replaceStrings;
+ import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_REQUEST;
+ import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_RESPONSE;
+ import static com.gemstone.gemfire.internal.DataSerializableFixedID.FIND_COORDINATOR_REQ;
+ import static com.gemstone.gemfire.internal.DataSerializableFixedID.FIND_COORDINATOR_RESP;
+
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.logging.log4j.Logger;
-import org.jgroups.Address;
-import org.jgroups.Event;
-import org.jgroups.JChannel;
-import org.jgroups.Message;
-import org.jgroups.Message.Flag;
-import org.jgroups.Message.TransientFlag;
-import org.jgroups.ReceiverAdapter;
-import org.jgroups.View;
-import org.jgroups.ViewId;
-import org.jgroups.conf.ClassConfigurator;
-import org.jgroups.protocols.UDP;
-import org.jgroups.protocols.pbcast.NAKACK2;
-import org.jgroups.stack.IpAddress;
-import org.jgroups.util.Digest;
-import org.jgroups.util.UUID;
-
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.ForcedDisconnectException;
-import com.gemstone.gemfire.GemFireConfigException;
-import com.gemstone.gemfire.GemFireIOException;
-import com.gemstone.gemfire.SystemConnectException;
import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
import com.gemstone.gemfire.distributed.DurableClientAttributes;
-import com.gemstone.gemfire.distributed.internal.DMStats;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.DistributionStats;
-import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage;
+import com.gemstone.gemfire.distributed.internal.*;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes;
import com.gemstone.gemfire.distributed.internal.membership.NetView;
@@@ -28,10 -86,17 +34,12 @@@ import com.gemstone.gemfire.distributed
import com.gemstone.gemfire.distributed.internal.membership.gms.Services;
import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.MessageHandler;
import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Messenger;
+ import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
+ import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinRequestMessage;
import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinResponseMessage;
-import com.gemstone.gemfire.internal.ClassPathLoader;
-import com.gemstone.gemfire.internal.HeapDataOutputStream;
-import com.gemstone.gemfire.internal.InternalDataSerializer;
-import com.gemstone.gemfire.internal.OSProcess;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.*;
import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.VersionedDataInputStream;
import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig;
import com.gemstone.gemfire.internal.cache.DirectReplyMessage;
import com.gemstone.gemfire.internal.cache.DistributedCacheOperation;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index a2bee79,582149c..5121290
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@@ -235,12 -250,13 +235,13 @@@ public class DistributedMulticastRegion
public Properties getDistributedSystemProperties() {
Properties p = new Properties();
- p.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- p.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "multicast");
- p.put(DistributionConfig.MCAST_PORT_NAME, mcastport);
- p.put(DistributionConfig.MCAST_TTL_NAME, mcastttl);
- p.put(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort +"]");
- p.put(DistributionConfig.LOG_LEVEL_NAME, "info");
- p.put(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128");
+ p.put(STATISTIC_SAMPLING_ENABLED, "true");
+ p.put(STATISTIC_ARCHIVE_FILE, "multicast");
+ p.put(MCAST_PORT, mcastport);
+ p.put(MCAST_TTL, mcastttl);
+ p.put(LOCATORS, "localhost[" + locatorPort + "]");
+ p.put(LOG_LEVEL, "info");
++ p.put(SECURITY_CLIENT_DHALGO_NAME, "AES:128");
return p;
}
@@@ -269,10 -285,11 +270,11 @@@
public Object call() {
final File locatorLogFile = new File(getTestMethodName() + "-locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(DistributionConfig.NAME_NAME, "LocatorWithMcast");
- locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, mcastport);
- locatorProps.setProperty(DistributionConfig.MCAST_TTL_NAME, mcastttl);
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
- locatorProps.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128");
+ locatorProps.setProperty(NAME, "LocatorWithMcast");
+ locatorProps.setProperty(MCAST_PORT, mcastport);
+ locatorProps.setProperty(MCAST_TTL, mcastttl);
+ locatorProps.setProperty(LOG_LEVEL, "info");
++ locatorProps.setProperty(SECURITY_CLIENT_DHALGO_NAME, "AES:128");
//locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, null, null,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index a3ad8f5,0bfde25..7f96f8a
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@@ -114,14 -109,15 +114,15 @@@ public class ReconnectDUnitTest extend
public Properties getDistributedSystemProperties() {
if (dsProperties == null) {
dsProperties = new Properties();
- dsProperties.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "20000");
- dsProperties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- dsProperties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "false");
- dsProperties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
- dsProperties.put(DistributionConfig.LOCATORS_NAME, "localHost["+locatorPort+"]");
- dsProperties.put(DistributionConfig.MCAST_PORT_NAME, "0");
- dsProperties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
- dsProperties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ dsProperties.put(MAX_WAIT_TIME_RECONNECT, "20000");
+ dsProperties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ dsProperties.put(DISABLE_AUTO_RECONNECT, "false");
+ dsProperties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+ dsProperties.put(LOCATORS, "localHost[" + locatorPort + "]");
+ dsProperties.put(MCAST_PORT, "0");
+ dsProperties.put(MEMBER_TIMEOUT, "1000");
+ dsProperties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ addDSProps(dsProperties);
}
return dsProperties;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 3e133f6,74872d2..fa0fc15
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@@ -134,13 -137,14 +139,14 @@@ public class LocatorDUnitTest extends D
final String locators = NetworkUtils.getServerHostName(host) + "[" + port1 + "]";
final Properties properties = new Properties();
- properties.put("mcast-port", "0");
- properties.put("start-locator", locators);
- properties.put("log-level", LogWriterUtils.getDUnitLogLevel());
- properties.put("security-peer-auth-init", "com.gemstone.gemfire.distributed.AuthInitializer.create");
- properties.put("security-peer-authenticator", "com.gemstone.gemfire.distributed.MyAuthenticator.create");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
- properties.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MCAST_PORT, "0");
+ properties.put(START_LOCATOR, locators);
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ properties.put(SECURITY_PEER_AUTH_INIT, "com.gemstone.gemfire.distributed.AuthInitializer.create");
+ properties.put(SECURITY_PEER_AUTHENTICATOR, "com.gemstone.gemfire.distributed.MyAuthenticator.create");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+ properties.put(USE_CLUSTER_CONFIGURATION, "false");
+ addDSProps(properties);
system = (InternalDistributedSystem) DistributedSystem.connect(properties);
InternalDistributedMember mbr = system.getDistributedMember();
assertEquals("expected the VM to have NORMAL vmKind",
@@@ -268,14 -272,14 +274,15 @@@
final String locators = host0 + "[" + port1 + "]," +
host0 + "[" + port2 + "]";
final Properties properties = new Properties();
- properties.put("mcast-port", "0");
- properties.put("locators", locators);
- properties.put("enable-network-partition-detection", "false");
- properties.put("disable-auto-reconnect", "true");
- properties.put("member-timeout", "2000");
- properties.put("log-level", LogWriterUtils.getDUnitLogLevel());
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MCAST_PORT, "0");
+ properties.put(LOCATORS, locators);
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
+ properties.put(DISABLE_AUTO_RECONNECT, "true");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(properties);
SerializableCallable startLocator1 = new SerializableCallable("start locator1") {
@Override
public Object call() throws Exception {
@@@ -375,11 -379,11 +382,12 @@@
DistributedTestUtils.deleteLocatorStateFile(port1);
final String locators = NetworkUtils.getServerHostName(host) + "[" + port1 + "]";
final Properties properties = new Properties();
- properties.put("mcast-port", "0");
- properties.put("locators", locators);
- properties.put("enable-network-partition-detection", "true");
- properties.put("disable-auto-reconnect", "true");
+ properties.put(MCAST_PORT, "0");
+ properties.put(LOCATORS, locators);
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ properties.put(DISABLE_AUTO_RECONNECT, "true");
+
+ addDSProps(properties);
File logFile = new File("");
if (logFile.exists()) {
logFile.delete();
@@@ -491,15 -495,15 +499,16 @@@
final String locators = host0 + "[" + port1 + "]," +
host0 + "[" + port2 + "]";
final Properties properties = new Properties();
- properties.put("mcast-port", "0");
- properties.put("locators", locators);
- properties.put("enable-network-partition-detection", "true");
- properties.put("disable-auto-reconnect", "true");
- properties.put("member-timeout", "2000");
- properties.put("log-level", LogWriterUtils.getDUnitLogLevel());
+ properties.put(MCAST_PORT, "0");
+ properties.put(LOCATORS, locators);
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ properties.put(DISABLE_AUTO_RECONNECT, "true");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
// properties.put("log-level", "fine");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(properties);
try {
final String uname = getUniqueName();
File logFile = new File("");
@@@ -624,13 -628,13 +633,14 @@@
final String locators = host0 + "[" + port1 + "],"
+ host0 + "[" + port2 + "]";
final Properties properties = new Properties();
- properties.put("mcast-port", "0");
- properties.put("locators", locators);
- properties.put("enable-network-partition-detection", "true");
- properties.put("disable-auto-reconnect", "true");
- properties.put("member-timeout", "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MCAST_PORT, "0");
+ properties.put(LOCATORS, locators);
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ properties.put(DISABLE_AUTO_RECONNECT, "true");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(properties);
SerializableRunnable stopLocator = getStopLocatorRunnable();
try {
@@@ -769,14 -773,14 +779,15 @@@
final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]";
final Properties properties = new Properties();
- properties.put("mcast-port", "0");
- properties.put("locators", locators);
- properties.put("enable-network-partition-detection", "true");
- properties.put("disable-auto-reconnect", "true");
- properties.put("member-timeout", "2000");
- properties.put("log-level", LogWriterUtils.getDUnitLogLevel());
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MCAST_PORT, "0");
+ properties.put(LOCATORS, locators);
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ properties.put(DISABLE_AUTO_RECONNECT, "true");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(properties);
SerializableRunnable stopLocator = getStopLocatorRunnable();
try {
@@@ -906,13 -910,13 +917,14 @@@
final String locators = host0 + "[" + port1 + "],"
+ host0 + "[" + port2 + "]";
final Properties properties = new Properties();
- properties.put("mcast-port", "0");
- properties.put("locators", locators);
- properties.put("enable-network-partition-detection", "true");
- properties.put("disable-auto-reconnect", "true");
- properties.put("member-timeout", "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MCAST_PORT, "0");
+ properties.put(LOCATORS, locators);
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ properties.put(DISABLE_AUTO_RECONNECT, "true");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(properties);
SerializableRunnable disconnect =
new SerializableRunnable("Disconnect from " + locators) {
public void run() {
@@@ -1022,9 -1026,9 +1034,10 @@@
DistributedTestUtils.deleteLocatorStateFile(port1);
String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]";
Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", locators);
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, locators);
+
+ addDSProps(props);
final String expected = "java.net.ConnectException";
final String addExpected =
"<ExpectedException action=add>" + expected + "</ExpectedException>";
@@@ -1092,10 -1096,10 +1105,11 @@@
File logFile = new File("");
try {
Properties locProps = new Properties();
- locProps.setProperty("mcast-port", "0");
- locProps.setProperty("member-timeout", "1000");
- locProps.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ locProps.setProperty(MCAST_PORT, "0");
+ locProps.setProperty(MEMBER_TIMEOUT, "1000");
+ locProps.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(locProps);
Locator.startLocatorAndDS(port, logFile, locProps);
} catch (IOException ex) {
com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port, ex);
@@@ -1109,9 -1113,10 +1123,10 @@@
public void run() {
//System.setProperty("p2p.joinTimeout", "5000");
Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", locators);
- props.setProperty("member-timeout", "1000");
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(MEMBER_TIMEOUT, "1000");
+ addDSProps(props);
DistributedSystem.connect(props);
}
};
@@@ -1119,10 -1124,10 +1134,10 @@@
vm2.invoke(connect);
Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", locators);
- props.setProperty("member-timeout", "1000");
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(MEMBER_TIMEOUT, "1000");
-
+ addDSProps(props);
system = (InternalDistributedSystem) DistributedSystem.connect(props);
final DistributedMember coord = MembershipManagerHelper.getCoordinator(system);
@@@ -1188,10 -1193,10 +1203,11 @@@
try {
final Properties props = new Properties();
- props.setProperty(DistributionConfig.LOCATORS_NAME, locators);
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- props.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ props.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(props);
SerializableRunnable connect =
new SerializableRunnable("Connect to " + locators) {
public void run() {
@@@ -1322,10 -1327,10 +1338,11 @@@
host0 + "[" + port2 + "]";
final Properties dsProps = new Properties();
- dsProps.setProperty("locators", locators);
- dsProps.setProperty("mcast-port", "0");
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ dsProps.setProperty(LOCATORS, locators);
+ dsProps.setProperty(MCAST_PORT, "0");
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(dsProps);
vm0.invoke(new SerializableRunnable("Start locator on " + port1) {
public void run() {
File logFile = new File("");
@@@ -1357,8 -1362,9 +1374,9 @@@
new SerializableRunnable("Connect to " + locators) {
public void run() {
Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", locators);
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, locators);
+ addDSProps(props);
DistributedSystem.connect(props);
}
};
@@@ -1366,9 -1372,9 +1384,10 @@@
vm2.invoke(connect);
Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", locators);
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, locators);
+
+ addDSProps(props);
system = (InternalDistributedSystem) DistributedSystem.connect(props);
WaitCriterion ev = new WaitCriterion() {
@@@ -1440,11 -1445,11 +1458,12 @@@
host0 + "[" + port3 + "]";
final Properties dsProps = new Properties();
- dsProps.setProperty(DistributionConfig.LOCATORS_NAME, locators);
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- dsProps.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ dsProps.setProperty(LOCATORS, locators);
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(dsProps);
startLocatorSync(vm0, new Object[] { port1, dsProps });
startLocatorSync(vm1, new Object[] { port2, dsProps });
startLocatorSync(vm2, new Object[] { port3, dsProps });
@@@ -1649,13 -1654,13 +1668,14 @@@
File logFile = new File("");
try {
Properties props = new Properties();
- props.setProperty("mcast-port", String.valueOf(mcastport));
- props.setProperty("locators", locators);
- props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel());
- props.setProperty("mcast-ttl", "0");
- props.setProperty("enable-network-partition-detection", "true");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(MCAST_PORT, String.valueOf(mcastport));
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(MCAST_TTL, "0");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+ addDSProps(props);
Locator.startLocatorAndDS(port1, logFile, null, props);
} catch (IOException ex) {
com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port1, ex);
@@@ -1667,12 -1672,13 +1687,13 @@@
File logFile = new File("");
try {
Properties props = new Properties();
- props.setProperty("mcast-port", String.valueOf(mcastport));
- props.setProperty("locators", locators);
- props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel());
- props.setProperty("mcast-ttl", "0");
- props.setProperty("enable-network-partition-detection", "true");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(MCAST_PORT, String.valueOf(mcastport));
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(MCAST_TTL, "0");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+ addDSProps(props);
Locator.startLocatorAndDS(port2, logFile, null, props);
} catch (IOException ex) {
com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port2, ex);
@@@ -1684,11 -1690,12 +1705,12 @@@
new SerializableRunnable("Connect to " + locators) {
public void run() {
Properties props = new Properties();
- props.setProperty("mcast-port", String.valueOf(mcastport));
- props.setProperty("locators", locators);
- props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel());
- props.setProperty("mcast-ttl", "0");
- props.setProperty("enable-network-partition-detection", "true");
+ props.setProperty(MCAST_PORT, String.valueOf(mcastport));
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(MCAST_TTL, "0");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ addDSProps(props);
DistributedSystem.connect(props);
}
};
@@@ -1697,12 -1704,12 +1719,13 @@@
vm2.invoke(connect);
Properties props = new Properties();
- props.setProperty("mcast-port", String.valueOf(mcastport));
- props.setProperty("locators", locators);
- props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel());
- props.setProperty("mcast-ttl", "0");
- props.setProperty("enable-network-partition-detection", "true");
+ props.setProperty(MCAST_PORT, String.valueOf(mcastport));
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(MCAST_TTL, "0");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+
+ addDSProps(props);
system = (InternalDistributedSystem) DistributedSystem.connect(props);
WaitCriterion ev = new WaitCriterion() {
public boolean done() {
@@@ -1751,9 -1758,10 +1774,10 @@@
final String locators = NetworkUtils.getServerHostName(host) + "[" + port1 + "]";
Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", locators);
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+ addDSProps(props);
system = (InternalDistributedSystem) DistributedSystem.connect(props);
system.disconnect();
} finally {
@@@ -1796,9 -1804,10 +1820,10 @@@
new SerializableRunnable("Connect to " + locators) {
public void run() {
Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", locators);
- props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, locators);
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ addDSProps(props);
DistributedSystem.connect(props);
}
};
@@@ -1830,9 -1839,10 +1855,10 @@@
File stateFile = new File("locator" + port1 + "state.dat");
VM vm0 = Host.getHost(0).getVM(0);
final Properties p = new Properties();
- p.setProperty(DistributionConfig.LOCATORS_NAME, Host.getHost(0).getHostName() + "[" + port1 + "]");
- p.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- p.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ p.setProperty(LOCATORS, Host.getHost(0).getHostName() + "[" + port1 + "]");
+ p.setProperty(MCAST_PORT, "0");
+ p.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+ addDSProps(p);
if (stateFile.exists()) {
stateFile.delete();
}
@@@ -1916,8 -1926,9 +1942,9 @@@
System.setProperty(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS, "true");
System.setProperty("p2p.joinTimeout", "1000");
Properties locProps = new Properties();
- locProps.put("mcast-port", "0");
- locProps.put("log-level", LogWriterUtils.getDUnitLogLevel());
+ locProps.put(MCAST_PORT, "0");
+ locProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ addDSProps(locProps);
Locator.startLocatorAndDS(port, logFile, locProps);
} catch (IOException ex) {
com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port, ex);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ba436185/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index fb3c5a7,14a0df1..c7ce439
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@@ -85,13 -113,14 +92,14 @@@ public class JGroupsMessengerJUnitTest
messenger = null;
}
Properties nonDefault = new Properties();
- nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
- nonDefault.put(DistributionConfig.MCAST_PORT_NAME, enableMcast? ""+AvailablePortHelper.getRandomAvailableUDPPort() : "0");
- nonDefault.put(DistributionConfig.MCAST_TTL_NAME, "0");
- nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
- nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
- nonDefault.put(DistributionConfig.LOCATORS_NAME, "localhost[10344]");
- nonDefault.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "1");
+ nonDefault.put(DISABLE_TCP, "true");
+ nonDefault.put(MCAST_PORT, enableMcast ? "" + AvailablePortHelper.getRandomAvailableUDPPort() : "0");
+ nonDefault.put(MCAST_TTL, "0");
+ nonDefault.put(LOG_FILE, "");
+ nonDefault.put(LOG_LEVEL, "fine");
+ nonDefault.put(LOCATORS, "localhost[10344]");
+ nonDefault.put(ACK_WAIT_THRESHOLD, "1");
+ nonDefault.putAll(addProp);
DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
RemoteTransportConfig tconfig = new RemoteTransportConfig(config,
DistributionManager.NORMAL_DM_TYPE);
[47/55] [abbrv] incubator-geode git commit: GEODE-1491: Make sure
when checking if a transaction is completed from
isHostedTxRecentlyCompleted() method,
the rolled back transaction is considered as well.
Posted by hi...@apache.org.
GEODE-1491: Make sure when checking if a transaction is completed from isHostedTxRecentlyCompleted() method, the rolled back transaction is considered as well.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0815e1b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0815e1b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0815e1b6
Branch: refs/heads/feature/GEODE-1372
Commit: 0815e1b6e9f11881b03780ac730856ee5db36c9c
Parents: 001a4e1
Author: eshu <es...@pivotal.io>
Authored: Mon Jun 6 12:38:25 2016 -0700
Committer: eshu <es...@pivotal.io>
Committed: Mon Jun 6 12:38:25 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/TXManagerImpl.java | 20 +++---
.../cache/partitioned/PartitionMessage.java | 2 +-
.../tier/sockets/command/RollbackCommand.java | 5 ++
.../internal/cache/TXManagerImplTest.java | 70 ++++++++++++++++++--
4 files changed, 83 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0815e1b6/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
index df0176d..2608878 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
@@ -1021,16 +1021,18 @@ public class TXManagerImpl implements CacheTransactionManager,
}
public boolean isHostedTxRecentlyCompleted(TXId txId) {
- // if someone is asking to see if we have the txId, they will come
- // back and ask for the commit message, this could take a long time
- // specially when called from TXFailoverCommand, so we move
- // the txId to the front of the queue
- TXCommitMessage msg = failoverMap.remove(txId);
- if (msg != null) {
- failoverMap.put(txId, msg);
- return true;
+ synchronized(failoverMap) {
+ if (failoverMap.containsKey(txId)) {
+ // if someone is asking to see if we have the txId, they will come
+ // back and ask for the commit message, this could take a long time
+ // specially when called from TXFailoverCommand, so we move
+ // the txId back to the linked map by removing and putting it back.
+ TXCommitMessage msg = failoverMap.remove(txId);
+ failoverMap.put(txId, msg);
+ return true;
+ }
+ return false;
}
- return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0815e1b6/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
index 9c54587..c2ab27e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
@@ -186,7 +186,7 @@ public abstract class PartitionMessage extends DistributionMessage implements
* (non-Javadoc)
* @see com.gemstone.gemfire.internal.cache.TransactionMessage#getTXOriginatorClient()
*/
- public final InternalDistributedMember getTXOriginatorClient() {
+ public InternalDistributedMember getTXOriginatorClient() {
return txMemberId;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0815e1b6/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RollbackCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RollbackCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RollbackCommand.java
index ed7c706..f0316bd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RollbackCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RollbackCommand.java
@@ -63,6 +63,11 @@ public class RollbackCommand extends BaseCommand {
txId = txState.getTxId();
txMgr.rollback();
sendRollbackReply(msg, servConn);
+ } else {
+ //could not find TxState in the host server.
+ //Protect against a failover command received so late,
+ //and it is removed from the failoverMap due to capacity.
+ sendRollbackReply(msg, servConn);
}
} catch (Exception e) {
writeException(msg, e, false, servConn);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0815e1b6/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
index a4b8127..ce24947 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.cache.partitioned.DestroyMessage;
import com.gemstone.gemfire.test.fake.Fakes;
@@ -44,24 +45,29 @@ public class TXManagerImplTest {
TXId completedTxid;
TXId notCompletedTxid;
InternalDistributedMember member;
- CountDownLatch latch = new CountDownLatch(1);
+ CountDownLatch latch;
TXStateProxy tx1, tx2;
+ DistributionManager dm;
+ TXRemoteRollbackMessage rollbackMsg;
@Before
public void setUp() {
Cache cache = Fakes.cache();
- txMgr = new TXManagerImpl(null, cache);
+ dm = mock(DistributionManager.class);
+ txMgr = new TXManagerImpl(mock(CachePerfStats.class), cache);
txid = new TXId(null, 0);
msg = mock(DestroyMessage.class);
txCommitMsg = mock(TXCommitMessage.class);
member = mock(InternalDistributedMember.class);
completedTxid = new TXId(member, 1);
notCompletedTxid = new TXId(member, 2);
+ latch = new CountDownLatch(1);
+ rollbackMsg = new TXRemoteRollbackMessage();
when(this.msg.canStartRemoteTransaction()).thenReturn(true);
when(this.msg.canParticipateInTransaction()).thenReturn(true);
}
-
+
@Test
public void getOrSetHostedTXStateAbleToSetTXStateAndGetLock(){
TXStateProxy tx = txMgr.getOrSetHostedTXState(txid, msg);
@@ -232,5 +238,61 @@ public class TXManagerImplTest {
txMgr.saveTXCommitMessageForClientFailover(completedTxid, txCommitMsg);
assertTrue(txMgr.hasTxAlreadyFinished(tx, completedTxid));
}
-
+
+ @Test
+ public void txRolledbackShouldCompleteTx() throws InterruptedException {
+ when(msg.getTXOriginatorClient()).thenReturn(mock(InternalDistributedMember.class));
+
+ Thread t1 = new Thread(new Runnable() {
+ public void run() {
+ try {
+ tx1 = txMgr.masqueradeAs(msg);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ try {
+ msg.process(dm);
+ } finally {
+ txMgr.unmasquerade(tx1);
+ }
+
+ TXStateProxy existingTx = masqueradeToRollback();
+ latch.countDown();
+ Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS)
+ .atMost(30, TimeUnit.SECONDS).until(() -> tx1.getLock().hasQueuedThreads());
+
+ rollbackTransaction(existingTx);
+ }
+ });
+ t1.start();
+
+ assertTrue(latch.await(60, TimeUnit.SECONDS));
+
+ TXStateProxy tx = txMgr.masqueradeAs(rollbackMsg);
+ assertEquals(tx, tx1);
+ t1.join();
+ rollbackTransaction(tx);
+ }
+
+ private TXStateProxy masqueradeToRollback() {
+ TXStateProxy existingTx;
+ try {
+ existingTx = txMgr.masqueradeAs(rollbackMsg);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ return existingTx;
+ }
+
+ private void rollbackTransaction(TXStateProxy existingTx) {
+ try {
+ if (!txMgr.isHostedTxRecentlyCompleted(txid)) {
+ txMgr.rollback();
+ }
+ } finally {
+ txMgr.unmasquerade(existingTx);
+ }
+ }
}
[53/55] [abbrv] incubator-geode git commit: GEODE-1464: remove sqlf
code
Posted by hi...@apache.org.
GEODE-1464: remove sqlf code
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/880f8648
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/880f8648
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/880f8648
Branch: refs/heads/feature/GEODE-1372
Commit: 880f86483f6b75775f34e6821046ba18deb933f0
Parents: 6967ac1
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon Jun 6 18:01:18 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon Jun 6 18:01:18 2016 -0700
----------------------------------------------------------------------
.../cache/query/internal/IndexUpdater.java | 123 --------
.../internal/DistributionMessage.java | 2 +-
.../internal/InternalDistributedSystem.java | 43 +--
.../distributed/internal/ReplyProcessor21.java | 6 +-
.../com/gemstone/gemfire/internal/DSCODE.java | 16 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 187 -------------
.../internal/DataSerializableFixedID.java | 56 +---
.../gemfire/internal/GemFireUtilLauncher.java | 165 -----------
.../internal/InternalDataSerializer.java | 7 -
.../gemstone/gemfire/internal/SystemAdmin.java | 2 -
.../com/gemstone/gemfire/internal/Version.java | 21 +-
.../gemfire/internal/VersionedDataStream.java | 5 +-
.../internal/cache/AbstractDiskRegionEntry.java | 5 -
.../internal/cache/AbstractRegionEntry.java | 30 +-
.../internal/cache/AbstractRegionMap.java | 238 ++--------------
.../gemfire/internal/cache/BucketAdvisor.java | 6 -
.../gemfire/internal/cache/BucketRegion.java | 45 +--
.../cache/CacheDistributionAdvisor.java | 28 +-
.../internal/cache/CacheServerLauncher.java | 2 +-
.../cache/CachedDeserializableFactory.java | 7 -
.../internal/cache/ColocationHelper.java | 67 +----
.../internal/cache/DestroyOperation.java | 3 -
.../gemfire/internal/cache/DiskEntry.java | 152 ++--------
.../gemfire/internal/cache/DiskInitFile.java | 2 -
.../gemfire/internal/cache/DiskRegion.java | 2 -
.../internal/cache/DiskWriteAttributesImpl.java | 91 ------
.../gemfire/internal/cache/DistTXState.java | 4 +-
.../cache/DistTXStateOnCoordinator.java | 2 +-
.../cache/DistributedCacheOperation.java | 31 +-
.../cache/DistributedPutAllOperation.java | 52 +---
.../internal/cache/DistributedRegion.java | 37 +--
...stributedRegionFunctionStreamingMessage.java | 2 -
.../cache/DistributedRemoveAllOperation.java | 24 +-
.../gemfire/internal/cache/EntryBits.java | 22 --
.../gemfire/internal/cache/EntryEventImpl.java | 255 +----------------
.../internal/cache/EntryOperationImpl.java | 15 +-
.../internal/cache/GemFireCacheImpl.java | 159 +++++------
.../gemfire/internal/cache/GridAdvisor.java | 6 +-
.../internal/cache/InitialImageOperation.java | 96 +------
.../internal/cache/InternalRegionArguments.java | 22 --
.../internal/cache/InvalidateOperation.java | 3 -
.../gemfire/internal/cache/KeyInfo.java | 5 +-
.../internal/cache/KeyWithRegionContext.java | 70 -----
.../gemfire/internal/cache/ListOfDeltas.java | 100 -------
.../gemfire/internal/cache/LocalRegion.java | 131 +--------
.../gemstone/gemfire/internal/cache/Oplog.java | 24 +-
.../internal/cache/PRHARedundancyProvider.java | 8 -
.../internal/cache/PartitionAttributesImpl.java | 10 -
.../internal/cache/PartitionedRegion.java | 280 +------------------
.../cache/PartitionedRegionDataStore.java | 16 --
.../gemfire/internal/cache/ProxyRegionMap.java | 23 +-
.../gemfire/internal/cache/QueuedOperation.java | 16 +-
.../gemfire/internal/cache/RegionEntry.java | 6 +-
.../gemfire/internal/cache/RegionMap.java | 8 +-
.../cache/RemoteContainsKeyValueMessage.java | 3 -
.../internal/cache/RemoteDestroyMessage.java | 13 +-
.../internal/cache/RemoteFetchEntryMessage.java | 3 -
.../cache/RemoteFetchVersionMessage.java | 3 -
.../internal/cache/RemoteGetMessage.java | 3 -
.../internal/cache/RemoteInvalidateMessage.java | 3 -
.../internal/cache/RemotePutAllMessage.java | 15 +-
.../internal/cache/RemotePutMessage.java | 32 +--
.../internal/cache/RemoteRemoveAllMessage.java | 6 +-
.../cache/SearchLoadAndWriteProcessor.java | 3 -
.../gemfire/internal/cache/TXEntry.java | 11 -
.../gemfire/internal/cache/TXEntryState.java | 32 +--
.../internal/cache/TXRegionLockRequestImpl.java | 14 +-
.../gemfire/internal/cache/TXRegionState.java | 5 -
.../gemfire/internal/cache/TXState.java | 5 +-
.../internal/cache/TXStateInterface.java | 1 -
.../cache/UpdateAttributesProcessor.java | 9 +-
.../cache/UpdateEntryVersionOperation.java | 5 -
.../gemfire/internal/cache/UpdateOperation.java | 36 +--
.../internal/cache/ValidatingDiskRegion.java | 3 -
.../internal/cache/WrappedCallbackArgument.java | 26 +-
.../gemfire/internal/cache/delta/Delta.java | 56 ----
.../cache/execute/AbstractExecution.java | 18 --
.../FunctionStreamingResultCollector.java | 3 +-
.../cache/execute/InternalExecution.java | 27 +-
.../cache/execute/InternalFunctionService.java | 2 +-
.../execute/InternalRegionFunctionContext.java | 5 -
.../cache/execute/MemberFunctionExecutor.java | 7 -
.../execute/MultiRegionFunctionExecutor.java | 7 -
.../execute/RegionFunctionContextImpl.java | 13 -
.../cache/execute/ServerFunctionExecutor.java | 7 -
.../partitioned/ContainsKeyValueMessage.java | 4 -
.../cache/partitioned/DestroyMessage.java | 4 -
.../partitioned/FetchBulkEntriesMessage.java | 6 -
.../cache/partitioned/FetchEntriesMessage.java | 6 -
.../cache/partitioned/FetchEntryMessage.java | 4 -
.../cache/partitioned/FetchKeysMessage.java | 6 -
.../internal/cache/partitioned/GetMessage.java | 16 +-
.../cache/partitioned/InvalidateMessage.java | 4 -
.../cache/partitioned/PREntriesIterator.java | 8 +-
.../PRUpdateEntryVersionMessage.java | 5 -
.../cache/partitioned/PartitionMessage.java | 18 --
.../cache/partitioned/PutAllPRMessage.java | 26 +-
.../internal/cache/partitioned/PutMessage.java | 36 +--
.../cache/partitioned/RegionAdvisor.java | 17 --
.../partitioned/RemoteFetchKeysMessage.java | 6 -
.../cache/partitioned/RemoveAllPRMessage.java | 11 +-
.../rebalance/PartitionedRegionLoadModel.java | 19 +-
.../sockets/command/GatewayReceiverCommand.java | 13 -
.../internal/cache/tx/DistTxEntryEvent.java | 14 +-
.../cache/wan/AbstractGatewaySender.java | 2 +-
.../AbstractGatewaySenderEventProcessor.java | 2 +-
.../wan/GatewaySenderEventCallbackArgument.java | 8 +-
.../cache/wan/GatewaySenderEventImpl.java | 13 +-
.../parallel/ParallelGatewaySenderQueue.java | 9 +-
.../xmlcache/RegionAttributesCreation.java | 2 -
.../gemfire/internal/i18n/LocalizedStrings.java | 11 -
.../internal/logging/LoggingThreadGroup.java | 2 -
.../internal/logging/ManagerLogWriter.java | 34 ---
.../gemfire/internal/logging/PureLogWriter.java | 2 -
.../gemfire/internal/offheap/OffHeapHelper.java | 1 -
.../offheap/ReferenceCountHelperImpl.java | 1 -
.../offheap/annotations/OffHeapIdentifier.java | 4 -
.../gemfire/internal/shared/NativeCalls.java | 33 +--
.../gemfire/internal/util/ArrayUtils.java | 2 +-
.../CustomEntryConcurrentHashMap.java | 2 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 140 ----------
.../gemfire/distributed/LocatorDUnitTest.java | 2 +-
.../disttx/DistributedTransactionDUnitTest.java | 12 -
...wardCompatibilitySerializationDUnitTest.java | 9 -
.../execute/PRCustomPartitioningDUnitTest.java | 3 +-
.../FetchEntriesMessageJUnitTest.java | 1 -
.../sanctionedDataSerializables.txt | 27 +-
.../codeAnalysis/sanctionedSerializables.txt | 1 -
128 files changed, 292 insertions(+), 3368 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/IndexUpdater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/IndexUpdater.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/IndexUpdater.java
deleted file mode 100644
index facbdf2..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/IndexUpdater.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.cache.query.internal;
-
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.TimeoutException;
-import com.gemstone.gemfire.distributed.LockNotHeldException;
-import com.gemstone.gemfire.internal.cache.BucketRegion;
-import com.gemstone.gemfire.internal.cache.EntryEventImpl;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.RegionEntry;
-
-public interface IndexUpdater {
-
- /**
- * This method is invoked when an entry is added, updated or destroyed in a
- * region for index maintenance. This method will do some pre-update
- * operations for the index like constraint checks or any other logging that
- * may be required, and any index updates if required.
- *
- * @param owner
- * the {@link Region} that owns this event; will be different from
- * {@link EntryEvent#getRegion()} for partitioned regions
- * @param event
- * the {@link EntryEvent} representing the operation.
- * @param entry
- * the region entry.
- */
- public void onEvent(LocalRegion owner, EntryEventImpl event, RegionEntry entry);
-
- /**
- * This method is invoked after an entry has been added, updated or destroyed
- * in a region for index maintenance. This method will commit the changes to
- * the indexes or may rollback some of the changes done in {@link #onEvent} if
- * the entry operation failed for some reason.
- *
- * @param owner
- * the {@link Region} that owns this event; will be different from
- * {@link EntryEvent#getRegion()} for partitioned regions
- * @param event
- * the {@link EntryEvent} representing the operation.
- * @param entry
- * the region entry.
- * @param success
- * true if the entry operation succeeded and false otherwise.
- */
- public void postEvent(LocalRegion owner, EntryEventImpl event,
- RegionEntry entry, boolean success);
-
- /**
- * Invoked to clear all index entries for a bucket before destroying it.
- *
- * @param baseBucket
- * the {@link BucketRegion} being destroyed
- * @param bucketId
- * the ID of the bucket being destroyed
- */
- public void clearIndexes(BucketRegion baseBucket, int bucketId);
-
- /**
- * Take a read lock indicating that bucket/region GII is in progress to block
- * index list updates during the process.
- *
- * This is required to be a reentrant lock. The corresponding write lock that
- * will be taken by the implementation internally should also be reentrant.
- *
- * @throws TimeoutException
- * in case of timeout in acquiring the lock
- */
- public void lockForGII() throws TimeoutException;
-
- /**
- * Release the read lock taken for GII by {@link #lockForGII()}.
- *
- * @throws LockNotHeldException
- * if the current thread does not hold the read lock for GII
- */
- public void unlockForGII() throws LockNotHeldException;
-
- /**
- * Take a read lock to wait for completion of any index load in progress
- * during initial DDL replay. This is required since no table level locks are
- * acquired during initial DDL replay to avoid blocking most (if not all) DMLs
- * in the system whenever a new node comes up.
- *
- * This will be removed at some point when we allow for concurrent loading and
- * initialization of index even while operations are in progress using
- * something similar to region GII token mode for indexes or equivalent (bug
- * 40899).
- *
- * This is required to be a reentrant lock. The corresponding write lock that
- * will be taken by the implementation internally should also be reentrant.
- *
- * @return true if locking was required and was acquired and false if it was
- * not required
- * @throws TimeoutException
- * in case of timeout in acquiring the lock
- */
- public boolean lockForIndexGII() throws TimeoutException;
-
- /**
- * Release the read lock taken for GII by {@link #lockForIndexGII()}.
- *
- * @throws LockNotHeldException
- * if the current thread does not hold the read lock
- */
- public void unlockForIndexGII() throws LockNotHeldException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
index 3a64d06..85a4269 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
@@ -192,7 +192,7 @@ public abstract class DistributionMessage
return true;
case DistributionManager.REGION_FUNCTION_EXECUTION_EXECUTOR:
// allow nested distributed functions to be executed from within the
- // execution of a function; this is required particularly for SQLFabric
+ // execution of a function
// TODO: this can later be adjusted to use a separate property
return false;
default:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 9d49b49..af81cc1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -184,9 +184,6 @@ public class InternalDistributedSystem
* a live locator can be contacted.
*/
private QuorumChecker quorumChecker;
-
- /** sqlfire disconnect listener */
- private DisconnectListener sqlfDisconnectListener;
/**
* A Constant that matches the ThreadGroup name of the shutdown hook.
@@ -2115,40 +2112,6 @@ public class InternalDistributedSystem
}
}
}
-
- /**
- * sqlfire's disconnect listener is invoked before the cache is closed when
- * there is a forced disconnect
- */
- public void setSqlfForcedDisconnectListener(DisconnectListener listener) {
- synchronized(this.listeners) {
- this.sqlfDisconnectListener = listener;
- }
- }
-
- private void notifySqlfForcedDisconnectListener() {
- if (this.sqlfDisconnectListener != null) {
- final boolean isDebugEnabled = logger.isDebugEnabled();
- try {
- if (isDebugEnabled) {
- logger.debug("notifying sql disconnect listener");
- }
- this.sqlfDisconnectListener.onDisconnect(this);
- } catch (VirtualMachineError e) {
- SystemFailure.initiateFailure(e);
- throw e;
- } catch (Throwable e) {
- SystemFailure.checkFailure();
- // TODO: should these be logged or ignored? We need to see them
- logger.info("", e);
- }
- if (isDebugEnabled) {
- logger.debug("finished notifying sql disconnect listener");
- }
- }
- }
-
-
/**
* Makes note of a <code>DisconnectListener</code> whose
@@ -2485,12 +2448,9 @@ public class InternalDistributedSystem
}
if (isDebugEnabled) {
- logger.debug("tryReconnect: forcedDisconnect={} sqlf listener={}", forcedDisconnect, this.sqlfDisconnectListener);
+ logger.debug("tryReconnect: forcedDisconnect={}", forcedDisconnect);
}
if (forcedDisconnect) {
- // allow the fabric-service to stop before dismantling everything
- notifySqlfForcedDisconnectListener();
-
if (config.getDisableAutoReconnect()) {
if (isDebugEnabled) {
logger.debug("tryReconnect: auto reconnect after forced disconnect is disabled");
@@ -2717,7 +2677,6 @@ public class InternalDistributedSystem
DM newDM = this.reconnectDS.getDistributionManager();
if (newDM instanceof DistributionManager) {
- // sqlfire will have already replayed DDL and recovered.
// Admin systems don't carry a cache, but for others we can now create
// a cache
if (((DistributionManager)newDM).getDMType() != DistributionManager.ADMIN_ONLY_DM_TYPE) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
index 49e11df..21171b2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
@@ -609,8 +609,7 @@ public class ReplyProcessor21
}
// start waiting for replies without explicitly waiting for all of them using
- // waitForReplies* methods; useful for streaming of results in function
- // execution and SQLFabric
+ // waitForReplies* methods; useful for streaming of results in function execution
public final void startWait() {
if (!this.waiting && stillWaiting()) {
preWait();
@@ -618,8 +617,7 @@ public class ReplyProcessor21
}
// end waiting for replies without explicitly invoking waitForReplies*
- // methods; useful for streaming of results in function execution and
- // SQLFabric
+ // methods; useful for streaming of results in function execution
public final void endWait(boolean doCleanup) {
try {
postWait();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
index cef660a..583b2ab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
@@ -322,25 +322,13 @@ public interface DSCODE {
*/
public static final byte HUGE_STRING = 89;
- /**
- * A header byte meaning that the next element in the stream is an
- * SQLFabric DataValueDescriptor array.
- *
- * @since GemFire 6.0
- */
- public static final byte SQLF_DVD_ARR = 90;
+ // 90 unused
/** A header byte meaning that the next element in the stream is a
* <code>byte[][]</code>. */
public static final byte ARRAY_OF_BYTE_ARRAYS = 91;
- /**
- * A header byte meaning that the next element in the stream is an
- * object of SQLFabric XML type.
- *
- * @since GemFire 6.5
- */
- public static final byte SQLF_XML = 92;
+ // 92 unused
/**
* A header byte meaning that the next element in the stream is a
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
index 5f0002a..ab76d5c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
@@ -1064,16 +1064,6 @@ public final class DSFIDFactory implements DataSerializableFixedID {
return readUndefined(in);
case RESULTS_BAG:
return readResultsBag(in);
- case SQLF_TYPE:
- return readSqlfMessage(in);
- case SQLF_DVD_OBJECT:
- return readDVD(in);
- case SQLF_GLOBAL_ROWLOC:
- return readGlobalRowLocation(in);
- case SQLF_GEMFIRE_KEY:
- return readGemFireKey(in);
- case SQLF_FORMATIBLEBITSET:
- return readSqlFormatibleBitSet(in);
case TOKEN_INVALID:
return Token.INVALID;
case TOKEN_LOCAL_INVALID:
@@ -1175,183 +1165,6 @@ public final class DSFIDFactory implements DataSerializableFixedID {
serializable.fromData(in);
return serializable;
}
- /**
- * Map for SQLFabric specific classIds to the {@link Class} of an
- * implementation. We maintain this separate map for SQLFabric to allow
- * separation of GemFire and SQLFabric trees. This is particularly required
- * when implementing a new <code>DistributionMessage</code>. This requires the
- * classes to have a zero argument constructor.
- */
- @SuppressWarnings("unchecked")
- private static Class<? extends DataSerializableFixedID>[] sqlfDSFIDClassMap =
- new Class[Byte.MAX_VALUE + 1 - Byte.MIN_VALUE];
-
- /**
- * Map for SQLFabric specific classIds to the {@link DataSerializableFixedID}
- * singleton instance. We maintain this separate map for SQLFabric to allow
- * separation of GemFire and SQLFabric trees. This approach is needed to
- * allow transparent serialization of singleton objects
- */
- private static DataSerializableFixedID[] sqlfDSFIDFixedInstanceMap =
- new DataSerializableFixedID[Byte.MAX_VALUE + 1 - Byte.MIN_VALUE];
-
- /**
- * Exception to indicate SQLFabric specific serialization exceptions
- */
- public static class SqlfSerializationException extends
- NotSerializableException {
-
- private static final long serialVersionUID = 5076687296705595933L;
-
- /**
- * Constructs a SqlfSerializationException object with message string.
- *
- * @param msg
- * exception message
- */
- public SqlfSerializationException(String msg) {
- super(msg);
- }
- }
-
- private static DataSerializableFixedID readSqlfMessage(DataInput in)
- throws IOException, ClassNotFoundException {
- // Use the first byte as the typeId of SQLFabric messages
- final byte sqlfId = in.readByte();
- final int sqlfIdIndex = sqlfId & 0xFF;
- final Class<? extends DataSerializableFixedID> sqlfClass =
- sqlfDSFIDClassMap[sqlfIdIndex];
- if (sqlfClass != null) {
- try {
- final DataSerializableFixedID sqlfObj = sqlfClass.newInstance();
- InternalDataSerializer.invokeFromData(sqlfObj, in);
- return sqlfObj;
- } catch (InstantiationException ex) {
- throw new SqlfSerializationException(LocalizedStrings.
- DSFIDFactory_COULD_NOT_INSTANTIATE_SQLFABRIC_MESSAGE_CLASSID_0_1
- .toLocalizedString(new Object[] { sqlfId, ex }));
- } catch (IllegalAccessException ex) {
- throw new SqlfSerializationException(LocalizedStrings.
- DSFIDFactory_ILLEGAL_ACCESS_FOR_SQLFABRIC_MESSAGE_CLASSID_0_1
- .toLocalizedString(new Object[] { sqlfId, ex }));
- }
- }//check for fixed instance
- DataSerializableFixedID fixedInstance = sqlfDSFIDFixedInstanceMap[sqlfIdIndex];
- if (fixedInstance != null) {
- InternalDataSerializer.invokeFromData(fixedInstance, in);
- return fixedInstance;
- }
- // if possible set the processor ID before throwing exception so
- // that failure exception is received by the sender
- if (sqlfIdIndex < 60) {
- try {
- // both SqlfMessage and SqlfReplyMessage write a byte for status first
- // followed by the processor ID, if any
- final byte status = in.readByte();
- int processorId = 0;
- if ((status & ReplyMessage.PROCESSOR_ID_FLAG) != 0) {
- processorId = in.readInt();
- }
- ReplyProcessor21.setMessageRPId(processorId);
- } catch (IOException ex) {
- // give up
- }
- }
- throw new SqlfSerializationException(
- LocalizedStrings.DSFIDFactory_UNKNOWN_CLASSID_0_FOR_SQLFABRIC_MESSAGE
- .toLocalizedString(sqlfId));
- }
-
- public static synchronized void registerSQLFabricClass(byte classId,
- Class<? extends DataSerializableFixedID> c) {
- final int sqlfIdIndex = classId & 0xFF;
- Class<?> oldClass = sqlfDSFIDClassMap[sqlfIdIndex];
- if (oldClass != null) {
- throw new AssertionError("DSFIDFactory#registerSQLFabricClass: cannot "
- + "re-register classId " + classId + " for class " + c
- + "; existing class: " + oldClass);
- }
- sqlfDSFIDClassMap[sqlfIdIndex] = c;
- }
-
- public static synchronized void registerSQLFabricFixedInstance(byte classId,
- DataSerializableFixedID fixedInstance)
- {
- final int sqlfIdIndex = classId & 0xFF;
- DataSerializableFixedID oldInstance = sqlfDSFIDFixedInstanceMap[sqlfIdIndex];
- if (oldInstance != null) {
- throw new AssertionError("DSFIDFactory#registerSQLFabricClass: cannot "
- + "re-register classId " + classId + " for instance " + fixedInstance
- + "; existing instance: " + oldInstance);
- }
- sqlfDSFIDFixedInstanceMap[sqlfIdIndex] = fixedInstance;
- }
-
- public static synchronized void unregisterSQLFabricClass(byte classId,
- Class<? extends DataSerializableFixedID> c) {
- final int sqlfIdIndex = classId & 0xFF;
- sqlfDSFIDClassMap[sqlfIdIndex] = null;
- }
-
- public static synchronized void unregisterSQLFabricFixedInstance(
- byte classId, Object dataSerializableFixedID)
- {
- final int sqlfIdIndex = classId & 0xFF;
- sqlfDSFIDFixedInstanceMap[sqlfIdIndex] = null;
- }
-
- public static synchronized void clearSQLFabricClasses() {
- for (int index = 0; index < sqlfDSFIDClassMap.length; ++index) {
- sqlfDSFIDClassMap[index] = null;
- }
- for (int index = 0; index < sqlfDSFIDFixedInstanceMap.length; ++index) {
- sqlfDSFIDFixedInstanceMap[index] = null;
- }
- }
-
- public interface DeserializeDVD {
-
- public DataSerializableFixedID getDSFID(DataInput in) throws IOException,
- ClassNotFoundException;
-
- public DataSerializableFixedID getGlobalRowLocation(DataInput in)
- throws IOException, ClassNotFoundException;
-
- public DataSerializableFixedID getGemFireKey(DataInput in)
- throws IOException, ClassNotFoundException;
-
- public DataSerializableFixedID getSqlPSQArgs(DataInput in)
- throws IOException, ClassNotFoundException;
-
- public DataSerializableFixedID getSqlFormatibleBitSet(DataInput in)
- throws IOException, ClassNotFoundException;
- }
-
- private static DeserializeDVD dvdDeserializer;
-
- private static DataSerializableFixedID readDVD(DataInput in)
- throws IOException, ClassNotFoundException {
- return dvdDeserializer.getDSFID(in);
- }
-
- private static DataSerializableFixedID readGlobalRowLocation(DataInput in)
- throws IOException, ClassNotFoundException {
- return dvdDeserializer.getGlobalRowLocation(in);
- }
-
- private static DataSerializableFixedID readGemFireKey(DataInput in)
- throws IOException, ClassNotFoundException {
- return dvdDeserializer.getGemFireKey(in);
- }
-
- private static DataSerializableFixedID readSqlFormatibleBitSet(DataInput in)
- throws IOException, ClassNotFoundException {
- return dvdDeserializer.getSqlFormatibleBitSet(in);
- }
-
- public static void registerDVDDeserializer(DeserializeDVD d) {
- dvdDeserializer = d;
- }
private static DataSerializableFixedID readSnappyCompressedCachedDeserializable(DataInput in)
throws IOException, ClassNotFoundException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
index 0788503..d3e4846 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
@@ -136,8 +136,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte ADD_CACHESERVER_PROFILE_UPDATE = -118;
public static final byte SERVER_INTEREST_REGISTRATION_MESSAGE = -117;
public static final byte FILTER_PROFILE_UPDATE = -116;
- // [sumedh] below two IDs are no longer used in new TX model and will be
- // removed at some point after SQLF upmerge
public static final byte JTA_AFTER_COMPLETION_MESSAGE = -115;
public static final byte JTA_BEFORE_COMPLETION_MESSAGE = -114;
public static final byte INVALIDATE_PARTITIONED_REGION_MESSAGE = -113;
@@ -169,8 +167,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte CREATE_REGION_MESSAGE = -89;
public static final byte DESTROY_PARTITIONED_REGION_MESSAGE = -88;
- // [sumedh] below two IDs are no longer used in new TX model and will be
- // removed at some point after SQLF upmerge
public static final byte COMMIT_PROCESS_QUERY_MESSAGE = -87;
public static final byte COMMIT_PROCESS_QUERY_REPLY_MESSAGE = -86;
public static final byte DESTROY_REGION_WITH_CONTEXT_MESSAGE = -85;
@@ -182,8 +178,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte STATE_STABILIZATION_MESSAGE = -79;
public static final byte STATE_STABILIZED_MESSAGE = -78;
public static final byte CLIENT_MARKER_MESSAGE_IMPL = -77;
- // [sumedh] below three IDs are no longer used in new TX model and will be
- // removed at some point after SQLF upmerge
public static final byte TX_LOCK_UPDATE_PARTICIPANTS_MESSAGE = -76;
public static final byte TX_ORIGINATOR_RECOVERY_MESSAGE = -75;
public static final byte TX_ORIGINATOR_RECOVERY_REPLY_MESSAGE = -74;
@@ -193,8 +187,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte NON_GRANTOR_DESTROYED_REPLY_MESSAGE = -70;
public static final byte TOMBSTONE_MESSAGE = -69;
public static final byte IDS_REGISTRATION_MESSAGE = -68;
- // [sumedh] below ID is no longer used in new TX model and will be
- // removed at some point after SQLF upmerge
public static final byte TX_LOCK_UPDATE_PARTICIPANTS_REPLY_MESSAGE = -67;
public static final byte STREAMING_REPLY_MESSAGE = -66;
public static final byte PREFER_BYTES_CACHED_DESERIALIZABLE = -65;
@@ -223,8 +215,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte GET_ALL_SERVERS_REQUEST = -43;
public static final byte GET_ALL_SERVRES_RESPONSE = -42;
- // [sumedh] below two IDs are no longer used in new TX model and will be
- // removed at some point after SQLF upmerge
public static final byte FIND_REMOTE_TX_REPLY = -41;
public static final byte FIND_REMOTE_TX_MESSAGE = -40;
@@ -257,40 +247,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte CLIENT_INTEREST_MESSAGE = -21;
- /**
- * A header byte meaning that the next element in the stream is a
- * type meant for SQL Fabric.
- */
- public static final byte SQLF_TYPE = -20;
-
- /**
- * A header byte meaning that the next element in the stream is a
- * DVD object used for SQL Fabric.
- */
- public static final byte SQLF_DVD_OBJECT = -19;
-
- /**
- * A header byte meaning that the next element in the stream is a
- * GlobalRowLocation object used for SQL Fabric.
- */
- public static final byte SQLF_GLOBAL_ROWLOC = -18;
-
- /**
- * A header byte meaning that the next element in the stream is a
- * GemFireKey object used for SQL Fabric.
- */
- public static final byte SQLF_GEMFIRE_KEY = -17;
-
- /**
- * A header byte meaning that the next element in the stream is a
- * FormatibleBitSet object in SQLFabric.
- */
- public static final byte SQLF_FORMATIBLEBITSET = -16;
-
- // IDs -15 .. -10 are not used in trunk yet but only in SQLFire, so marking
- // as used so that GemFire does not use them until the SQLF upmerge else
- // there will be big problems in backward compatibility after upmerge which
- // is required for both >= SQLF 1.1 and >= GFE 7.1
+ // IDs -20 .. -16 are not used
/**
* A header byte meaning that the next element in the stream is a
@@ -541,8 +498,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
// TXId
public static final byte TRANSACTION_ID = 109;
- // [sumedh] below ID is no longer used in new TX model and will be
- // removed at some point after SQLF upmerge
public static final byte TX_COMMIT_MESSAGE = 110;
public static final byte HA_PROFILE = 111;
@@ -565,8 +520,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte PR_GET_MESSAGE = 120;
- // [sumedh] below two IDs are no longer used in new TX model and will be
- // removed at some point after SQLF upmerge
// TXLockIdImpl
public static final byte TRANSACTION_LOCK_ID = 121;
// TXCommitMessage.CommitProcessForLockIdMessage
@@ -876,9 +829,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
* class. e.g. if msg format changed in version 80, create toDataPre_GFE_8_0_0_0, add
* Version.GFE_80 to the getSerializationVersions array and copy previous toData contents
* to this newly created toDataPre_GFE_X_X_X_X() method.
- * <p>
- * For GemFireXD use "GFXD" (or whatever we decide on as a product identifier
- * in Version) instead of "GFE" in method names.
* @throws IOException
* A problem occurs while writing to <code>out</code>
*/
@@ -894,10 +844,6 @@ public interface DataSerializableFixedID extends SerializationVersions {
* class. e.g. if msg format changed in version 80, create fromDataPre_GFE_8_0_0_0, add
* Version.GFE_80 to the getSerializationVersions array and copy previous fromData
* contents to this newly created fromDataPre_GFE_X_X_X_X() method.
- * <p>
- * For GemFireXD use "GFXD" (or whatever we decide on as a product identifier
- * in Version) instead of "GFE" in method names.
- *
* @throws IOException
* A problem occurs while reading from <code>in</code>
* @throws ClassNotFoundException
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java
deleted file mode 100644
index f7a3628..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.gemstone.gemfire.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.admin.jmx.internal.AgentLauncher;
-import com.gemstone.gemfire.internal.SystemAdmin;
-import com.gemstone.gemfire.internal.cache.CacheServerLauncher;
-
-/**
- * Maps the GemFire utilities to the launcher that starts them and then invokes
- * that class's main method. Currently this class is only a base class for the
- * SqlFabric implementation, but eventually the gemfire scripts will be
- * consolidated to use this class.
- * Current GemFire utilities (as of 6.0):
- * <ul>
- * <li> agent
- * <li> gemfire
- * <li> cacheserver
- * </ul>
- * Usage:
- * notYetWritenScript <utility> <utility arguments>
- *
- * @since GemFire 6.0
- */
-public class GemFireUtilLauncher {
-
- /**
- * Returns a mapping of utility names to the class used to spawn them.
- * This method is overridedn by SqlFabricUtilLauncher to handle that product's
- * own utility tools.
- **/
- protected Map<String, Class<?>> getTypes() {
- Map<String, Class<?>> m = new HashMap<String, Class<?>>();
- m.put("agent", AgentLauncher.class);
- m.put("gemfire", SystemAdmin.class);
- m.put("cacheserver", CacheServerLauncher.class);
- return m;
- }
-
- /**
- * A simple constructor was needed so that {@link #usage(String)}
- * and {@link #getTypes()} could be non-static methods.
- **/
- protected GemFireUtilLauncher() {}
-
- /**
- * This method should be overridden if the name of the script is different.
- * @return the name of the script used to launch this utility.
- **/
- protected String scriptName() {
- return "gemfire";
- }
-
- /**
- * Print help information for this utility.
- * This method is intentionally non-static so that getTypes() can dynamically
- * display the list of supported utilites supported by child classes.
- * @param context print this message before displaying the regular help text
- **/
- private void usage(String context) {
- System.out.println(context);
- StringBuffer sb = new StringBuffer();
- sb.append("help|");
- for(String key : getTypes().keySet()) {
- sb.append(key).append("|");
- }
- sb.deleteCharAt(sb.length()-1); // remove the extra "|"
- String msg = LocalizedStrings.GemFireUtilLauncher_ARGUMENTS
- .toLocalizedString(new Object[] {scriptName(), sb});
- System.out.println(msg);
- System.exit(1);
- }
-
- /**
- * Spawn the utilty passed in as args[0] or display help information
- * @param args a utilty and the arguments to pass to it.
- */
- public static void main(String[] args) {
- GemFireUtilLauncher launcher = new GemFireUtilLauncher();
- launcher.validateArgs(args);
- launcher.invoke(args);
- }
-
- /**
- * Calls the <code>public static void main(String[] args)</code> method
- * of the class associated with the utility name.
- * @param args the first argument is the utility name, the remainder
- * comprises the arguments to be passed
- */
- protected void invoke(String[] args) {
- Class<?> clazz = getTypes().get(args[0]);
- if(clazz == null) {
- usage(LocalizedStrings.GemFireUtilLauncher_INVALID_UTILITY_0
- .toLocalizedString(args[0]));
- }
- int len = args.length-1;
- String[] argv = new String[len];
- System.arraycopy(args, 1, argv, 0, len);
-
- Exception ex = null;
- try {
- Method m = clazz.getDeclaredMethod("main", new Class[] {argv.getClass()});
- m.invoke(null, (Object)argv);
- } catch (SecurityException se) {
- ex = se;
- } catch (NoSuchMethodException nsme) {
- ex = nsme;
- } catch (IllegalArgumentException iae) {
- ex = iae;
- } catch (IllegalAccessException iae) {
- ex = iae;
- } catch (InvocationTargetException ite) {
- ex = ite;
- } finally {
- if (ex != null) {
- String msg = LocalizedStrings.GemFireUtilLauncher_PROBLEM_STARTING_0
- .toLocalizedString(args[0]);
- throw new RuntimeException(msg, ex);
- }
- }
- }
-
- /**
- * Look for variations on help and validate the arguments make sense.
- * A usage mesage is displayed if necesary.
- * The following forms of help are accepted:
- * <code>--help, -help, /help, --h, -h, /h</code>
- **/
- protected void validateArgs(String[] args) {
- if (args.length == 0) {
- usage(LocalizedStrings.GemFireUtilLauncher_MISSING_COMMAND
- .toLocalizedString());
- }
- //Match all major variations on --help
- Pattern help = Pattern.compile("(?:--|-|/){0,1}h(?:elp)*",
- Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE);
- Matcher matcher = help.matcher(args[0]);
-
- if( matcher.matches() ) {
- usage(LocalizedStrings.GemFireUtilLauncher_HELP.toLocalizedString());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
index 0df656a..33cd410 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
@@ -74,11 +74,6 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
*/
private static final ConcurrentHashMap<String, DataSerializer> classesToSerializers = new ConcurrentHashMap<String, DataSerializer>();
- // used by sqlFire
- public static ConcurrentHashMap<String, DataSerializer> getClassesToSerializers() {
- return classesToSerializers;
- }
-
private static final String serializationVersionTxt = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "serializationVersion");
/**
* Any time new serialization format is added then a new enum needs to be added here.
@@ -2791,8 +2786,6 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
return DSFIDFactory.create(in.readInt(), in);
case DS_NO_FIXED_ID:
return readDataSerializableFixedID(in);
- case SQLF_DVD_ARR:
- return dvddeserializer.fromData(in);
case NULL:
return null;
case NULL_STRING:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
index 7cb7df1..5e561ed 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
@@ -1256,8 +1256,6 @@ public class SystemAdmin {
}
public SystemAdmin() {
- // no instances allowed
- // [sumedh] now is overridden by SQLF
// register DSFID types first; invoked explicitly so that all message type
// initializations do not happen in first deserialization on a possibly
// "precious" thread
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
index 513b5bd..1b8543e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
@@ -56,7 +56,7 @@ public final class Version implements Comparable<Version> {
/**
* Set to non-null if the underlying GemFire version is different from product
- * version (e.g. for SQLFire)
+ * version
*/
private Version gemfireVersion;
@@ -142,19 +142,6 @@ public final class Version implements Comparable<Version> {
public static final Version GFE_701 = new Version("GFE", "7.0.1", (byte)7,
(byte)0, (byte)1, (byte)0, GFE_701_ORDINAL);
- /**
- * SQLFire 1.1 has a separate version since it has changed the RowFormatter
- * formatting for ALTER TABLE add/drop column support. However, its underlying
- * GemFire version will remain at GFE_7x.
- *
- * This version is an intermediate one created to test rolling upgrades. It is
- * compatible with <code>SQLF_11</code> in all respects except for artifical
- * changes in a couple of P2P messages and marking as compatible with GFE_701.
- *
- * This is the GemFire conterpart of SQLF_1099 for testing rolling upgrades
- * and it uses the same ordinal as GFE_701 to maintain compatibility with the
- * ordinals being used on SQLFire branch.
- */
private static final byte GFE_7099_ORDINAL = 21;
public static final Version GFE_7099 = new Version("GFE", "7.0.99", (byte)7,
@@ -199,7 +186,7 @@ public final class Version implements Comparable<Version> {
(byte)0, (byte)0, (byte)0, GFE_90_ORDINAL);
/**
- * This constant must be set to the most current version of GFE/SQLF.
+ * This constant must be set to the most current version of the product.
* !!! NOTE: update HIGHEST_VERSION when changing CURRENT !!!
*/
public static final Version CURRENT = GFE_90;
@@ -261,8 +248,8 @@ public final class Version implements Comparable<Version> {
if (ordinal == TOKEN_ORDINAL) {
return TOKEN;
}
- // for GFE clients also check that there must be a commands object mapping
- // for processing (SQLF product versions will not work)
+ // for clients also check that there must be a commands object mapping
+ // for processing
if ((VALUES.length < ordinal + 1) || VALUES[ordinal] == null
|| (forGFEClients && CommandInitializer.getCommands(VALUES[ordinal]) == null)) {
throw new UnsupportedVersionException(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
index 7c5ca11..3e8bd98 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
@@ -25,10 +25,7 @@ import com.gemstone.gemfire.DataSerializable;
/**
* An extension to {@link DataOutput}, {@link DataInput} used internally in
* product to indicate that the input/output stream is attached to a GemFire
- * peer having a different version. See the spec on rolling upgrades for more
- * details: <a
- * href="https://wiki.gemstone.com/display/SQLF/Rolling+upgrades">Rolling
- * Upgrades</a>.
+ * peer having a different version.
*
* Internal product classes that implement {@link DataSerializableFixedID} and
* {@link DataSerializable} and change serialization format must check this on
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java
index b65b7ad..41cd110 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java
@@ -67,9 +67,4 @@ public abstract class AbstractDiskRegionEntry
GatewaySenderEventImpl.release(this._getValue()); // OFFHEAP _getValue ok
}
}
- @Override
- public void afterValueOverflow(RegionEntryContext context) {
- //NO OP
- //Overridden in sqlf RegionEntry
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
index 35f16bc..6ee4c17 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
@@ -150,7 +150,7 @@ public abstract class AbstractRegionEntry implements RegionEntry,
// by the RegionMap. It is unclear why this code is needed. ARM destroy
// does this also and we are now doing it as phase3 of the ARM destroy.
removePhase2();
- rgn.getRegionMap().removeEntry(event.getKey(), this, true, event, rgn, rgn.getIndexUpdater());
+ rgn.getRegionMap().removeEntry(event.getKey(), this, true, event, rgn);
}
}
}
@@ -291,10 +291,6 @@ public abstract class AbstractRegionEntry implements RegionEntry,
}
}
- final boolean isEagerDeserialize = dst.isEagerDeserialize();
- if (isEagerDeserialize) {
- dst.clearEagerDeserialize();
- }
dst.setLastModified(mgr, getLastModified()); // fix for bug 31059
if (v == Token.INVALID) {
dst.setInvalid();
@@ -307,17 +303,11 @@ public abstract class AbstractRegionEntry implements RegionEntry,
}
else if (v instanceof CachedDeserializable) {
// don't serialize here if it is not already serialized
-// if(v instanceof ByteSource && CachedDeserializableFactory.preferObject()) {
-// // For SQLFire we prefer eager deserialized
-// dst.setEagerDeserialize();
-// }
CachedDeserializable cd = (CachedDeserializable) v;
if (!cd.isSerialized()) {
dst.value = cd.getDeserializedForReading();
} else {
- /*if (v instanceof ByteSource && CachedDeserializableFactory.preferObject()) {
- dst.value = v;
- } else */ {
+ {
Object tmp = cd.getValue();
if (tmp instanceof byte[]) {
byte[] bb = (byte[]) tmp;
@@ -352,11 +342,7 @@ public abstract class AbstractRegionEntry implements RegionEntry,
return false;
}
}
- if (CachedDeserializableFactory.preferObject()) {
- dst.value = preparedValue;
- dst.setEagerDeserialize();
- }
- else {
+ {
try {
HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
BlobHelper.serializeTo(preparedValue, hdos);
@@ -412,7 +398,7 @@ public abstract class AbstractRegionEntry implements RegionEntry,
ReferenceCountHelper.setReferenceCountOwner(null);
return null;
} else {
- result = OffHeapHelper.copyAndReleaseIfNeeded(result); // sqlf does not dec ref count in this call
+ result = OffHeapHelper.copyAndReleaseIfNeeded(result);
ReferenceCountHelper.setReferenceCountOwner(null);
setRecentlyUsed();
return result;
@@ -749,9 +735,7 @@ public abstract class AbstractRegionEntry implements RegionEntry,
}
else {
FilterProfile fp = region.getFilterProfile();
- // rdubey: Old value also required for SqlfIndexManager.
- if (fp != null && ((fp.getCqCount() > 0) || expectedOldValue != null
- || event.getRegion().getIndexUpdater() != null)) {
+ if (fp != null && ((fp.getCqCount() > 0) || expectedOldValue != null)) {
//curValue = getValue(region); can cause deadlock will fault in the value
// and will confuse LRU. rdubey.
curValue = getValueOnDiskOrBuffer(region);
@@ -1393,10 +1377,6 @@ public abstract class AbstractRegionEntry implements RegionEntry,
}
}
}
- /**
- * soubhik: this method is overridden in sqlf flavor of entries.
- * Instead of overriding this method; override areSetValue.
- */
protected final void _setValue(Object val) {
setValueField(val);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
index a512750..bc919fc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.InvalidDeltaException;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.query.IndexMaintenanceException;
import com.gemstone.gemfire.cache.query.QueryException;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
import com.gemstone.gemfire.cache.query.internal.index.IndexProtocol;
import com.gemstone.gemfire.distributed.DistributedMember;
@@ -31,7 +30,6 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedM
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.cache.DiskInitFile.DiskRegionFlag;
import com.gemstone.gemfire.internal.cache.FilterRoutingInfo.FilterInfo;
-import com.gemstone.gemfire.internal.cache.delta.Delta;
import com.gemstone.gemfire.internal.cache.ha.HAContainerWrapper;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
import com.gemstone.gemfire.internal.cache.lru.LRUEntry;
@@ -69,21 +67,12 @@ import java.util.concurrent.atomic.AtomicInteger;
*
*/
-//Asif: In case of sqlFabric System, we are creating a different set of RegionEntry
-// which are derived from the concrete GFE RegionEntry classes.
-// In future if any new concrete RegionEntry class is defined, the new SqlFabric
-// RegionEntry Classes need to be created. There is a junit test in sqlfabric
-// which checks for RegionEntry classes of GFE and validates the same with its
-// own classes.
-
public abstract class AbstractRegionMap implements RegionMap {
private static final Logger logger = LogService.getLogger();
/** The underlying map for this region. */
protected CustomEntryConcurrentHashMap<Object, Object> map;
- /** An internal Listener for index maintenance for SQLFabric. */
- private final IndexUpdater indexUpdater;
/**
* This test hook is used to force the conditions for defect 48182.
@@ -96,16 +85,6 @@ public abstract class AbstractRegionMap implements RegionMap {
private transient Object owner; // the region that owns this map
protected AbstractRegionMap(InternalRegionArguments internalRegionArgs) {
- if (internalRegionArgs != null) {
- this.indexUpdater = internalRegionArgs.getIndexUpdater();
- }
- else {
- this.indexUpdater = null;
- }
- }
-
- public final IndexUpdater getIndexUpdater() {
- return this.indexUpdater;
}
protected void initialize(Object owner,
@@ -299,28 +278,17 @@ public abstract class AbstractRegionMap implements RegionMap {
}
public final void removeEntry(Object key, RegionEntry re, boolean updateStat,
- EntryEventImpl event, final LocalRegion owner,
- final IndexUpdater indexUpdater) {
+ EntryEventImpl event, final LocalRegion owner) {
boolean success = false;
if (re.isTombstone()&& _getMap().get(key) == re) {
logger.fatal(LocalizedMessage.create(LocalizedStrings.AbstractRegionMap_ATTEMPT_TO_REMOVE_TOMBSTONE), new Exception("stack trace"));
return; // can't remove tombstones except from the tombstone sweeper
}
- try {
- if (indexUpdater != null) {
- indexUpdater.onEvent(owner, event, re);
- }
-
- if (_getMap().remove(key, re)) {
- re.removePhase2();
- success = true;
- if (updateStat) {
- incEntryCount(-1);
- }
- }
- } finally {
- if (indexUpdater != null) {
- indexUpdater.postEvent(owner, event, re, success);
+ if (_getMap().remove(key, re)) {
+ re.removePhase2();
+ success = true;
+ if (updateStat) {
+ incEntryCount(-1);
}
}
}
@@ -759,7 +727,6 @@ public abstract class AbstractRegionMap implements RegionMap {
boolean deferLRUCallback,
VersionTag entryVersion, InternalDistributedMember sender, boolean isSynchronizing)
{
- assert indexUpdater == null : "indexUpdater should only exist if sqlfire";
boolean result = false;
boolean done = false;
boolean cleared = false;
@@ -1377,8 +1344,7 @@ public abstract class AbstractRegionMap implements RegionMap {
if (!inTokenMode) {
if ( re.getVersionStamp() == null) {
re.removePhase2();
- removeEntry(event.getKey(), re, true, event, owner,
- indexUpdater);
+ removeEntry(event.getKey(), re, true, event, owner);
removed = true;
}
}
@@ -1399,8 +1365,7 @@ public abstract class AbstractRegionMap implements RegionMap {
owner.recordEvent(event);
if (re.getVersionStamp() == null) {
re.removePhase2();
- removeEntry(event.getKey(), re, true, event, owner,
- indexUpdater);
+ removeEntry(event.getKey(), re, true, event, owner);
lruEntryDestroy(re);
} else {
if (re.isTombstone()) {
@@ -1430,8 +1395,7 @@ public abstract class AbstractRegionMap implements RegionMap {
finally {
if (re.isRemoved() && !re.isTombstone()) {
if (!removed) {
- removeEntry(event.getKey(), re, true, event, owner,
- indexUpdater);
+ removeEntry(event.getKey(), re, true, event, owner);
}
}
}
@@ -1543,7 +1507,6 @@ public abstract class AbstractRegionMap implements RegionMap {
try {
synchronized (re) {
if (!re.isRemoved() || re.isTombstone()) {
- EntryEventImpl sqlfEvent = null;
Object oldValue = re.getValueInVM(owner);
final int oldSize = owner.calculateRegionEntryValueSize(re);
// Create an entry event only if the calling context is
@@ -1554,15 +1517,10 @@ public abstract class AbstractRegionMap implements RegionMap {
key, null, txId, txEvent, eventId, aCallbackArgument, filterRoutingInfo, bridgeContext, txEntryState, versionTag, tailKey);
try {
- if (/* owner.isUsedForPartitionedRegionBucket() && */
- indexUpdater != null) {
- sqlfEvent = cbEvent;
- } else {
if (owner.isUsedForPartitionedRegionBucket()) {
txHandleWANEvent(owner, cbEvent, txEntryState);
}
cbEvent.setRegionEntry(re);
- }
cbEvent.setOldValue(oldValue);
if (isDebugEnabled) {
logger.debug("txApplyDestroy cbEvent={}", cbEvent);
@@ -1583,11 +1541,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
else {
if (!re.isTombstone()) {
- if (sqlfEvent != null) {
- re.removePhase1(owner, false); // fix for bug 43063
- re.removePhase2();
- removeEntry(key, re, true, sqlfEvent, owner, indexUpdater);
- } else {
+ {
if (shouldPerformConcurrencyChecks(owner, cbEvent) && cbEvent.getVersionTag() != null) {
re.makeTombstone(owner, cbEvent.getVersionTag());
} else {
@@ -2616,80 +2570,6 @@ public abstract class AbstractRegionMap implements RegionMap {
return retVal;
}
- protected static final MapCallbackAdapter<Object, Object, Object, Object>
- listOfDeltasCreator = new MapCallbackAdapter<Object, Object,
- Object, Object>() {
- @Override
- public Object newValue(Object key, Object context, Object createParams,
- final MapResult result) {
- return new ListOfDeltas(4);
- }
- };
-
- /**
- * Neeraj: The below if block is to handle the special
- * scenario witnessed in Sqlfabric for now. (Though its
- * a general scenario). The scenario is that the updates start coming
- * before the base value reaches through GII. In that scenario the updates
- * essentially the deltas are added to a list and kept as oldValue in the
- * map and this method returns. When through GII the actual base value arrives
- * these updates or deltas are applied on it and the new value thus got is put
- * in the map.
- * @param event
- * @param ifOld
- * @return true if delta was enqued
- */
- private boolean enqueDelta(EntryEventImpl event, boolean ifOld) {
- final IndexUpdater indexManager = getIndexUpdater();
- LocalRegion owner = _getOwner();
- if (indexManager != null && !owner.isInitialized() && event.hasDelta()) {
- boolean isOldValueDelta = true;
- try {
- if (ifOld) {
- final Delta delta = event.getDeltaNewValue();
- RegionEntry re = getOrCreateRegionEntry(owner, event, null,
- listOfDeltasCreator, false, false);
- assert re != null;
- synchronized (re) {
- @Retained @Released Object oVal = re.getValueOffHeapOrDiskWithoutFaultIn(owner);
- if (oVal != null) {
- try {
- if (oVal instanceof ListOfDeltas) {
- if (logger.isDebugEnabled()) {
- logger.debug("basicPut: adding delta to list of deltas: {}", delta);
- }
- ((ListOfDeltas)oVal).merge(delta);
- @Retained Object newVal = ((AbstractRegionEntry)re).prepareValueForCache(owner, oVal, true);
- re.setValue(owner, newVal); // TODO:KIRK:48068 prevent orphan
- }
- else {
- isOldValueDelta = false;
- }
- }finally {
- OffHeapHelper.release(oVal);
- }
- }
- else {
- if (logger.isDebugEnabled()) {
- logger.debug("basicPut: new list of deltas with delta: {}", delta);
- }
- @Retained Object newVal = new ListOfDeltas(delta);
- // TODO no need to call AbstractRegionMap.prepareValueForCache here?
- newVal = ((AbstractRegionEntry)re).prepareValueForCache(owner, newVal, true);
- re.setValue(owner, newVal); // TODO:KIRK:48068 prevent orphan
- }
- }
- }
- } catch (RegionClearedException ex) {
- // Neeraj: We can just ignore this exception because we are returning after this block
- }
- if (isOldValueDelta) {
- return true;
- }
- }
- return false;
- }
-
/*
* returns null if the operation fails
*/
@@ -2747,31 +2627,11 @@ public abstract class AbstractRegionMap implements RegionMap {
// reference of the diskSegmentRegion as a ThreadLocal so that if the diskRegionSegment
// is later changed by another thread, we can do the necessary.
boolean uninitialized = !owner.isInitialized();
- // SqlFabric Changes - BEGIN
- if (enqueDelta(event, ifOld)) {
- return null;
- }
-
- final IndexUpdater indexManager = getIndexUpdater();
-
- boolean sqlfIndexLocked = false;
- // SqlFabric Changes - END
-
boolean retrieveOldValueForDelta = event.getDeltaBytes() != null
&& event.getRawNewValue() == null;
lockForCacheModification(owner, event);
IndexManager oqlIndexManager = null;
try {
- // take read lock for SQLF index initializations if required; the index
- // GII lock is for any updates that may come in while index is being
- // loaded during replay see bug #41377; this will go away once we allow
- // for indexes to be loaded completely in parallel (#40899); need to
- // take this lock before the RegionEntry lock else a deadlock can happen
- // between this thread and index loading thread that will first take the
- // corresponding write lock on the IndexUpdater
- if (indexManager != null) {
- sqlfIndexLocked = indexManager.lockForIndexGII();
- }
// Fix for Bug #44431. We do NOT want to update the region and wait
// later for index INIT as region.clear() can cause inconsistency if
// happened in parallel as it also does index INIT.
@@ -2883,8 +2743,7 @@ public abstract class AbstractRegionMap implements RegionMap {
} finally {
OffHeapHelper.release(oldValueForDelta);
if (re != null && !onlyExisting && !isOpComplete(re, event)) {
- owner.cleanUpOnIncompleteOp(event, re, eventRecorded,
- false/* updateStats */, replaceOnClient);
+ owner.cleanUpOnIncompleteOp(event, re);
}
else if (re != null && owner.isUsedForPartitionedRegionBucket()) {
BucketRegion br = (BucketRegion)owner;
@@ -2902,9 +2761,6 @@ public abstract class AbstractRegionMap implements RegionMap {
throw dae;
} finally {
releaseCacheModificationLock(owner, event);
- if (sqlfIndexLocked) {
- indexManager.unlockForIndexGII();
- }
if (oqlIndexManager != null) {
oqlIndexManager.countDownIndexUpdaters();
}
@@ -2914,22 +2770,6 @@ public abstract class AbstractRegionMap implements RegionMap {
final boolean invokeListeners = event.basicGetNewValue() != Token.TOMBSTONE;
owner.basicPutPart3(event, result, !uninitialized,
lastModifiedTime, invokeListeners, ifNew, ifOld, expectedOldValue, requireOldValue);
- } catch (EntryExistsException eee) {
- // SQLFabric changes BEGIN
- // ignore EntryExistsException in distribution from a non-empty
- // region since actual check will be done in this put itself
- // and it can happen in distribution if put comes in from
- // GII as well as distribution channel
- if (indexManager != null) {
- if (logger.isTraceEnabled()) {
- logger.trace("basicPut: ignoring EntryExistsException in distribution {}", eee);
- }
- }
- else {
- // can this happen for non-SQLFabric case?
- throw eee;
- }
- // SQLFabric changes END
} finally {
// bug 32589, post update may throw an exception if exception occurs
// for any recipients
@@ -2985,23 +2825,11 @@ public abstract class AbstractRegionMap implements RegionMap {
return true;
}
- // Asif: If the new value is an instance of SerializableDelta, then
- // the old value requirement is a must & it needs to be faulted in
- // if overflown to disk without affecting LRU? This is needed for
- // Sql Fabric.
- // [sumedh] store both the value in VM and the value in VM or disk;
- // the former is used for updating the VM size calculations, while
- // the latter is used in other places like passing to
- // SqlfIndexManager or setting the old value in the event; this is
- // required since using the latter for updating the size
- // calculations will be incorrect in case the value was read from
- // disk but not brought into the VM like what getValueInVMOrDisk
- // method does when value is not found in VM
// PRECONDITION: caller must be synced on re
private void setOldValueInEvent(EntryEventImpl event, RegionEntry re, boolean cacheWrite, boolean requireOldValue) {
- boolean needToSetOldValue = getIndexUpdater() != null || cacheWrite || requireOldValue || event.getOperation().guaranteesOldValue();
+ boolean needToSetOldValue = cacheWrite || requireOldValue || event.getOperation().guaranteesOldValue();
if (needToSetOldValue) {
- if (event.hasDelta() || event.getOperation().guaranteesOldValue()) {
+ if (event.getOperation().guaranteesOldValue()) {
// In these cases we want to even get the old value from disk if it is not in memory
ReferenceCountHelper.skipRefCountTracking();
@Released Object oldValueInVMOrDisk = re.getValueOffHeapOrDiskWithoutFaultIn(event.getLocalRegion());
@@ -3186,7 +3014,6 @@ public abstract class AbstractRegionMap implements RegionMap {
final boolean isClientTXOriginator = owner.cache.isClient() && !hasRemoteOrigin;
final boolean isRegionReady = owner.isInitialized();
@Released EntryEventImpl cbEvent = null;
- @Released EntryEventImpl sqlfEvent = null;
boolean invokeCallbacks = shouldCreateCBEvent(owner, isRegionReady);
boolean cbEventInPending = false;
cbEvent = createCBEvent(owner, putOp, key, newValue, txId,
@@ -3202,12 +3029,6 @@ public abstract class AbstractRegionMap implements RegionMap {
txHandleWANEvent(owner, cbEvent, txEntryState);
}
- if (/*owner.isUsedForPartitionedRegionBucket() && */
- (getIndexUpdater() != null ||
- (newValue instanceof com.gemstone.gemfire.internal.cache.delta.Delta))) {
- sqlfEvent = createCBEvent(owner, putOp, key, newValue, txId,
- txEvent, eventId, aCallbackArgument,filterRoutingInfo,bridgeContext, txEntryState, versionTag, tailKey);
- }
boolean opCompleted = false;
// Fix for Bug #44431. We do NOT want to update the region and wait
// later for index INIT as region.clear() can cause inconsistency if
@@ -3240,9 +3061,6 @@ public abstract class AbstractRegionMap implements RegionMap {
cbEvent.setRegionEntry(re);
cbEvent.setOldValue(re.getValueInVM(owner)); // OFFHEAP eei
}
- if (sqlfEvent != null) {
- sqlfEvent.setOldValue(re.getValueInVM(owner)); // OFFHEAP eei
- }
boolean clearOccured = false;
// Set RegionEntry updateInProgress
@@ -3259,14 +3077,8 @@ public abstract class AbstractRegionMap implements RegionMap {
}
re.setValueResultOfSearch(putOp.isNetSearch());
try {
- // Rahul: applies the delta and sets the new value in
- // region entry (required for sqlfabric delta).
processAndGenerateTXVersionTag(owner, cbEvent, re, txEntryState);
- if (newValue instanceof com.gemstone.gemfire.internal.cache.delta.Delta
- && sqlfEvent != null) {
- //cbEvent.putExistingEntry(owner, re);
- sqlfEvent.putExistingEntry(owner, re);
- } else {
+ {
re.setValue(owner, re.prepareValueForCache(owner, newValue, cbEvent, !putOp.isCreate()));
}
if (putOp.isCreate()) {
@@ -3276,9 +3088,7 @@ public abstract class AbstractRegionMap implements RegionMap {
// an issue with normal GFE Delta and will have to be fixed
// in a similar manner and may be this fix the the one for
// other delta can be combined.
- if (sqlfEvent != null) {
- owner.updateSizeOnPut(key, oldSize, sqlfEvent.getNewValueBucketSize());
- } else {
+ {
owner.updateSizeOnPut(key, oldSize, owner.calculateRegionEntryValueSize(re));
}
}
@@ -3350,9 +3160,6 @@ public abstract class AbstractRegionMap implements RegionMap {
cbEvent.setRegionEntry(oldRe);
cbEvent.setOldValue(oldRe.getValueInVM(owner)); // OFFHEAP eei
}
- if (sqlfEvent != null) {
- sqlfEvent.setOldValue(oldRe.getValueInVM(owner)); // OFFHEAP eei
- }
boolean clearOccured = false;
// Set RegionEntry updateInProgress
if (owner.indexMaintenanceSynchronous) {
@@ -3370,11 +3177,7 @@ public abstract class AbstractRegionMap implements RegionMap {
try {
processAndGenerateTXVersionTag(owner, cbEvent, oldRe, txEntryState);
boolean wasTombstone = oldRe.isTombstone();
- if (newValue instanceof com.gemstone.gemfire.internal.cache.delta.Delta
- && sqlfEvent != null ) {
- //cbEvent.putExistingEntry(owner, oldRe);
- sqlfEvent.putExistingEntry(owner, oldRe);
- } else {
+ {
oldRe.setValue(owner, oldRe.prepareValueForCache(owner, newValue, cbEvent, !putOp.isCreate()));
if (wasTombstone) {
owner.unscheduleTombstone(oldRe);
@@ -3387,9 +3190,7 @@ public abstract class AbstractRegionMap implements RegionMap {
// an issue with normal GFE Delta and will have to be fixed
// in a similar manner and may be this fix the the one for
// other delta can be combined.
- if (sqlfEvent != null) {
- owner.updateSizeOnPut(key, oldSize, sqlfEvent.getNewValueBucketSize());
- } else {
+ {
owner.updateSizeOnPut(key, oldSize, owner.calculateRegionEntryValueSize(oldRe));
}
}
@@ -3452,9 +3253,7 @@ public abstract class AbstractRegionMap implements RegionMap {
try {
processAndGenerateTXVersionTag(owner, cbEvent, newRe, txEntryState);
- if (sqlfEvent != null ) {
- sqlfEvent.putNewEntry(owner,newRe);
- } else {
+ {
newRe.setValue(owner, newRe.prepareValueForCache(owner, newValue, cbEvent, !putOp.isCreate()));
}
owner.updateSizeOnCreate(newRe.getKey(), owner.calculateRegionEntryValueSize(newRe));
@@ -3514,7 +3313,6 @@ public abstract class AbstractRegionMap implements RegionMap {
}
} finally {
if (!cbEventInPending) cbEvent.release();
- if (sqlfEvent != null) sqlfEvent.release();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
index f8e04a6..d085c52 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
@@ -192,7 +192,6 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
return advisor;
}
- // For SQLFabric ALTER TABLE that may change colocation
public void resetParentAdvisor(int bucketId) {
PartitionedRegion colocatedRegion = ColocationHelper
.getColocatedRegion(this.pRegion);
@@ -1117,11 +1116,6 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
// only one thread should be attempting to volunteer at one time
return;
}
- // if member is still not initialized then don't volunteer for primary
- final GemFireCacheImpl cache = (GemFireCacheImpl)getBucket().getCache();
- if (!cache.doVolunteerForPrimary(this)) {
- return;
- }
if (this.volunteeringDelegate == null) {
this.volunteeringDelegate = new VolunteeringDelegate();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
index c87cc3d..e0f6fa2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.partition.PartitionListener;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.AtomicLongWithTerminalState;
@@ -34,8 +33,15 @@ import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.cache.BucketAdvisor.BucketProfile;
import com.gemstone.gemfire.internal.cache.FilterRoutingInfo.FilterInfo;
import com.gemstone.gemfire.internal.cache.control.MemoryEvent;
-import com.gemstone.gemfire.internal.cache.delta.Delta;
-import com.gemstone.gemfire.internal.cache.partitioned.*;
+import com.gemstone.gemfire.internal.cache.partitioned.Bucket;
+import com.gemstone.gemfire.internal.cache.partitioned.DestroyMessage;
+import com.gemstone.gemfire.internal.cache.partitioned.InvalidateMessage;
+import com.gemstone.gemfire.internal.cache.partitioned.LockObject;
+import com.gemstone.gemfire.internal.cache.partitioned.PRTombstoneMessage;
+import com.gemstone.gemfire.internal.cache.partitioned.PartitionMessage;
+import com.gemstone.gemfire.internal.cache.partitioned.PutAllPRMessage;
+import com.gemstone.gemfire.internal.cache.partitioned.PutMessage;
+import com.gemstone.gemfire.internal.cache.partitioned.RemoveAllPRMessage;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientTombstoneMessage;
@@ -1470,7 +1476,6 @@ implements Bucket
.append("[path='").append(getFullPath())
.append(";serial=").append(getSerialNumber())
.append(";primary=").append(getBucketAdvisor().getProxyBucketRegion().isPrimary())
- .append(";indexUpdater=").append(getIndexUpdater())
.append("]")
.toString();
}
@@ -1695,10 +1700,8 @@ implements Bucket
setDeltaIfNeeded(event);
}
if (msg != null) {
- // The primary bucket member which is being modified remotely by a GemFire
+ // The primary bucket member which is being modified remotely by a
// thread via a received PartitionedMessage
- //Asif: Some of the adjunct recepients include those members which
- // are sqlFabricHub & would need old value along with news
msg = msg.getMessageForRelayToListeners(event, adjunctRecipients);
msg.setSender(this.partitionedRegion.getDistributionManager()
.getDistributionManagerId());
@@ -1987,28 +1990,6 @@ implements Bucket
public CacheWriter basicGetWriter() {
return this.partitionedRegion.basicGetWriter();
}
- @Override
- void cleanUpOnIncompleteOp(EntryEventImpl event, RegionEntry re,
- boolean eventRecorded, boolean updateStats, boolean isReplace) {
-
-
- if(!eventRecorded || isReplace) {
- //No indexes updated so safe to remove.
- this.entries.removeEntry(event.getKey(), re, updateStats) ;
- }/*else {
- //if event recorded is true, that means as per event tracker entry is in
- //system. As per sqlfabric, indexes have been updated. What is not done
- // is basicPutPart2( distribution etc). So we do nothing as PR's re-attempt
- // will do the required basicPutPart2. If we remove the entry here, than
- //event tracker will not allow re insertion. So either we do nothing or
- //if we remove ,than we have to update sqlfindexes as well as undo recording
- // of event.
- //TODO:OQL indexes? : Hope they get updated during retry. The issue is that oql indexes
- // get updated after distribute , so it is entirely possible that oql index are
- // not updated. what if retry fails?
-
- }*/
- }
/* (non-Javadoc)
* @see com.gemstone.gemfire.internal.cache.partitioned.Bucket#getBucketOwners()
@@ -2058,7 +2039,7 @@ implements Bucket
return 0;
}
if (!(value instanceof byte[]) && !(value instanceof CachedDeserializable)
- && !(value instanceof com.gemstone.gemfire.Delta) && !(value instanceof Delta)
+ && !(value instanceof com.gemstone.gemfire.Delta)
&& !(value instanceof GatewaySenderEventImpl)) {
// ezoerner:20090401 it's possible this value is a Delta
throw new InternalGemFireError("DEBUG: calcMemSize: weird value (class "
@@ -2198,10 +2179,6 @@ implements Bucket
public void preDestroyBucket(int bucketId) {
- final IndexUpdater indexUpdater = getIndexUpdater();
- if (indexUpdater != null) {
- indexUpdater.clearIndexes(this, bucketId);
- }
}
@Override
public void cleanupFailedInitialization()
[10/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index 32a3d73..e1e5123 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -742,8 +742,8 @@ public class DistributionConfigImpl
}
private void validateOldSSLVsNewSSLProperties(Map props) {
- String sslEnabledString = (String)props.get(SSL_ENABLED_NAME);
- String clusterSSLEnabledString =(String)props.get(CLUSTER_SSL_ENABLED_NAME);
+ String sslEnabledString = (String)props.get(SSL_ENABLED);
+ String clusterSSLEnabledString =(String)props.get(CLUSTER_SSL_ENABLED);
if(sslEnabledString != null && clusterSSLEnabledString != null){
boolean sslEnabled = new Boolean(sslEnabledString).booleanValue();
boolean clusterSSLEnabled =new Boolean(clusterSSLEnabledString).booleanValue();
@@ -753,8 +753,8 @@ public class DistributionConfigImpl
}
}
- String sslCipher = (String)props.get(SSL_CIPHERS_NAME);
- String clusterSSLCipher = (String)props.get(CLUSTER_SSL_CIPHERS_NAME);
+ String sslCipher = (String)props.get(SSL_CIPHERS);
+ String clusterSSLCipher = (String)props.get(CLUSTER_SSL_CIPHERS);
if (sslCipher != null && clusterSSLCipher != null) {
if ( !sslCipher.equals(clusterSSLCipher) ) {
throw new IllegalArgumentException(
@@ -762,8 +762,8 @@ public class DistributionConfigImpl
}
}
- String sslProtocol = (String)props.get(SSL_PROTOCOLS_NAME);
- String clusterSSLProtocol = (String)props.get(CLUSTER_SSL_PROTOCOLS_NAME);
+ String sslProtocol = (String)props.get(SSL_PROTOCOLS);
+ String clusterSSLProtocol = (String)props.get(CLUSTER_SSL_PROTOCOLS);
if (sslProtocol != null && clusterSSLProtocol != null) {
if ( !sslProtocol.equals(clusterSSLProtocol) ) {
throw new IllegalArgumentException(
@@ -771,8 +771,8 @@ public class DistributionConfigImpl
}
}
- String sslReqAuthString = (String)props.get(SSL_REQUIRE_AUTHENTICATION_NAME);
- String clusterReqAuthString =(String)props.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME);
+ String sslReqAuthString = (String)props.get(SSL_REQUIRE_AUTHENTICATION);
+ String clusterReqAuthString =(String)props.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION);
if(sslReqAuthString != null && clusterReqAuthString != null){
boolean sslReqAuth = new Boolean(sslReqAuthString).booleanValue();
boolean clusterSSLReqAuth =new Boolean(clusterReqAuthString).booleanValue();
@@ -782,8 +782,8 @@ public class DistributionConfigImpl
}
}
- String jmxSSLString = (String)props.get(JMX_MANAGER_SSL_NAME);
- String jmxSSLEnabledString =(String)props.get(JMX_MANAGER_SSL_ENABLED_NAME);
+ String jmxSSLString = (String)props.get(JMX_MANAGER_SSL);
+ String jmxSSLEnabledString =(String)props.get(JMX_MANAGER_SSL_ENABLED);
if(jmxSSLString != null && jmxSSLEnabledString != null){
boolean jmxSSL = new Boolean(jmxSSLString).booleanValue();
boolean jmxSSLEnabled =new Boolean(jmxSSLEnabledString).booleanValue();
@@ -798,26 +798,26 @@ public class DistributionConfigImpl
* ssl-* properties will be copied in cluster-ssl-* properties. Socket is using cluster-ssl-* properties
*/
private void copySSLPropsToClusterSSLProps() {
- boolean clusterSSLOverriden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null;
- boolean p2pSSLOverRidden = this.sourceMap.get(SSL_ENABLED_NAME)!=null;
+ boolean clusterSSLOverriden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
+ boolean p2pSSLOverRidden = this.sourceMap.get(SSL_ENABLED)!=null;
if(p2pSSLOverRidden && !clusterSSLOverriden) {
this.clusterSSLEnabled = this.sslEnabled;
- this.sourceMap.put(CLUSTER_SSL_ENABLED_NAME,this.sourceMap.get(SSL_ENABLED_NAME));
+ this.sourceMap.put(CLUSTER_SSL_ENABLED,this.sourceMap.get(SSL_ENABLED));
- if(this.sourceMap.get(SSL_CIPHERS_NAME)!=null) {
+ if(this.sourceMap.get(SSL_CIPHERS)!=null) {
this.clusterSSLCiphers = this.sslCiphers;
- this.sourceMap.put(CLUSTER_SSL_CIPHERS_NAME,this.sourceMap.get(SSL_CIPHERS_NAME));
+ this.sourceMap.put(CLUSTER_SSL_CIPHERS,this.sourceMap.get(SSL_CIPHERS));
}
- if(this.sourceMap.get(SSL_PROTOCOLS_NAME)!=null) {
+ if(this.sourceMap.get(SSL_PROTOCOLS)!=null) {
this.clusterSSLProtocols = this.sslProtocols;
- this.sourceMap.put(CLUSTER_SSL_PROTOCOLS_NAME,this.sourceMap.get(SSL_PROTOCOLS_NAME));
+ this.sourceMap.put(CLUSTER_SSL_PROTOCOLS,this.sourceMap.get(SSL_PROTOCOLS));
}
- if(this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION_NAME)!=null) {
+ if(this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION)!=null) {
this.clusterSSLRequireAuthentication = this.sslRequireAuthentication;
- this.sourceMap.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION_NAME));
+ this.sourceMap.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION));
}
this.clusterSSLProperties.putAll(this.sslProperties);
}
@@ -829,76 +829,76 @@ public class DistributionConfigImpl
* if jmx-manager-ssl-*properties are given then use them, and copy the unspecified jmx-manager properties from cluster-properties
*/
private void copySSLPropsToJMXSSLProps() {
- boolean jmxSSLEnabledOverriden = this.sourceMap.get(JMX_MANAGER_SSL_ENABLED_NAME)!=null;
- boolean jmxSSLOverriden = this.sourceMap.get(JMX_MANAGER_SSL_NAME)!=null;
- boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null;
+ boolean jmxSSLEnabledOverriden = this.sourceMap.get(JMX_MANAGER_SSL_ENABLED)!=null;
+ boolean jmxSSLOverriden = this.sourceMap.get(JMX_MANAGER_SSL)!=null;
+ boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
if(jmxSSLOverriden && !jmxSSLEnabledOverriden) {
this.jmxManagerSSLEnabled = this.jmxManagerSSL;
- this.sourceMap.put(JMX_MANAGER_SSL_ENABLED_NAME,this.sourceMap.get(JMX_MANAGER_SSL_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_ENABLED,this.sourceMap.get(JMX_MANAGER_SSL));
}
if(clusterSSLOverRidden && !jmxSSLOverriden && !jmxSSLEnabledOverriden) {
this.jmxManagerSSLEnabled = this.clusterSSLEnabled;
- this.sourceMap.put(JMX_MANAGER_SSL_ENABLED_NAME,this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME));
- if(this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)!=null) {
+ this.sourceMap.put(JMX_MANAGER_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED));
+ if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) {
this.jmxManagerSslCiphers = this.clusterSSLCiphers;
- this.sourceMap.put(JMX_MANAGER_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS));
}
- if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) {
this.jmxManagerSslProtocols = this.clusterSSLProtocols;
- this.sourceMap.put(JMX_MANAGER_SSL_PROTOCOLS_NAME,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
}
- if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) {
this.jmxManagerSslRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) {
this.jmxManagerSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) {
this.jmxManagerSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) {
this.jmxManagerSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) {
this.jmxManagerSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) {
this.jmxManagerSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.jmxManagerSslProperties.putAll(this.clusterSSLProperties);
}
if(jmxSSLOverriden || jmxSSLEnabledOverriden){
- if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) {
+ if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.jmxManagerSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) {
+ if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.jmxManagerSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) {
+ if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.jmxManagerSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) {
+ if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
this.jmxManagerSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) {
+ if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
this.jmxManagerSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
@@ -911,80 +911,80 @@ public class DistributionConfigImpl
private void copySSLPropsToHTTPSSLProps() {
boolean httpServiceSSLEnabledOverriden = this.sourceMap.get(HTTP_SERVICE_SSL_ENABLED_NAME) != null;
- boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME) != null;
+ boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
if (clusterSSLOverRidden && !httpServiceSSLEnabledOverriden) {
this.httpServiceSSLEnabled = this.clusterSSLEnabled;
- this.sourceMap.put(HTTP_SERVICE_SSL_ENABLED_NAME, this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
- if (this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) {
this.httpServiceSSLCiphers = this.clusterSSLCiphers;
- this.sourceMap.put(HTTP_SERVICE_SSL_CIPHERS_NAME, this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_CIPHERS, this.sourceMap.get(CLUSTER_SSL_CIPHERS));
}
- if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS) != null) {
this.httpServiceSSLProtocols = this.clusterSSLProtocols;
- this.sourceMap.put(HTTP_SERVICE_SSL_PROTOCOLS_NAME, this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_PROTOCOLS, this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
}
- if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION) != null) {
this.httpServiceSSLRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME,
- this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION,
+ this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
}
- if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.httpServiceSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.httpServiceSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.httpServiceSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME,
- this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,
+ this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
this.httpServiceSSLTrustStore = this.clusterSSLTrustStore;
- this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) {
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
this.httpServiceSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME,
- this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,
+ this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.httpServiceSSLProperties.putAll(this.clusterSSLProperties);
}
if (httpServiceSSLEnabledOverriden) {
- if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_NAME) == null
- && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE) == null
+ && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.httpServiceSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME) == null
- && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_TYPE) == null
+ && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.httpServiceSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME) == null
- && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD) == null
+ && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.httpServiceSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME,
- this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,
+ this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_NAME) == null
- && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE) == null
+ && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
this.httpServiceSSLTrustStore = this.clusterSSLTrustStore;
- this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_NAME, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME) == null
- && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD) == null
+ && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
this.httpServiceSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME,
- this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,
+ this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
@@ -995,70 +995,70 @@ public class DistributionConfigImpl
* if server-ssl-*properties are given then use them, and copy the unspecified server properties from cluster-properties
*/
private void copySSLPropsToServerSSLProps() {
- boolean cacheServerSSLOverriden = this.sourceMap.get(SERVER_SSL_ENABLED_NAME)!=null;
- boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null;
+ boolean cacheServerSSLOverriden = this.sourceMap.get(SERVER_SSL_ENABLED)!=null;
+ boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
if(clusterSSLOverRidden && !cacheServerSSLOverriden) {
this.serverSSLEnabled = this.clusterSSLEnabled;
- this.sourceMap.put(SERVER_SSL_ENABLED_NAME,this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME));
- if(this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)!=null) {
+ this.sourceMap.put(SERVER_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED));
+ if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) {
this.serverSslCiphers = this.clusterSSLCiphers;
- this.sourceMap.put(SERVER_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME));
+ this.sourceMap.put(SERVER_SSL_CIPHERS,this.sourceMap.get(CLUSTER_SSL_CIPHERS));
}
- if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) {
this.serverSslProtocols = this.clusterSSLProtocols;
- this.sourceMap.put(SERVER_SSL_PROTOCOLS_NAME,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME));
+ this.sourceMap.put(SERVER_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
}
- if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) {
this.serverSslRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(SERVER_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME));
+ this.sourceMap.put(SERVER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) {
this.serverSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) {
this.serverSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) {
this.serverSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) {
this.serverSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) {
this.serverSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.serverSslProperties.putAll(this.clusterSSLProperties);
}
if(cacheServerSSLOverriden){
- if(this.sourceMap.get(SERVER_SSL_KEYSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) {
+ if(this.sourceMap.get(SERVER_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.serverSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(SERVER_SSL_KEYSTORE_TYPE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) {
+ if(this.sourceMap.get(SERVER_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.serverSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(SERVER_SSL_KEYSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) {
+ if(this.sourceMap.get(SERVER_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.serverSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME) != null) {
+ if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
this.serverSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) {
+ if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
this.serverSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
}
@@ -1068,70 +1068,70 @@ public class DistributionConfigImpl
* if gateway-ssl-*properties are given then use them, and copy the unspecified gateway properties from cluster-properties
*/
private void copyClusterSSLPropsToGatewaySSLProps() {
- boolean gatewaySSLOverriden = this.sourceMap.get(GATEWAY_SSL_ENABLED_NAME)!=null;
- boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME)!=null;
+ boolean gatewaySSLOverriden = this.sourceMap.get(GATEWAY_SSL_ENABLED)!=null;
+ boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
if(clusterSSLOverRidden && !gatewaySSLOverriden) {
this.gatewaySSLEnabled = this.clusterSSLEnabled;
- this.sourceMap.put(GATEWAY_SSL_ENABLED_NAME,this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME));
- if(this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)!=null) {
+ this.sourceMap.put(GATEWAY_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED));
+ if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) {
this.gatewaySslCiphers = this.clusterSSLCiphers;
- this.sourceMap.put(GATEWAY_SSL_CIPHERS_NAME,this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME));
+ this.sourceMap.put(GATEWAY_SSL_CIPHERS,this.sourceMap.get(CLUSTER_SSL_CIPHERS));
}
- if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) {
this.gatewaySslProtocols = this.clusterSSLProtocols;
- this.sourceMap.put(GATEWAY_SSL_PROTOCOLS_NAME,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME));
+ this.sourceMap.put(GATEWAY_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
}
- if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) {
this.gatewaySslRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME));
+ this.sourceMap.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) {
this.gatewaySSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) {
this.gatewaySSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) {
this.gatewaySSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) {
this.gatewaySSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)!=null) {
+ if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) {
this.gatewaySSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.gatewaySslProperties.putAll(this.clusterSSLProperties);
}
if(gatewaySSLOverriden){
- if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME) != null) {
+ if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.gatewaySSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_NAME));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_TYPE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME) != null) {
+ if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.gatewaySSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE_NAME));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME) != null) {
+ if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.gatewaySSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME)!= null) {
+ if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!= null) {
this.gatewaySSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_NAME));
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME) != null) {
+ if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
this.gatewaySSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
}
@@ -1200,10 +1200,10 @@ public class DistributionConfigImpl
}
public static boolean specialPropName(String propName) {
- return propName.equalsIgnoreCase(SSL_ENABLED_NAME) ||
- propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED_NAME) ||
- propName.equals(SECURITY_PEER_AUTH_INIT_NAME) ||
- propName.equals(SECURITY_PEER_AUTHENTICATOR_NAME) ||
+ return propName.equalsIgnoreCase(SSL_ENABLED) ||
+ propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED) ||
+ propName.equals(SECURITY_PEER_AUTH_INIT) ||
+ propName.equals(SECURITY_PEER_AUTHENTICATOR) ||
propName.equals(LOG_WRITER_NAME) ||
propName.equals(DS_CONFIG_NAME) ||
propName.equals(SECURITY_LOG_WRITER_NAME) ||
@@ -1305,11 +1305,11 @@ public class DistributionConfigImpl
}
}
// now set ssl-enabled if needed...
- if ( props.containsKey(SSL_ENABLED_NAME) ) {
- this.setAttribute(SSL_ENABLED_NAME, (String) props.get( SSL_ENABLED_NAME ), this.sourceMap.get(SSL_ENABLED_NAME) );
+ if ( props.containsKey(SSL_ENABLED) ) {
+ this.setAttribute(SSL_ENABLED, (String) props.get( SSL_ENABLED ), this.sourceMap.get(SSL_ENABLED) );
}
- if ( props.containsKey(CLUSTER_SSL_ENABLED_NAME) ) {
- this.setAttribute(CLUSTER_SSL_ENABLED_NAME, (String) props.get( CLUSTER_SSL_ENABLED_NAME ), this.sourceMap.get(CLUSTER_SSL_ENABLED_NAME) );
+ if ( props.containsKey(CLUSTER_SSL_ENABLED) ) {
+ this.setAttribute(CLUSTER_SSL_ENABLED, (String) props.get( CLUSTER_SSL_ENABLED ), this.sourceMap.get(CLUSTER_SSL_ENABLED) );
}
// now set the security authInit if needed
if (props.containsKey(SECURITY_PEER_AUTH_INIT_NAME)) {
@@ -1557,7 +1557,7 @@ public class DistributionConfigImpl
}
public void setUserCommandPackages(String value) {
- this.userCommandPackages = (String)checkAttribute(USER_COMMAND_PACKAGES, value);
+ this.userCommandPackages = (String)checkAttribute(SystemConfigurationProperties.USER_COMMAND_PACKAGES, value);
}
public boolean getDeltaPropagation() {
@@ -1584,16 +1584,16 @@ public class DistributionConfigImpl
this.mcastTtl = (Integer) checkAttribute(MCAST_TTL, value);
}
public void setSocketLeaseTime(int value) {
- this.socketLeaseTime = (Integer)checkAttribute(SOCKET_LEASE_TIME_NAME, value);
+ this.socketLeaseTime = (Integer)checkAttribute(SOCKET_LEASE_TIME, value);
}
public void setSocketBufferSize(int value) {
- this.socketBufferSize = (Integer)checkAttribute(SOCKET_BUFFER_SIZE_NAME, value);
+ this.socketBufferSize = (Integer)checkAttribute(SOCKET_BUFFER_SIZE, value);
}
public void setConserveSockets(boolean value) {
- this.conserveSockets = (Boolean)checkAttribute(CONSERVE_SOCKETS_NAME, value);
+ this.conserveSockets = (Boolean)checkAttribute(CONSERVE_SOCKETS, value);
}
public void setRoles(String value) {
- this.roles = (String)checkAttribute(ROLES_NAME, value);
+ this.roles = (String)checkAttribute(ROLES, value);
}
public void setMaxWaitTimeForReconnect(int value){
@@ -1629,13 +1629,13 @@ public class DistributionConfigImpl
}
public void setDeployWorkingDir(File value) {
- this.deployWorkingDir = (File)checkAttribute(DEPLOY_WORKING_DIR, value);
+ this.deployWorkingDir = (File)checkAttribute(SystemConfigurationProperties.DEPLOY_WORKING_DIR, value);
}
public void setLogFile(File value) {
- this.logFile = (File)checkAttribute(LOG_FILE_NAME, value);
+ this.logFile = (File)checkAttribute(LOG_FILE, value);
}
public void setLogLevel(int value) {
- this.logLevel = (Integer)checkAttribute(LOG_LEVEL_NAME, value);
+ this.logLevel = (Integer)checkAttribute(LOG_LEVEL, value);
}
/**
* the locator startup code must be able to modify the locator log file in order
@@ -1680,10 +1680,10 @@ public class DistributionConfigImpl
this.startLocator = value;
}
public void setStatisticSamplingEnabled(boolean value) {
- this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED_NAME, value);
+ this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED, value);
}
public void setStatisticSampleRate(int value) {
- value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE_NAME, value);
+ value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE, value);
if (value < DEFAULT_STATISTIC_SAMPLE_RATE) {
// fix 48228
InternalDistributedSystem ids = InternalDistributedSystem.getConnectedInstance();
@@ -1698,91 +1698,91 @@ public class DistributionConfigImpl
if (value == null) {
value = new File("");
}
- this.statisticArchiveFile = (File)checkAttribute(STATISTIC_ARCHIVE_FILE_NAME, value);
+ this.statisticArchiveFile = (File)checkAttribute(STATISTIC_ARCHIVE_FILE, value);
}
public void setCacheXmlFile(File value) {
- this.cacheXmlFile = (File)checkAttribute(CACHE_XML_FILE_NAME, value);
+ this.cacheXmlFile = (File)checkAttribute(CACHE_XML_FILE, value);
}
public void setAckWaitThreshold(int value) {
- this.ackWaitThreshold = (Integer)checkAttribute(ACK_WAIT_THRESHOLD_NAME, value);
+ this.ackWaitThreshold = (Integer)checkAttribute(ACK_WAIT_THRESHOLD, value);
}
public void setAckSevereAlertThreshold(int value) {
- this.ackForceDisconnectThreshold = (Integer)checkAttribute(ACK_SEVERE_ALERT_THRESHOLD_NAME, value);
+ this.ackForceDisconnectThreshold = (Integer)checkAttribute(ACK_SEVERE_ALERT_THRESHOLD, value);
}
public int getArchiveDiskSpaceLimit() {
return this.archiveDiskSpaceLimit;
}
public void setArchiveDiskSpaceLimit(int value) {
- this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT_NAME, value);
+ this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT, value);
}
public int getArchiveFileSizeLimit() {
return this.archiveFileSizeLimit;
}
public void setArchiveFileSizeLimit(int value) {
- this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT_NAME, value);
+ this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT, value);
}
public int getLogDiskSpaceLimit() {
return this.logDiskSpaceLimit;
}
public void setLogDiskSpaceLimit(int value) {
- this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT_NAME, value);
+ this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT, value);
}
public int getLogFileSizeLimit() {
return this.logFileSizeLimit;
}
public void setLogFileSizeLimit(int value) {
- this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT_NAME, value);
+ this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT, value);
}
public void setSSLEnabled( boolean value ) {
- this.sslEnabled = (Boolean)checkAttribute(SSL_ENABLED_NAME, value);
+ this.sslEnabled = (Boolean)checkAttribute(SSL_ENABLED, value);
}
public void setSSLProtocols( String value ) {
- this.sslProtocols = (String)checkAttribute(SSL_PROTOCOLS_NAME, value);
+ this.sslProtocols = (String)checkAttribute(SSL_PROTOCOLS, value);
}
public void setSSLCiphers( String value ) {
- this.sslCiphers = (String)checkAttribute(SSL_CIPHERS_NAME, value);
+ this.sslCiphers = (String)checkAttribute(SSL_CIPHERS, value);
}
public void setSSLRequireAuthentication( boolean value ){
- this.sslRequireAuthentication = (Boolean)checkAttribute(SSL_REQUIRE_AUTHENTICATION_NAME, value);
+ this.sslRequireAuthentication = (Boolean)checkAttribute(SSL_REQUIRE_AUTHENTICATION, value);
}
public void setClusterSSLEnabled( boolean value ) {
- this.clusterSSLEnabled = (Boolean)checkAttribute(CLUSTER_SSL_ENABLED_NAME, value);
+ this.clusterSSLEnabled = (Boolean)checkAttribute(CLUSTER_SSL_ENABLED, value);
}
public void setClusterSSLProtocols( String value ) {
- this.clusterSSLProtocols = (String)checkAttribute(CLUSTER_SSL_PROTOCOLS_NAME, value);
+ this.clusterSSLProtocols = (String)checkAttribute(CLUSTER_SSL_PROTOCOLS, value);
}
public void setClusterSSLCiphers( String value ) {
- this.clusterSSLCiphers = (String)checkAttribute(CLUSTER_SSL_CIPHERS_NAME, value);
+ this.clusterSSLCiphers = (String)checkAttribute(CLUSTER_SSL_CIPHERS, value);
}
public void setClusterSSLRequireAuthentication( boolean value ){
- this.clusterSSLRequireAuthentication = (Boolean)checkAttribute(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, value);
+ this.clusterSSLRequireAuthentication = (Boolean)checkAttribute(CLUSTER_SSL_REQUIRE_AUTHENTICATION, value);
}
public void setClusterSSLKeyStore( String value ) {
- value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_NAME, value);
+ value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE, value);
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, value);
this.clusterSSLKeyStore = value;
}
public void setClusterSSLKeyStoreType( String value ) {
- value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_TYPE_NAME, value);
+ value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_TYPE, value);
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, value);
this.clusterSSLKeyStoreType = value;
}
public void setClusterSSLKeyStorePassword( String value ) {
- value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME, value);
+ value = (String)checkAttribute(CLUSTER_SSL_KEYSTORE_PASSWORD, value);
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, value);
this.clusterSSLKeyStorePassword =value;
}
public void setClusterSSLTrustStore( String value ) {
- value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE_NAME, value);
+ value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE, value);
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, value);
this.clusterSSLTrustStore = value;
}
public void setClusterSSLTrustStorePassword( String value ) {
- value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME, value);
+ value = (String)checkAttribute(CLUSTER_SSL_TRUSTSTORE_PASSWORD, value);
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, value);
this.clusterSSLTrustStorePassword = value;
}
@@ -1792,7 +1792,7 @@ public class DistributionConfigImpl
}
public void setMcastSendBufferSize(int value) {
- mcastSendBufferSize = (Integer)checkAttribute(MCAST_SEND_BUFFER_SIZE_NAME, value);
+ mcastSendBufferSize = (Integer)checkAttribute(MCAST_SEND_BUFFER_SIZE, value);
}
public int getMcastRecvBufferSize() {
@@ -1800,16 +1800,16 @@ public class DistributionConfigImpl
}
public void setMcastRecvBufferSize(int value) {
- mcastRecvBufferSize = (Integer)checkAttribute(MCAST_RECV_BUFFER_SIZE_NAME, value);
+ mcastRecvBufferSize = (Integer)checkAttribute(MCAST_RECV_BUFFER_SIZE, value);
}
public void setAsyncDistributionTimeout(int value) {
- this.asyncDistributionTimeout = (Integer)checkAttribute(ASYNC_DISTRIBUTION_TIMEOUT_NAME, value);
+ this.asyncDistributionTimeout = (Integer)checkAttribute(ASYNC_DISTRIBUTION_TIMEOUT, value);
}
public void setAsyncQueueTimeout(int value) {
- this.asyncQueueTimeout = (Integer)checkAttribute(ASYNC_QUEUE_TIMEOUT_NAME, value);
+ this.asyncQueueTimeout = (Integer)checkAttribute(ASYNC_QUEUE_TIMEOUT, value);
}
public void setAsyncMaxQueueSize(int value) {
- this.asyncMaxQueueSize = (Integer)checkAttribute(ASYNC_MAX_QUEUE_SIZE_NAME, value);
+ this.asyncMaxQueueSize = (Integer)checkAttribute(ASYNC_MAX_QUEUE_SIZE, value);
}
public FlowControlParams getMcastFlowControl() {
@@ -1817,7 +1817,7 @@ public class DistributionConfigImpl
}
public void setMcastFlowControl(FlowControlParams values) {
- mcastFlowControl = (FlowControlParams)checkAttribute(MCAST_FLOW_CONTROL_NAME, values);
+ mcastFlowControl = (FlowControlParams)checkAttribute(MCAST_FLOW_CONTROL, values);
}
public int getUdpFragmentSize() {
@@ -1825,7 +1825,7 @@ public class DistributionConfigImpl
}
public void setUdpFragmentSize(int value) {
- udpFragmentSize = (Integer)checkAttribute(UDP_FRAGMENT_SIZE_NAME, value);
+ udpFragmentSize = (Integer)checkAttribute(UDP_FRAGMENT_SIZE, value);
}
public int getUdpSendBufferSize() {
@@ -1833,7 +1833,7 @@ public class DistributionConfigImpl
}
public void setUdpSendBufferSize(int value) {
- udpSendBufferSize = (Integer)checkAttribute(UDP_SEND_BUFFER_SIZE_NAME, value);
+ udpSendBufferSize = (Integer)checkAttribute(UDP_SEND_BUFFER_SIZE, value);
}
public int getUdpRecvBufferSize() {
@@ -1841,7 +1841,7 @@ public class DistributionConfigImpl
}
public void setUdpRecvBufferSize(int value) {
- udpRecvBufferSize = (Integer)checkAttribute(UDP_RECV_BUFFER_SIZE_NAME, value);
+ udpRecvBufferSize = (Integer)checkAttribute(UDP_RECV_BUFFER_SIZE, value);
}
public boolean getDisableTcp() {
@@ -1865,7 +1865,7 @@ public class DistributionConfigImpl
}
public void setMemberTimeout(int value) {
- memberTimeout = (Integer)checkAttribute(MEMBER_TIMEOUT_NAME, value);
+ memberTimeout = (Integer)checkAttribute(MEMBER_TIMEOUT, value);
}
/** @since GemFire 5.7 */
@@ -1875,7 +1875,7 @@ public class DistributionConfigImpl
/** @since GemFire 5.7 */
public void setClientConflation(String value) {
- this.clientConflation = (String)checkAttribute(CLIENT_CONFLATION_PROP_NAME, value);
+ this.clientConflation = (String)checkAttribute(CONFLATE_EVENTS, value);
}
public String getDurableClientId() {
@@ -1883,7 +1883,7 @@ public class DistributionConfigImpl
}
public void setDurableClientId(String value) {
- durableClientId = (String)checkAttribute(DURABLE_CLIENT_ID_NAME, value);
+ durableClientId = (String)checkAttribute(DURABLE_CLIENT_ID, value);
}
public int getDurableClientTimeout() {
@@ -1891,7 +1891,7 @@ public class DistributionConfigImpl
}
public void setDurableClientTimeout(int value) {
- durableClientTimeout = (Integer)checkAttribute(DURABLE_CLIENT_TIMEOUT_NAME, value);
+ durableClientTimeout = (Integer)checkAttribute(DURABLE_CLIENT_TIMEOUT, value);
}
public String getSecurityClientAuthInit() {
@@ -1899,7 +1899,7 @@ public class DistributionConfigImpl
}
public void setSecurityClientAuthInit(String value) {
- securityClientAuthInit = (String)checkAttribute(SECURITY_CLIENT_AUTH_INIT_NAME, value);
+ securityClientAuthInit = (String)checkAttribute(SECURITY_CLIENT_AUTH_INIT, value);
}
public String getSecurityClientAuthenticator() {
@@ -3105,7 +3105,7 @@ public class DistributionConfigImpl
* @see com.gemstone.gemfire.distributed.internal.DistributionConfig#setMembershipPortRange(int[])
*/
public void setMembershipPortRange(int[] range) {
- membershipPortRange = (int[])checkAttribute(MEMBERSHIP_PORT_RANGE_NAME, range);
+ membershipPortRange = (int[])checkAttribute(MEMBERSHIP_PORT_RANGE, range);
}
/**
@@ -3198,7 +3198,7 @@ public class DistributionConfigImpl
@Override
public void setEnableClusterConfiguration(boolean value) {
- this.enableSharedConfiguration = (Boolean)checkAttribute(ENABLE_CLUSTER_CONFIGURATION_NAME, value);
+ this.enableSharedConfiguration = (Boolean)checkAttribute(ENABLE_CLUSTER_CONFIGURATION, value);
}
@Override
@@ -3209,7 +3209,7 @@ public class DistributionConfigImpl
@Override
public void setUseSharedConfiguration(boolean newValue) {
- this.useSharedConfiguration = (Boolean)checkAttribute(USE_CLUSTER_CONFIGURATION_NAME, newValue);
+ this.useSharedConfiguration = (Boolean)checkAttribute(USE_CLUSTER_CONFIGURATION, newValue);
}
@Override
@@ -3218,7 +3218,7 @@ public class DistributionConfigImpl
}
@Override
public void setLoadClusterConfigFromDir(boolean newValue) {
- this.loadSharedConfigurationFromDir = (Boolean)checkAttribute(LOAD_CLUSTER_CONFIG_FROM_DIR_NAME, newValue);
+ this.loadSharedConfigurationFromDir = (Boolean)checkAttribute(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, newValue);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 7bc65c8..8b9b307 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -71,8 +71,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.BIND_ADDRESS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Provides the implementation of a distribution <code>Locator</code>
@@ -541,7 +540,7 @@ public class InternalLocator extends Locator implements ConnectListener {
if (distributedSystemProperties != null) {
env.putAll(distributedSystemProperties);
}
- env.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, "");
+ env.setProperty(CACHE_XML_FILE, "");
// create a DC so that all of the lookup rules, gemfire.properties, etc,
// are considered and we have a config object we can trust
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
index 010527f..ff95cef 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
@@ -59,21 +59,21 @@ public final class RuntimeDistributionConfigImpl
//////////////////// Configuration Methods ////////////////////
@Override
public void setLogLevel(int value) {
- this.logLevel = (Integer)checkAttribute(LOG_LEVEL_NAME, value);
- getAttSourceMap().put(LOG_LEVEL_NAME, ConfigSource.runtime());
+ this.logLevel = (Integer)checkAttribute(LOG_LEVEL, value);
+ getAttSourceMap().put(LOG_LEVEL, ConfigSource.runtime());
this.ds.getInternalLogWriter().setLogWriterLevel(value);
LogWriterAppenders.configChanged(LogWriterAppenders.Identifier.MAIN);
}
@Override
public void setStatisticSamplingEnabled(boolean value) {
- this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED_NAME, value);
- getAttSourceMap().put(STATISTIC_SAMPLING_ENABLED_NAME, ConfigSource.runtime());
+ this.statisticSamplingEnabled = (Boolean)checkAttribute(STATISTIC_SAMPLING_ENABLED, value);
+ getAttSourceMap().put(STATISTIC_SAMPLING_ENABLED, ConfigSource.runtime());
}
@Override
public void setStatisticSampleRate(int value) {
- value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE_NAME, value);
+ value = (Integer)checkAttribute(STATISTIC_SAMPLE_RATE, value);
if (value < DEFAULT_STATISTIC_SAMPLE_RATE) {
// fix 48228
this.ds.getLogWriter().info("Setting statistic-sample-rate to " + DEFAULT_STATISTIC_SAMPLE_RATE + " instead of the requested " + value + " because VSD does not work with sub-second sampling.");
@@ -84,7 +84,7 @@ public final class RuntimeDistributionConfigImpl
@Override
public void setStatisticArchiveFile(File value) {
- value = (File)checkAttribute(STATISTIC_ARCHIVE_FILE_NAME, value);
+ value = (File)checkAttribute(STATISTIC_ARCHIVE_FILE, value);
if (value == null) {
value = new File("");
}
@@ -94,33 +94,33 @@ public final class RuntimeDistributionConfigImpl
throw new IllegalArgumentException(ex.getMessage());
}
this.statisticArchiveFile = value;
- getAttSourceMap().put(STATISTIC_ARCHIVE_FILE_NAME, ConfigSource.runtime());
+ getAttSourceMap().put(STATISTIC_ARCHIVE_FILE, ConfigSource.runtime());
}
@Override
public void setArchiveDiskSpaceLimit(int value) {
- this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT_NAME, value);
- getAttSourceMap().put(ARCHIVE_DISK_SPACE_LIMIT_NAME, ConfigSource.runtime());
+ this.archiveDiskSpaceLimit = (Integer)checkAttribute(ARCHIVE_DISK_SPACE_LIMIT, value);
+ getAttSourceMap().put(ARCHIVE_DISK_SPACE_LIMIT, ConfigSource.runtime());
}
@Override
public void setArchiveFileSizeLimit(int value) {
- this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT_NAME, value);
- getAttSourceMap().put(ARCHIVE_FILE_SIZE_LIMIT_NAME, ConfigSource.runtime());
+ this.archiveFileSizeLimit = (Integer)checkAttribute(ARCHIVE_FILE_SIZE_LIMIT, value);
+ getAttSourceMap().put(ARCHIVE_FILE_SIZE_LIMIT, ConfigSource.runtime());
}
@Override
public void setLogDiskSpaceLimit(int value) {
- this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT_NAME, value);
- getAttSourceMap().put(LOG_DISK_SPACE_LIMIT_NAME, ConfigSource.runtime());
+ this.logDiskSpaceLimit = (Integer)checkAttribute(LOG_DISK_SPACE_LIMIT, value);
+ getAttSourceMap().put(LOG_DISK_SPACE_LIMIT, ConfigSource.runtime());
LogWriterAppenders.configChanged(LogWriterAppenders.Identifier.MAIN);
}
@Override
public void setLogFileSizeLimit(int value) {
- this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT_NAME, value);
- getAttSourceMap().put(this.LOG_FILE_SIZE_LIMIT_NAME, ConfigSource.runtime());
+ this.logFileSizeLimit = (Integer)checkAttribute(LOG_FILE_SIZE_LIMIT, value);
+ getAttSourceMap().put(LOG_FILE_SIZE_LIMIT, ConfigSource.runtime());
LogWriterAppenders.configChanged(LogWriterAppenders.Identifier.MAIN);
}
@@ -129,9 +129,9 @@ public final class RuntimeDistributionConfigImpl
}
public List<String> getModifiableAttributes(){
- String[] modifiables = {HTTP_SERVICE_PORT_NAME,JMX_MANAGER_HTTP_PORT_NAME, ARCHIVE_DISK_SPACE_LIMIT_NAME,
- ARCHIVE_FILE_SIZE_LIMIT_NAME, LOG_DISK_SPACE_LIMIT_NAME, LOG_FILE_SIZE_LIMIT_NAME,
- LOG_LEVEL_NAME, STATISTIC_ARCHIVE_FILE_NAME, STATISTIC_SAMPLE_RATE_NAME, STATISTIC_SAMPLING_ENABLED_NAME};
+ String[] modifiables = {HTTP_SERVICE_PORT_NAME,JMX_MANAGER_HTTP_PORT_NAME, ARCHIVE_DISK_SPACE_LIMIT,
+ ARCHIVE_FILE_SIZE_LIMIT, LOG_DISK_SPACE_LIMIT, LOG_FILE_SIZE_LIMIT,
+ LOG_LEVEL, STATISTIC_ARCHIVE_FILE, STATISTIC_SAMPLE_RATE, STATISTIC_SAMPLING_ENABLED};
return Arrays.asList(modifiables);
};
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index 964f741..c6558fd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -29,6 +29,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Provides an implementation of the {@link Config} interface
* that implements functionality that all {@link Config} implementations
@@ -207,13 +208,13 @@ public abstract class AbstractConfig implements Config {
}
public boolean isDeprecated(String attName) {
- if (attName.equals(DistributionConfig.SSL_CIPHERS_NAME)) {
+ if (attName.equals(SSL_CIPHERS)) {
return true;
- } else if (attName.equals(DistributionConfig.SSL_ENABLED_NAME)) {
+ } else if (attName.equals(SSL_ENABLED)) {
return true;
- } else if (attName.equals(DistributionConfig.SSL_PROTOCOLS_NAME)) {
+ } else if (attName.equals(SSL_PROTOCOLS)) {
return true;
- } else if (attName.equals(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME)) {
+ } else if (attName.equals(SSL_REQUIRE_AUTHENTICATION)) {
return true;
} else if (attName.equals(DistributionConfig.JMX_MANAGER_SSL_NAME)) {
return true;
@@ -304,7 +305,7 @@ public abstract class AbstractConfig implements Config {
return (String)result;
}
- if (attName.equalsIgnoreCase(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME)) {
+ if (attName.equalsIgnoreCase(MEMBERSHIP_PORT_RANGE)) {
int[] value = (int[])result;
return ""+value[0]+"-"+value[1];
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
index 0e80a28..cd35e53 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
@@ -158,9 +160,9 @@ public class MigrationClient {
&& System.getProperty(DistributionConfig.GEMFIRE_PREFIX + LOCATORS) == null) {
dsProps.put(MCAST_PORT, "0");
}
- dsProps.put(DistributionConfig.LOG_FILE_NAME, "migrationClient.log");
+ dsProps.put(LOG_FILE, "migrationClient.log");
if (this.cacheXmlFile != null) {
- dsProps.put(DistributionConfig.CACHE_XML_FILE_NAME, this.cacheXmlFile.getName());
+ dsProps.put(CACHE_XML_FILE, this.cacheXmlFile.getName());
}
this.distributedSystem = DistributedSystem.connect(dsProps);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
index 6c9fa73..a611d39 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.admin.internal.InetAddressUtil;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
@@ -208,9 +210,9 @@ public class MigrationServer {
&& System.getProperty(DistributionConfig.GEMFIRE_PREFIX + LOCATORS) == null) {
dsProps.put(MCAST_PORT, "0");
}
- dsProps.put(DistributionConfig.LOG_FILE_NAME, "migrationServer.log");
+ dsProps.put(LOG_FILE, "migrationServer.log");
if (this.cacheXmlFile != null) {
- dsProps.put(DistributionConfig.CACHE_XML_FILE_NAME, this.cacheXmlFile.getName());
+ dsProps.put(CACHE_XML_FILE, this.cacheXmlFile.getName());
}
this.distributedSystem = DistributedSystem.connect(dsProps);
if (VERBOSE) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
index d3220b8..8f1ad81 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.*;
import com.gemstone.gemfire.admin.AdminException;
import com.gemstone.gemfire.admin.BackupStatus;
@@ -457,7 +459,7 @@ public class SystemAdmin {
private static InternalDistributedSystem getAdminCnx() {
InternalDistributedSystem.setCommandLineAdmin(true);
Properties props = propertyOption;
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "warning");
+ props.setProperty(LOG_LEVEL, "warning");
DistributionConfigImpl dsc = new DistributionConfigImpl(props);
System.out.print("Connecting to distributed system:");
if (!"".equals(dsc.getLocators())) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
index 97d907a..213653e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
@@ -18,6 +18,8 @@ package com.gemstone.gemfire.internal.admin;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import java.util.Iterator;
import java.util.Properties;
@@ -113,15 +115,15 @@ public class SSLConfig {
* @since GemFire 4.0
*/
public void toDSProperties(Properties props) {
- props.setProperty(DistributionConfig.SSL_ENABLED_NAME,
+ props.setProperty(SSL_ENABLED,
String.valueOf(this.enabled));
if (this.enabled) {
- props.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME,
+ props.setProperty(SSL_PROTOCOLS,
this.protocols);
- props.setProperty(DistributionConfig.SSL_CIPHERS_NAME,
+ props.setProperty(SSL_CIPHERS,
this.ciphers);
- props.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME,
+ props.setProperty(SSL_REQUIRE_AUTHENTICATION,
String.valueOf(this.requireAuth));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
index 3e4ddf1..696f322 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
@@ -264,7 +264,7 @@ public class RemoteTransportConfig implements TransportConfig {
bindAddress);
// System.out.println("entering ds port range property of " + this.membershipPortRange);
if (this.membershipPortRange != null) {
- props.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, this.membershipPortRange);
+ props.setProperty(MEMBERSHIP_PORT_RANGE, this.membershipPortRange);
}
if (this.tcpPort != 0) {
props.setProperty(TCP_PORT, String.valueOf(this.tcpPort));
@@ -309,7 +309,7 @@ public class RemoteTransportConfig implements TransportConfig {
this.sslConfig.toDSProperties(props);
- props.setProperty(DistributionConfig.DISABLE_TCP_NAME,
+ props.setProperty(DISABLE_TCP,
this.tcpDisabled? "true" : "false");
props.setProperty(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, this.disableAutoReconnect? "true" : "false");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
index d3365e8..c04ae48 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
@@ -43,6 +43,7 @@ import java.net.URL;
import java.util.*;
import java.util.concurrent.TimeUnit;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_FILE;
import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SERVER_BIND_ADDRESS;
/**
@@ -658,15 +659,15 @@ public class CacheServerLauncher {
// properly configure logging, the declarative caching file, etc.
final Properties props = (Properties) options.get(PROPERTIES);
- if (props.getProperty(DistributionConfig.LOG_FILE_NAME) == null && CacheServerLauncher.isLoggingToStdOut()) {
+ if (props.getProperty(LOG_FILE) == null && CacheServerLauncher.isLoggingToStdOut()) {
// Check First if the gemfire.properties set the log-file. If they do, we shouldn't override that default
final Properties gemfireProperties = new Properties();
DistributionConfigImpl.loadGemFireProperties(gemfireProperties);
- if (gemfireProperties.get(DistributionConfig.LOG_FILE_NAME) == null) {
+ if (gemfireProperties.get(LOG_FILE) == null) {
// Do not allow the cache server to log to stdout, override the logger with #defaultLogFileName
- props.setProperty(DistributionConfig.LOG_FILE_NAME, defaultLogFileName);
+ props.setProperty(LOG_FILE, defaultLogFileName);
}
}
@@ -1196,7 +1197,7 @@ public class CacheServerLauncher {
/**
* Reads {@link DistributedSystem#PROPERTY_FILE} and determines if the
- * {@link DistributionConfig#LOG_FILE_NAME} property is set to stdout
+ * {@link SystemConfigurationProperties#LOG_FILE} property is set to stdout
* @return true if the logging would go to stdout
*/
private static boolean isLoggingToStdOut() {
@@ -1210,7 +1211,7 @@ public class CacheServerLauncher {
System.out.println("Failed reading " + url);
System.exit( 1 );
}
- final String logFile = gfprops.getProperty(DistributionConfig.LOG_FILE_NAME);
+ final String logFile = gfprops.getProperty(LOG_FILE);
if ( logFile == null || logFile.length() == 0 ) {
return true;
}
@@ -1262,9 +1263,9 @@ public class CacheServerLauncher {
commandLineWrapper.add(key + "=" + props.getProperty(key.toString()));
}
- if (props.getProperty(DistributionConfig.LOG_FILE_NAME) == null && CacheServerLauncher.isLoggingToStdOut()) {
+ if (props.getProperty(LOG_FILE) == null && CacheServerLauncher.isLoggingToStdOut()) {
// Do not allow the cache server to log to stdout; override the logger with #defaultLogFileName
- commandLineWrapper.add(DistributionConfig.LOG_FILE_NAME + "=" + defaultLogFileName);
+ commandLineWrapper.add(LOG_FILE + "=" + defaultLogFileName);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
index f010ca9..4c6ea10 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
@@ -72,8 +72,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Represents a (disk-based) persistent store for region data. Used for both
@@ -4358,7 +4357,7 @@ public class DiskStoreImpl implements DiskStore {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, "");
+ props.setProperty(CACHE_XML_FILE, "");
DistributedSystem ds = DistributedSystem.connect(props);
offlineDS = ds;
Cache c = com.gemstone.gemfire.cache.CacheFactory.create(ds);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
index d4c291f..ade09ee 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -32,6 +32,8 @@ import org.apache.logging.log4j.Logger;
import java.io.*;
import java.util.Arrays;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* This class represents a ConnectionProxy of the CacheClient
*
@@ -202,7 +204,7 @@ public final class ClientProxyMembershipID
private ClientProxyMembershipID(int id, byte[] clientSideIdentity) {
Boolean specialCase = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "SPECIAL_DURABLE");
- String durableID = this.system.getProperties().getProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME);
+ String durableID = this.system.getProperties().getProperty(DURABLE_CLIENT_ID);
if (specialCase.booleanValue() && durableID != null && (!durableID.equals(""))) {
this.uniqueId = durable_synch_counter;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
index 4ea34f5..8c2fda7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
@@ -56,6 +56,8 @@ import java.security.cert.X509Certificate;
import java.security.spec.X509EncodedKeySpec;
import java.util.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class HandShake implements ClientHandShake
{
private static final Logger logger = LogService.getLogger();
@@ -344,8 +346,7 @@ public class HandShake implements ClientHandShake
private byte setClientConflation() {
byte result = CONFLATION_DEFAULT;
- String clientConflationValue = this.system.getProperties().getProperty(
- DistributionConfig.CLIENT_CONFLATION_PROP_NAME);
+ String clientConflationValue = this.system.getProperties().getProperty(CONFLATE_EVENTS);
if (DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_ON
.equalsIgnoreCase(clientConflationValue)) {
result = CONFLATION_ON;
@@ -480,8 +481,7 @@ public class HandShake implements ClientHandShake
writeCredentials(dos, dis, p_credentials, ports != null, member, hdos);
}
} else {
- String authInitMethod = this.system.getProperties().getProperty(
- DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME);
+ String authInitMethod = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT);
acceptanceCode = writeCredential(dos, dis, authInitMethod,
ports != null, member, hdos);
}
@@ -1252,8 +1252,7 @@ public class HandShake implements ClientHandShake
REPLY_OK, this.clientReadTimeout, null, this.credentials, member,
false);
- String authInit = this.system.getProperties().getProperty(
- DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME);
+ String authInit = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT);
if (communicationMode != Acceptor.GATEWAY_TO_GATEWAY
&& intermediateAcceptanceCode != REPLY_AUTH_NOT_REQUIRED
&& (authInit != null && authInit.length() != 0)) {
@@ -1593,8 +1592,7 @@ public class HandShake implements ClientHandShake
private Properties getCredentials(DistributedMember member) {
- String authInitMethod = this.system.getProperties().getProperty(
- DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME);
+ String authInitMethod = this.system.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT);
return getCredentials(authInitMethod, this.system.getSecurityProperties(),
member, false, (InternalLogWriter)this.system.getLogWriter(),
(InternalLogWriter)this.system.getSecurityLogWriter());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
index e3c5438..5cd1849 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
@@ -17,6 +17,7 @@
package com.gemstone.gemfire.internal.cache.xmlcache;
import com.gemstone.gemfire.cache.CacheXmlException;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
@@ -691,7 +692,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/** The name of the <code>overflow-directory</code> attribute */
protected static final String OVERFLOW_DIRECTORY = "overflow-directory";
/** The name of the <code>socket-buffer-size</code> attribute */
- protected static final String SOCKET_BUFFER_SIZE = DistributionConfig.SOCKET_BUFFER_SIZE_NAME;
+ protected static final String SOCKET_BUFFER_SIZE = SystemConfigurationProperties.SOCKET_BUFFER_SIZE;
/** The name of the <code>socket-read-timeout</code> attribute */
protected static final String SOCKET_READ_TIMEOUT = "socket-read-timeout";
/** The name of the <code>maximum-queue-memory</code> attribute */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
index cdc5e81..27f5302 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal.logging;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
@@ -71,7 +73,7 @@ public class LogWriterFactory {
} else {
boolean defaultSource = false;
if (config instanceof DistributionConfig) {
- ConfigSource source = ((DistributionConfig) config).getConfigSource(DistributionConfig.LOG_LEVEL_NAME);
+ ConfigSource source = ((DistributionConfig) config).getConfigSource(LOG_LEVEL);
if (source == null) {
defaultSource = true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
index 690280b..ac28941 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
@@ -16,6 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.cli;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.management.cli.CliMetaData;
@@ -47,7 +48,7 @@ public class CommandManager {
private static final Object INSTANCE_LOCK = new Object();
private static CommandManager INSTANCE = null;
- public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.USER_COMMAND_PACKAGES;
+ public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.USER_COMMAND_PACKAGES;
public static final String USER_CMD_PACKAGES_ENV_VARIABLE = "GEMFIRE_USER_COMMAND_PACKAGES";
private Properties cacheProperties;
@@ -92,7 +93,7 @@ public class CommandManager {
// Find by packages specified in the distribution config
if (this.cacheProperties != null) {
- String cacheUserCmdPackages = this.cacheProperties.getProperty(DistributionConfig.USER_COMMAND_PACKAGES);
+ String cacheUserCmdPackages = this.cacheProperties.getProperty(SystemConfigurationProperties.USER_COMMAND_PACKAGES);
if (cacheUserCmdPackages != null && !cacheUserCmdPackages.isEmpty()) {
StringTokenizer tokenizer = new StringTokenizer(cacheUserCmdPackages, ",");
while (tokenizer.hasMoreTokens()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
index 4ba8c36..6bc2882 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
@@ -16,12 +16,13 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.management.cli.CliMetaData;
import com.gemstone.gemfire.management.cli.ConverterHint;
@@ -324,7 +325,7 @@ public class ConfigCommands implements CommandMarker {
}
if (statisticSamplingEnabled != null) {
- runTimeDistributionConfigAttributes.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, statisticSamplingEnabled.toString());
+ runTimeDistributionConfigAttributes.put(STATISTIC_SAMPLING_ENABLED, statisticSamplingEnabled.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 4aec26d..d1ca03a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -97,8 +97,7 @@ import java.security.KeyStore;
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.*;
/**
*
@@ -415,8 +414,8 @@ public class ShellCommands implements CommandMarker {
String truststorePasswordToUse = sslConfigProps.get(Gfsh.SSL_TRUSTSTORE_PASSWORD);
// Ciphers are not passed to HttpsURLConnection. Could not find a clean way
// to pass this attribute to socket layer (see #51645)
- String sslCiphersToUse = sslConfigProps.get(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME);
- String sslProtocolsToUse = sslConfigProps.get(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME);
+ String sslCiphersToUse = sslConfigProps.get(CLUSTER_SSL_CIPHERS);
+ String sslProtocolsToUse = sslConfigProps.get(CLUSTER_SSL_PROTOCOLS);
//Commenting the code to set cipher suites in GFSH rest connect (see #51645)
/*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
index 3dd0eb5..4977649 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management.internal.cli.functions;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.execute.Function;
@@ -56,7 +58,7 @@ public class ChangeLogLevelFunction implements Function, InternalEntity {
final String logLevel = (String) args[0];
Level log4jLevel = LogWriterLogger.logWriterNametoLog4jLevel(logLevel);
logwriterLogger.setLevel(log4jLevel);
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, logLevel);
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, logLevel);
// LOG:CONFIG:
logger.info(LogMarker.CONFIG, "GFSH Changed log level to {}", log4jLevel);
result.put(cache.getDistributedSystem().getDistributedMember().getId(), "New log level is " + log4jLevel);
[05/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
index d49b116..8115701 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal.cache;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.Region.Entry;
import com.gemstone.gemfire.cache.client.*;
@@ -147,10 +149,10 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
ClientCacheFactory ccf = new ClientCacheFactory();
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
// these settings were used to manually check that tx operation stats were being updated
- //ccf.set(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- //ccf.set(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "clientStats.gfs");
+ //ccf.set(STATISTIC_SAMPLING_ENABLED, "true");
+ //ccf.set(STATISTIC_ARCHIVE_FILE, "clientStats.gfs");
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<Integer, String> crf = cCache
.createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY
@@ -207,7 +209,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
@@ -278,7 +280,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
ClientCacheFactory ccf = new ClientCacheFactory();
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(cachingProxy ? ClientRegionShortcut.CACHING_PROXY : ClientRegionShortcut.PROXY);
@@ -1333,7 +1335,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ClientCacheFactory ccf = new ClientCacheFactory();
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(ClientRegionShortcut.PROXY);
@@ -1429,7 +1431,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.addPoolServer("localhost", port2);
ccf.setPoolLoadConditioningInterval(1);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(ClientRegionShortcut.PROXY);
@@ -1546,7 +1548,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
if (port2 != 0) ccf.addPoolServer("localhost", port2);
if (port3 != 0) ccf.addPoolServer("localhost", port3);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(cachingProxy ? ClientRegionShortcut.CACHING_PROXY : ClientRegionShortcut.PROXY);
@@ -2058,7 +2060,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.addPoolServer("localhost", port2);
ccf.setPoolSubscriptionEnabled(false);
ccf.setPoolLoadConditioningInterval(1);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(ClientRegionShortcut.PROXY);
@@ -2451,7 +2453,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.setPoolMinConnections(5);
ccf.setPoolLoadConditioningInterval(-1);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
Region r1 = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create("r1");
Region r2 = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create("r2");
@@ -2684,10 +2686,10 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port);
ccf.addPoolServer("localhost", port2);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
// these settings were used to manually check that tx operation stats were being updated
- //ccf.set(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- //ccf.set(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "clientStats.gfs");
+ //ccf.set(STATISTIC_SAMPLING_ENABLED, "true");
+ //ccf.set(STATISTIC_ARCHIVE_FILE, "clientStats.gfs");
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<Integer, String> crf = cCache
.createClientRegionFactory(ClientRegionShortcut.PROXY);
@@ -2986,7 +2988,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1);
if (port2 != 0) ccf.addPoolServer("localhost", port2);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
@@ -3127,7 +3129,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.addPoolServer("localhost", port2);
ccf.setPoolMinConnections(0);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
@@ -3215,7 +3217,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1);
ccf.setPoolMinConnections(0);
ccf.setPoolSubscriptionEnabled(false);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
ClientRegionFactory<CustId, Customer> custrf = cCache
.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
@@ -3305,7 +3307,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.setPoolMinConnections(0);
ccf.setPoolSubscriptionEnabled(true);
ccf.setPoolSubscriptionRedundancy(0);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
Region r = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).addCacheListener(new ClientListener()).create(regionName);
r.registerInterestRegex(".*");
@@ -3321,7 +3323,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1);
ccf.setPoolMinConnections(0);
ccf.setPoolSubscriptionEnabled(true);
- ccf.set(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ ccf.set(LOG_LEVEL, getDUnitLogLevel());
ClientCache cCache = getClientCache(ccf);
Region r = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(regionName);
getCache().getCacheTransactionManager().begin();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
index 8a1586c..197b028 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -31,7 +31,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
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.MembershipManager;
import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManagerHelper;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -46,6 +45,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* tests for the concurrentMapOperations. there are more tests in ClientServerMiscDUnitTest
*
@@ -135,7 +136,7 @@ public class ConcurrentMapOpsDUnitTest extends CacheTestCase {
ccf.addPoolServer("localhost", port2);
}
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-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
index b6d5a12..34ad0fe 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
@@ -22,8 +22,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.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/** A test of 46438 - missing response to an update attributes message */
public class ConnectDisconnectDUnitTest extends CacheTestCase {
@@ -151,8 +150,8 @@ public class ConnectDisconnectDUnitTest extends CacheTestCase {
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
- props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ props.setProperty(LOG_LEVEL, "info");
+ props.setProperty(CONSERVE_SOCKETS, "false");
if (LOCATOR_PORT > 0) {
props.setProperty(START_LOCATOR, "localhost[" + LOCATOR_PORT + "]");
props.setProperty(LOCATORS, LOCATORS_STRING);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 7624d12..151a8e5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -47,8 +47,7 @@ import com.gemstone.gemfire.test.dunit.*;
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.*;
/**
* @since GemFire 6.1
@@ -649,8 +648,8 @@ public class DeltaPropagationDUnitTest 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(60));
+ properties.setProperty(DURABLE_CLIENT_ID, durableClientId);
+ properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(60));
createDurableCacheClient(((PoolFactoryImpl)pf).getPoolAttributes(),
regionName, properties, new Integer(DURABLE_CLIENT_LISTENER), Boolean.TRUE);
@@ -722,8 +721,8 @@ public class DeltaPropagationDUnitTest 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(60));
+ properties.setProperty(DURABLE_CLIENT_ID, durableClientId);
+ properties.setProperty(DURABLE_CLIENT_TIMEOUT, String.valueOf(60));
createDurableCacheClient(((PoolFactoryImpl)pf).getPoolAttributes(),
regionName, properties, new Integer(DURABLE_CLIENT_LISTENER), Boolean.FALSE);
@@ -1314,7 +1313,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.CLIENT_CONFLATION_PROP_NAME, conflate);
+ props.setProperty(CONFLATE_EVENTS, conflate);
new DeltaPropagationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
pool = ClientServerTestCase.configureConnectionPool(factory, "localhost", ports,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
index d57f706..60a0548 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
@@ -33,8 +33,7 @@ import java.io.File;
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.*;
import static org.junit.Assert.assertEquals;
/**
@@ -64,10 +63,10 @@ public class DiskOfflineCompactionJUnitTest
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "stats.gfs");
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "stats.gfs");
ds = DistributedSystem.connect(props);
cache = CacheFactory.create(ds);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
index 316813d..0ac0d11 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
@@ -29,10 +29,8 @@ import java.io.File;
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 org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static org.junit.Assert.*;
/**
* Tests the old disk apis to make sure they do the correct thing.
@@ -52,10 +50,10 @@ public class DiskOldAPIsJUnitTest
static {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "stats.gfs");
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "stats.gfs");
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
index b1a67e3..57bde39 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-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;
@@ -32,7 +31,7 @@ import java.util.Arrays;
import java.util.Iterator;
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.assertTrue;
import static org.junit.Assert.fail;
@@ -73,7 +72,7 @@ public class DiskRegCacheXmlJUnitTest
props.setProperty(SystemConfigurationProperties.NAME, "test");
String path = TestUtil.getResourcePath(getClass(), "DiskRegCacheXmlJUnitTest.xml");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
ds = DistributedSystem.connect(props);
try {
// Create the cache which causes the cache-xml-file to be parsed
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
index a71be75..c7f1d18 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
@@ -34,7 +33,7 @@ import java.io.FileWriter;
import java.io.PrintWriter;
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;
/**
@@ -50,53 +49,9 @@ public class DiskRegCachexmlGeneratorJUnitTest extends DiskRegionTestingBase
DiskRegionProperties diskProps = new DiskRegionProperties();
- DiskRegionProperties diskProps1 = new DiskRegionProperties();
+ DiskRegionProperties[] diskRegionProperties = new DiskRegionProperties[12];
- DiskRegionProperties diskProps2 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps3 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps4 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps5 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps6 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps7 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps8 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps9 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps10 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps11 = new DiskRegionProperties();
-
- DiskRegionProperties diskProps12 = new DiskRegionProperties();
-
- Region region1;
-
- Region region2;
-
- Region region3;
-
- Region region4;
-
- Region region5;
-
- Region region6;
-
- Region region7;
-
- Region region8;
-
- Region region9;
-
- Region region10;
-
- Region region11;
-
- Region region12;
+ Region[] regions = new Region[12];
@Before
public void setUp() throws Exception
@@ -107,18 +62,17 @@ public class DiskRegCachexmlGeneratorJUnitTest extends DiskRegionTestingBase
diskDirSize[1] = Integer.MAX_VALUE;
diskDirSize[2] = 1073741824;
diskDirSize[3] = 2073741824;
- diskProps1.setDiskDirsAndSizes(dirs, diskDirSize);
- diskProps2.setDiskDirs(dirs);
- diskProps3.setDiskDirs(dirs);
- diskProps4.setDiskDirs(dirs);
- diskProps5.setDiskDirs(dirs);
- diskProps6.setDiskDirs(dirs);
- diskProps7.setDiskDirs(dirs);
- diskProps8.setDiskDirs(dirs);
- diskProps9.setDiskDirs(dirs);
- diskProps10.setDiskDirs(dirs);
- diskProps11.setDiskDirs(dirs);
- diskProps12.setDiskDirs(dirs);
+
+ for (int i = 0; i < diskRegionProperties.length; i++) {
+ diskRegionProperties[i] = new DiskRegionProperties();
+ if(i == 0)
+ {
+ diskRegionProperties[i].setDiskDirsAndSizes(dirs, diskDirSize);
+ }
+ else{
+ diskRegionProperties[i].setDiskDirs(dirs);
+ }
+ }
}
@After
@@ -130,97 +84,97 @@ public class DiskRegCachexmlGeneratorJUnitTest extends DiskRegionTestingBase
public void createCacheXML()
{
- // create the region1 which is SyncPersistOnly and set DiskWriteAttibutes
- diskProps1.setRolling(true);
- diskProps1.setMaxOplogSize(1073741824L);
- diskProps1.setRegionName("region1");
- region1 = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache,
- diskProps1, Scope.LOCAL);
-
- // create the region2 which is SyncPersistOnly and set DiskWriteAttibutes
-
- diskProps2.setRolling(false);
- diskProps2.setRegionName("region2");
- region2 = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache,
- diskProps2, Scope.LOCAL);
-
- // create the region3 which AsyncPersistOnly, No buffer and Rolling oplog
- diskProps3.setRolling(true);
- diskProps3.setMaxOplogSize(1073741824L);
- diskProps3.setRegionName("region3");
- region3 = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache,
- diskProps3);
-
- // create the region4 which is AsynchPersistonly, No buffer and fixed oplog
- diskProps4.setRolling(false);
- diskProps4.setRegionName("region4");
- region4 = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache,
- diskProps4);
-
- // create the region5 which is SynchOverflowOnly, Rolling oplog
- diskProps5.setRolling(true);
- diskProps5.setMaxOplogSize(1073741824L);
- diskProps5.setRegionName("region5");
- region5 = DiskRegionHelperFactory.getSyncOverFlowOnlyRegion(cache,
- diskProps5);
-
- // create the region6 which is SyncOverflowOnly, Fixed oplog
- diskProps6.setRolling(false);
- diskProps6.setRegionName("region6");
- region6 = DiskRegionHelperFactory.getSyncOverFlowOnlyRegion(cache,
- diskProps6);
-
- // create the region7 which is AsyncOverflow, with Buffer and rolling oplog
- diskProps7.setRolling(true);
- diskProps7.setMaxOplogSize(1073741824L);
- diskProps7.setBytesThreshold(10000l);
- diskProps7.setTimeInterval(15l);
- diskProps7.setRegionName("region7");
- region7 = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache,
- diskProps7);
-
- // create the region8 which is AsyncOverflow ,Time base buffer-zero byte
+ // create the regions[0] which is SyncPersistOnly and set DiskWriteAttibutes
+ diskRegionProperties[0].setRolling(true);
+ diskRegionProperties[0].setMaxOplogSize(1073741824L);
+ diskRegionProperties[0].setRegionName("regions1");
+ regions[0] = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache,
+ diskRegionProperties[0], Scope.LOCAL);
+
+ // create the regions[1] which is SyncPersistOnly and set DiskWriteAttibutes
+
+ diskRegionProperties[1].setRolling(false);
+ diskRegionProperties[1].setRegionName("regions2");
+ regions[1] = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache,
+ diskRegionProperties[1], Scope.LOCAL);
+
+ // create the regions[2] which AsyncPersistOnly, No buffer and Rolling oplog
+ diskRegionProperties[2].setRolling(true);
+ diskRegionProperties[2].setMaxOplogSize(1073741824L);
+ diskRegionProperties[2].setRegionName("regions3");
+ regions[2] = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache,
+ diskRegionProperties[2]);
+
+ // create the regions[3] which is AsynchPersistonly, No buffer and fixed oplog
+ diskRegionProperties[3].setRolling(false);
+ diskRegionProperties[3].setRegionName("regions4");
+ regions[3] = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache,
+ diskRegionProperties[3]);
+
+ // create the regions[4] which is SynchOverflowOnly, Rolling oplog
+ diskRegionProperties[4].setRolling(true);
+ diskRegionProperties[4].setMaxOplogSize(1073741824L);
+ diskRegionProperties[4].setRegionName("regions5");
+ regions[4] = DiskRegionHelperFactory.getSyncOverFlowOnlyRegion(cache,
+ diskRegionProperties[4]);
+
+ // create the regions[5] which is SyncOverflowOnly, Fixed oplog
+ diskRegionProperties[5].setRolling(false);
+ diskRegionProperties[5].setRegionName("regions6");
+ regions[5] = DiskRegionHelperFactory.getSyncOverFlowOnlyRegion(cache,
+ diskRegionProperties[5]);
+
+ // create the regions[6] which is AsyncOverflow, with Buffer and rolling oplog
+ diskRegionProperties[6].setRolling(true);
+ diskRegionProperties[6].setMaxOplogSize(1073741824L);
+ diskRegionProperties[6].setBytesThreshold(10000l);
+ diskRegionProperties[6].setTimeInterval(15l);
+ diskRegionProperties[6].setRegionName("regions7");
+ regions[6] = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache,
+ diskRegionProperties[6]);
+
+ // create the regions[7] which is AsyncOverflow ,Time base buffer-zero byte
// buffer
// and Fixed oplog
- diskProps8.setRolling(false);
- diskProps8.setTimeInterval(15l);
- diskProps8.setBytesThreshold(0l);
- diskProps8.setRegionName("region8");
- region8 = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache,
- diskProps8);
-
- // create the region9 which is SyncPersistOverflow, Rolling oplog
- diskProps9.setRolling(true);
- diskProps9.setMaxOplogSize(1073741824L);
- diskProps9.setRegionName("region9");
- region9 = DiskRegionHelperFactory.getSyncOverFlowAndPersistRegion(cache,
- diskProps9);
-
- // create the region10 which is Sync PersistOverflow, fixed oplog
- diskProps10.setRolling(false);
- diskProps10.setRegionName("region10");
- region10 = DiskRegionHelperFactory.getSyncOverFlowAndPersistRegion(cache,
- diskProps10);
- // create the region11 which is Async Overflow Persist ,with buffer and
+ diskRegionProperties[7].setRolling(false);
+ diskRegionProperties[7].setTimeInterval(15l);
+ diskRegionProperties[7].setBytesThreshold(0l);
+ diskRegionProperties[7].setRegionName("regions8");
+ regions[7] = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache,
+ diskRegionProperties[7]);
+
+ // create the regions[8] which is SyncPersistOverflow, Rolling oplog
+ diskRegionProperties[8].setRolling(true);
+ diskRegionProperties[8].setMaxOplogSize(1073741824L);
+ diskRegionProperties[8].setRegionName("regions9");
+ regions[8] = DiskRegionHelperFactory.getSyncOverFlowAndPersistRegion(cache,
+ diskRegionProperties[8]);
+
+ // create the regions[9] which is Sync PersistOverflow, fixed oplog
+ diskRegionProperties[9].setRolling(false);
+ diskRegionProperties[9].setRegionName("regions10");
+ regions[9] = DiskRegionHelperFactory.getSyncOverFlowAndPersistRegion(cache,
+ diskRegionProperties[9]);
+ // create the regions[10] which is Async Overflow Persist ,with buffer and
// rollong
// oplog
- diskProps11.setRolling(true);
- diskProps11.setMaxOplogSize(1073741824L);
- diskProps11.setBytesThreshold(10000l);
- diskProps11.setTimeInterval(15l);
- diskProps11.setRegionName("region11");
- region11 = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache,
- diskProps11);
-
- // create the region12 which is Async Persist Overflow with time based
+ diskRegionProperties[10].setRolling(true);
+ diskRegionProperties[10].setMaxOplogSize(1073741824L);
+ diskRegionProperties[10].setBytesThreshold(10000l);
+ diskRegionProperties[10].setTimeInterval(15l);
+ diskRegionProperties[10].setRegionName("regions11");
+ regions[10] = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache,
+ diskRegionProperties[10]);
+
+ // create the regions[11] which is Async Persist Overflow with time based
// buffer
// and Fixed oplog
- diskProps12.setRolling(false);
- diskProps12.setBytesThreshold(0l);
- diskProps12.setTimeInterval(15l);
- diskProps12.setRegionName("region12");
- region12 = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache,
- diskProps12);
+ diskRegionProperties[11].setRolling(false);
+ diskRegionProperties[11].setBytesThreshold(0l);
+ diskRegionProperties[11].setTimeInterval(15l);
+ diskRegionProperties[11].setRegionName("regions12");
+ regions[11] = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache,
+ diskRegionProperties[11]);
//cacheXmlGenerator: generates cacheXml file
@@ -246,58 +200,46 @@ public class DiskRegCachexmlGeneratorJUnitTest extends DiskRegionTestingBase
props.setProperty(SystemConfigurationProperties.NAME, "DiskRegCachexmlGeneratorJUnitTest");
props.setProperty(MCAST_PORT, "0");
String path = "DiskRegCachexmlGeneratorJUnitTest.xml";
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
ds = DistributedSystem.connect(props);
// Create the cache which causes the cache-xml-file to be parsed
cache = CacheFactory.create(ds);
- // Get the region1
- region1 = cache.getRegion("region1");
- verify((LocalRegion)region1, diskProps1);
+ // Get the regions[0]
+ verify((LocalRegion) cache.getRegion("regions1"), diskRegionProperties[0]);
- // Get the region2
- Region region2 = cache.getRegion("region2");
- verify((LocalRegion)region2, diskProps2);
+ // Get the regions[1]
+ verify((LocalRegion) cache.getRegion("regions2"), diskRegionProperties[1]);
- // Get the region3
- Region region3 = cache.getRegion("region3");
- verify((LocalRegion)region3, diskProps3);
+ // Get the regions[2]
+ verify((LocalRegion) cache.getRegion("regions3"), diskRegionProperties[2]);
- // Get the region4
- Region region4 = cache.getRegion("region4");
- verify((LocalRegion)region4, diskProps4);
+ // Get the regions[3]
+ verify((LocalRegion) cache.getRegion("regions4"), diskRegionProperties[3]);
- // Get the region5
- Region region5 = cache.getRegion("region5");
- verify((LocalRegion)region5, diskProps5);
+ // Get the regions[4]
+ verify((LocalRegion) cache.getRegion("regions5"), diskRegionProperties[4]);
- // Get the region6
- Region region6 = cache.getRegion("region6");
- verify((LocalRegion)region6, diskProps6);
+ // Get the regions[5]
+ verify((LocalRegion) cache.getRegion("regions6"), diskRegionProperties[5]);
- // Get the region7
- Region region7 = cache.getRegion("region7");
- verify((LocalRegion)region7, diskProps7);
+ // Get the regions[6]
+ verify((LocalRegion) cache.getRegion("regions7"), diskRegionProperties[6]);
- // Get the region8
- Region region8 = cache.getRegion("region8");
- verify((LocalRegion)region8, diskProps8);
+ // Get the regions[7]
+ verify((LocalRegion) cache.getRegion("regions8"), diskRegionProperties[7]);
- // Get the region9
- Region region9 = cache.getRegion("region9");
- verify((LocalRegion)region9, diskProps9);
+ // Get the regions[8]
+ verify((LocalRegion) cache.getRegion("regions9"), diskRegionProperties[8]);
- // Get the region10
- Region region10 = cache.getRegion("region10");
- verify((LocalRegion)region10, diskProps10);
+ // Get the regions[9]
+ verify((LocalRegion) cache.getRegion("regions10"), diskRegionProperties[9]);
- // Get the region11
- Region region11 = cache.getRegion("region11");
- verify((LocalRegion)region11, diskProps11);
+ // Get the regions[10]
+ verify((LocalRegion) cache.getRegion("regions11"), diskRegionProperties[10]);
- // Get the region12
- Region region12 = cache.getRegion("region12");
- verify((LocalRegion)region12, diskProps12);
+ // Get the regions[11]
+ verify((LocalRegion) cache.getRegion("regions12"), diskRegionProperties[11]);
}
}// end of DiskRegCachexmlGeneratorJUnitTest
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
index 09f95f8..005555a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal.cache;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DiskStoreFactory;
@@ -54,10 +56,10 @@ public class DiskRegionIllegalArguementsJUnitTest
static {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "stats.gfs");
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "stats.gfs");
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
index cac5087..490aa8b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.CacheXmlException;
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.Test;
@@ -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.fail;
/**
@@ -52,7 +51,7 @@ public class DiskRegionIllegalCacheXMLvaluesJUnitTest
dir.deleteOnExit();
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), path));
+ props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), path));
ds = DistributedSystem.connect(props);
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
index 08772a4..83a29ae 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
@@ -20,6 +20,8 @@
*/
package com.gemstone.gemfire.internal.cache;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
@@ -77,10 +79,10 @@ public class DiskRegionTestingBase
{
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "stats.gfs");
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "stats.gfs");
File testingDirectory = new File("testingDirectory");
testingDirectory.mkdir();
@@ -173,8 +175,8 @@ public class DiskRegionTestingBase
protected Cache createCache() {
// useful for debugging:
-// props.put(DistributionConfig.LOG_FILE_NAME, "diskRegionTestingBase_system.log");
-// props.put(DistributionConfig.LOG_LEVEL_NAME, getGemFireLogLevel());
+// props.put(LOG_FILE, "diskRegionTestingBase_system.log");
+// props.put(LOG_LEVEL, getGemFireLogLevel());
cache = new CacheFactory(props).create();
ds = cache.getDistributedSystem();
logWriter = cache.getLogger();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
index f2685f6..84dcd1b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
@@ -30,8 +30,7 @@ import java.io.FilenameFilter;
import java.util.Arrays;
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.*;
/**
@@ -51,10 +50,10 @@ public class DiskStoreFactoryJUnitTest
static {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "stats.gfs");
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "stats.gfs");
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
index c97ac23..8ffcf07 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -25,7 +25,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.partitioned.fixed.QuarterPartitionResolver;
import com.gemstone.gemfire.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
@@ -38,8 +37,7 @@ import java.io.File;
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.*;
public class FixedPRSinglehopDUnitTest extends CacheTestCase {
@@ -412,7 +410,7 @@ public class FixedPRSinglehopDUnitTest extends CacheTestCase {
File logFile = new File("locator-" + locatorPort + ".log");
Properties props = new Properties();
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
try {
locator = Locator.startLocatorAndDS(locatorPort, logFile, null, props);
}
[36/55] [abbrv] incubator-geode git commit: GEODE-1450: Move
ExampleJSONAuthorization out of 'test' and into 'main'
Posted by hi...@apache.org.
GEODE-1450: Move ExampleJSONAuthorization out of 'test' and into 'main'
- This also renames the class to SampleJsonAuthorization (it's already
in an 'examples' package so I figured the original name was a bit
redundant).
- Once we have an 'examples' submodule this class could be refactored a
bit more and moved there (or simply extended there with a thin
wrapper).
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d24a5fb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d24a5fb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d24a5fb1
Branch: refs/heads/feature/GEODE-1372
Commit: d24a5fb1329a9bcc7f6148a883fef298da2c4a8e
Parents: 653eaf2
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed May 25 15:44:58 2016 -0700
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Thu Jun 2 10:44:08 2016 -0700
----------------------------------------------------------------------
.../templates/SampleJsonAuthorization.java | 262 +++++++++++++++++++
.../security/ExampleJSONAuthorization.java | 193 --------------
.../internal/security/JSONAuthorization.java | 175 +------------
3 files changed, 264 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d24a5fb1/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java b/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java
new file mode 100644
index 0000000..5723ea5
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java
@@ -0,0 +1,262 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.security.templates;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.management.internal.security.ResourceConstants;
+import com.gemstone.gemfire.security.AccessControl;
+import com.gemstone.gemfire.security.AuthenticationFailedException;
+import com.gemstone.gemfire.security.Authenticator;
+import com.gemstone.gemfire.security.NotAuthorizedException;
+import org.apache.commons.io.IOUtils;
+
+import javax.management.remote.JMXPrincipal;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+/**
+ * This class provides a sample implementation for authentication and authorization via the {@link AccessControl}
+ * and {@link Authenticator} interfaces.
+ *
+ * In order to use it, a Geode member must be started with the following properties:
+ * <p/>
+ * <code>
+ * security-client-authenticator = com.gemstone.gemfire.security.examples.SampleJsonAuthorization.create
+ * security-client-accessor = com.gemstone.gemfire.security.examples.SampleJsonAuthorization.create
+ * </code>
+ * <p/>
+ * The class is initialized with a JSON file called {@code security.json}. This file must exist on the classpath,
+ * so members should be started with an appropriate {@code --classpath} option.
+ * <p/>
+ * The format of the file is as follows:
+ * <pre>
+ * {
+ * "roles": [
+ * {
+ * "name": "admin",
+ * "operationsAllowed": [
+ * "CLUSTER:MANAGE",
+ * "DATA:MANAGE"
+ * ]
+ * },
+ * {
+ * "name": "readRegionA",
+ * "operationsAllowed": [
+ * "DATA:READ"
+ * ],
+ * "regions": ["RegionA", "RegionB"]
+ * }
+ * ]
+ * "users": [
+ * {
+ * "name": "admin",
+ * "password": "secret".
+ * "roles": ["admin"]
+ * },
+ * {
+ * "name": "guest",
+ * "password": "guest",
+ * "roles": ["readRegionA"]
+ * }
+ * ]
+ * }
+ * </pre>
+ */
+public class SampleJsonAuthorization implements AccessControl, Authenticator {
+
+ public static class Role {
+ List<OperationContext> permissions = new ArrayList<>();
+ String name;
+ String serverGroup;
+ }
+
+ public static class User {
+ String name;
+ Set<Role> roles = new HashSet<>();
+ String pwd;
+ }
+
+ private static Map<String, User> acl = null;
+
+ public static SampleJsonAuthorization create() throws IOException {
+ if (acl == null) {
+ setUpWithJsonFile("security.json");
+ }
+ return new SampleJsonAuthorization();
+ }
+
+ public static void setUpWithJsonFile(String jsonFileName) throws IOException {
+ InputStream input = ClassLoader.getSystemResourceAsStream(jsonFileName);
+ if (input == null) {
+ throw new RuntimeException("Could not find the required JSON security file on the classpath: " + jsonFileName);
+ }
+
+ StringWriter writer = new StringWriter();
+ IOUtils.copy(input, writer, "UTF-8");
+ String json = writer.toString();
+ readSecurityDescriptor(json);
+ }
+
+ protected static void readSecurityDescriptor(String json) throws IOException {
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode jsonNode = mapper.readTree(json);
+ acl = new HashMap<>();
+ Map<String, Role> roleMap = readRoles(jsonNode);
+ readUsers(acl, jsonNode, roleMap);
+ }
+
+ private static void readUsers(Map<String, User> acl, JsonNode node, Map<String, Role> roleMap) {
+ for (JsonNode u : node.get("users")) {
+ User user = new User();
+ user.name = u.get("name").asText();
+
+ if (u.has("password")) {
+ user.pwd = u.get("password").asText();
+ } else {
+ user.pwd = user.name;
+ }
+
+ for (JsonNode r : u.get("roles")) {
+ user.roles.add(roleMap.get(r.asText()));
+ }
+
+ acl.put(user.name, user);
+ }
+ }
+
+ private static Map<String, Role> readRoles(JsonNode jsonNode) {
+ Map<String, Role> roleMap = new HashMap<>();
+ for (JsonNode r : jsonNode.get("roles")) {
+ Role role = new Role();
+ role.name = r.get("name").asText();
+ String regionNames = null;
+
+ JsonNode regions = r.get("regions");
+ if (regions != null) {
+ if (regions.isArray()) {
+ regionNames = StreamSupport.stream(regions.spliterator(), false)
+ .map(JsonNode::asText)
+ .collect(Collectors.joining(","));
+ } else {
+ regionNames = regions.asText();
+ }
+ }
+
+ for (JsonNode op : r.get("operationsAllowed")) {
+ String[] parts = op.asText().split(":");
+ if (regionNames == null) {
+ role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*", false));
+ } else {
+ role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames, false));
+ }
+ }
+
+ roleMap.put(role.name, role);
+
+ if (r.has("serverGroup")) {
+ role.serverGroup = r.get("serverGroup").asText();
+ }
+ }
+
+ return roleMap;
+ }
+ public static Map<String, User> getAcl() {
+ return acl;
+ }
+
+ private Principal principal = null;
+
+ @Override
+ public void close() {
+ }
+
+ @Override
+ public boolean authorizeOperation(String region, OperationContext context) {
+ if (principal == null) return false;
+
+ User user = acl.get(principal.getName());
+ if (user == null) return false; // this user is not authorized to do anything
+
+ // check if the user has this permission defined in the context
+ for (Role role : acl.get(user.name).roles) {
+ for (OperationContext permitted : role.permissions) {
+ if (permitted.implies(context)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ @Override
+ public void init(Principal principal, DistributedMember arg1, Cache arg2) throws NotAuthorizedException {
+ this.principal = principal;
+ }
+
+ @Override
+ public Principal authenticate(Properties props, DistributedMember arg1) throws AuthenticationFailedException {
+ String user = props.getProperty(ResourceConstants.USER_NAME);
+ String pwd = props.getProperty(ResourceConstants.PASSWORD);
+
+ User userObj = acl.get(user);
+ if (userObj == null) {
+ throw new AuthenticationFailedException("Wrong username/password");
+ }
+
+ LogService.getLogger().info("User=" + user + " pwd=" + pwd);
+ if (user != null && !userObj.pwd.equals(pwd) && !"".equals(user)) {
+ throw new AuthenticationFailedException("Wrong username/password");
+ }
+
+ return new JMXPrincipal(user);
+ }
+
+ @Override
+ public void init(Properties arg0, LogWriter arg1, LogWriter arg2) throws AuthenticationFailedException {
+ }
+
+ protected static String readFile(String name) throws IOException {
+ File file = new File(name);
+ FileReader reader = new FileReader(file);
+ char[] buffer = new char[(int) file.length()];
+ reader.read(buffer);
+ String json = new String(buffer);
+ reader.close();
+ return json;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d24a5fb1/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
deleted file mode 100644
index cb67f48..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ExampleJSONAuthorization.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.management.internal.security;
-
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.operations.OperationContext;
-import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.security.AccessControl;
-import com.gemstone.gemfire.security.AuthenticationFailedException;
-import com.gemstone.gemfire.security.Authenticator;
-import com.gemstone.gemfire.security.NotAuthorizedException;
-import org.apache.commons.io.IOUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import javax.management.remote.JMXPrincipal;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.security.Principal;
-import java.util.*;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
-
-public class ExampleJSONAuthorization implements AccessControl, Authenticator {
-
- public static class Role {
- List<OperationContext> permissions = new ArrayList<>();
- String name;
- String serverGroup;
- }
-
- public static class User {
- String name;
- Set<Role> roles = new HashSet<>();
- String pwd;
- }
-
- private static Map<String, User> acl = null;
-
- public static ExampleJSONAuthorization create() throws IOException, JSONException {
- return new ExampleJSONAuthorization();
- }
-
- public ExampleJSONAuthorization() throws IOException, JSONException {
- setUpWithJsonFile("security.json");
- }
-
- public static void setUpWithJsonFile(String jsonFileName) throws IOException, JSONException {
- InputStream input = ExampleJSONAuthorization.class.getResourceAsStream(jsonFileName);
- if(input==null){
- throw new RuntimeException("Could not find resource " + jsonFileName);
- }
-
- StringWriter writer = new StringWriter();
- IOUtils.copy(input, writer, "UTF-8");
- String json = writer.toString();
- readSecurityDescriptor(json);
- }
-
- private static void readSecurityDescriptor(String json) throws IOException, JSONException {
- JSONObject jsonBean = new JSONObject(json);
- acl = new HashMap<>();
- Map<String, Role> roleMap = readRoles(jsonBean);
- readUsers(acl, jsonBean, roleMap);
- }
-
- private static void readUsers(Map<String, User> acl, JSONObject jsonBean, Map<String, Role> roleMap)
- throws JSONException {
- JSONArray array = jsonBean.getJSONArray("users");
- for (int i = 0; i < array.length(); i++) {
- JSONObject obj = array.getJSONObject(i);
- User user = new User();
- user.name = obj.getString("name");
- if (obj.has("password")) {
- user.pwd = obj.getString("password");
- } else {
- user.pwd = user.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));
- }
- acl.put(user.name, user);
- }
- }
-
- private static Map<String, Role> readRoles(JSONObject jsonBean) throws JSONException {
- Map<String, Role> roleMap = new HashMap<>();
- JSONArray array = jsonBean.getJSONArray(ROLES);
- for (int i = 0; i < array.length(); i++) {
- JSONObject obj = array.getJSONObject(i);
- Role role = new Role();
- role.name = obj.getString("name");
- String regionNames = null;
- if(obj.has("regions")) {
- regionNames = obj.getString("regions");
- }
- JSONArray ops = obj.getJSONArray("operationsAllowed");
- for (int j = 0; j < ops.length(); j++) {
- String[] parts = ops.getString(j).split(":");
- if(regionNames!=null) {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames, false));
- }
- else
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*", false));
- }
-
- roleMap.put(role.name, role);
-
- if (obj.has("serverGroup")) {
- role.serverGroup = obj.getString("serverGroup");
- }
- }
-
- return roleMap;
- }
-
- public static Map<String, User> getAcl() {
- return acl;
- }
-
- private Principal principal = null;
-
- @Override
- public void close() {
-
- }
-
- @Override
- public boolean authorizeOperation(String region, OperationContext context) {
- if (principal == null)
- return false;
-
- User user = acl.get(principal.getName());
- if(user == null)
- return false; // this user is not authorized to do anything
-
- // check if the user has this permission defined in the context
- for(Role role:acl.get(user.name).roles) {
- for (OperationContext permitted : role.permissions) {
- if (permitted.implies(context)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- @Override
- public void init(Principal principal, DistributedMember arg1, Cache arg2) throws NotAuthorizedException {
- this.principal = principal;
- }
-
- @Override
- public Principal authenticate(Properties props, DistributedMember arg1) throws AuthenticationFailedException {
- String user = props.getProperty(ResourceConstants.USER_NAME);
- String pwd = props.getProperty(ResourceConstants.PASSWORD);
- User userObj = acl.get(user);
- if (userObj == null) throw new AuthenticationFailedException("Wrong username/password");
- LogService.getLogger().info("User=" + user + " pwd=" + pwd);
- if (user != null && !userObj.pwd.equals(pwd) && !"".equals(user))
- throw new AuthenticationFailedException("Wrong username/password");
- return new JMXPrincipal(user);
- }
-
- @Override
- public void init(Properties arg0, LogWriter arg1, LogWriter arg2) throws AuthenticationFailedException {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d24a5fb1/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 cb0507a..4df8a27 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
@@ -16,191 +16,20 @@
*/
package com.gemstone.gemfire.management.internal.security;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.operations.OperationContext;
-import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.security.AccessControl;
-import com.gemstone.gemfire.security.AuthenticationFailedException;
-import com.gemstone.gemfire.security.Authenticator;
-import com.gemstone.gemfire.security.NotAuthorizedException;
+import com.gemstone.gemfire.security.templates.SampleJsonAuthorization;
import com.gemstone.gemfire.util.test.TestUtil;
-import javax.management.remote.JMXPrincipal;
-import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
-
-public class JSONAuthorization implements AccessControl, Authenticator {
-
- public static class Role {
- List<OperationContext> permissions = new ArrayList<>();
- String name;
- String serverGroup;
- }
-
- public static class User {
- String name;
- Set<Role> roles = new HashSet<>();
- String pwd;
- }
-
- private static Map<String, User> acl = null;
+public class JSONAuthorization extends SampleJsonAuthorization {
public static JSONAuthorization create() throws IOException {
return new JSONAuthorization();
}
- public JSONAuthorization() throws IOException {
- }
-
- public JSONAuthorization(String jsonFileName) throws IOException {
- setUpWithJsonFile(jsonFileName);
- }
-
public static void setUpWithJsonFile(String jsonFileName) throws IOException {
String json = readFile(TestUtil.getResourcePath(JSONAuthorization.class, jsonFileName));
readSecurityDescriptor(json);
}
- private static void readSecurityDescriptor(String json) throws IOException {
- ObjectMapper mapper = new ObjectMapper();
- JsonNode jsonNode = mapper.readTree(json);
- acl = new HashMap<>();
- Map<String, Role> roleMap = readRoles(jsonNode);
- readUsers(acl, jsonNode, roleMap);
- }
-
- private static void readUsers(Map<String, User> acl, JsonNode node, Map<String, Role> roleMap) {
- for (JsonNode u : node.get("users")) {
- User user = new User();
- user.name = u.get("name").asText();
- if (u.has("password")) {
- user.pwd = u.get("password").asText();
- } else {
- user.pwd = user.name;
- }
-
- for (JsonNode r : u.get(ROLES)) {
- user.roles.add(roleMap.get(r.asText()));
- }
- acl.put(user.name, user);
- }
- }
-
- private static Map<String, Role> readRoles(JsonNode jsonNode) {
- Map<String, Role> roleMap = new HashMap<>();
- for (JsonNode r : jsonNode.get(ROLES)) {
- Role role = new Role();
- role.name = r.get("name").asText();
- String regionNames = null;
-
- JsonNode regions = r.get("regions");
- if (regions != null) {
- if (regions.isArray()) {
- regionNames = StreamSupport.stream(regions.spliterator(), false)
- .map(JsonNode::asText)
- .collect(Collectors.joining(","));
- } else {
- regionNames = regions.asText();
- }
- }
-
- for (JsonNode op : r.get("operationsAllowed")) {
- String[] parts = op.asText().split(":");
- if (regionNames == null) {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*", false));
- } else {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames, false));
- }
- }
-
- roleMap.put(role.name, role);
-
- if (r.has("serverGroup")) {
- role.serverGroup = r.get("serverGroup").asText();
- }
- }
-
- return roleMap;
- }
-
- public static Map<String, User> getAcl() {
- return acl;
- }
-
- private Principal principal = null;
-
- @Override
- public void close() {
-
- }
-
- @Override
- public boolean authorizeOperation(String region, OperationContext context) {
- if (principal == null) return false;
-
- User user = acl.get(principal.getName());
- if (user == null) return false; // this user is not authorized to do anything
-
- // check if the user has this permission defined in the context
- for (Role role : acl.get(user.name).roles) {
- for (OperationContext permitted : role.permissions) {
- if (permitted.implies(context)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- @Override
- public void init(Principal principal, DistributedMember arg1, Cache arg2) throws NotAuthorizedException {
- this.principal = principal;
- }
-
- @Override
- public Principal authenticate(Properties props, DistributedMember arg1) throws AuthenticationFailedException {
- String user = props.getProperty(ResourceConstants.USER_NAME);
- String pwd = props.getProperty(ResourceConstants.PASSWORD);
- User userObj = acl.get(user);
- if (userObj == null) throw new AuthenticationFailedException("Wrong username/password");
- LogService.getLogger().info("User=" + user + " pwd=" + pwd);
- if (user != null && !userObj.pwd.equals(pwd) && !"".equals(user)) {
- throw new AuthenticationFailedException("Wrong username/password");
- }
- return new JMXPrincipal(user);
- }
-
- @Override
- public void init(Properties arg0, LogWriter arg1, LogWriter arg2) throws AuthenticationFailedException {
-
- }
-
- private static String readFile(String name) throws IOException {
- File file = new File(name);
- FileReader reader = new FileReader(file);
- char[] buffer = new char[(int) file.length()];
- reader.read(buffer);
- String json = new String(buffer);
- reader.close();
- return json;
- }
}
[02/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
index 6b9b228..b7f2bcf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -37,8 +36,7 @@ import java.sql.SQLException;
import java.sql.Statement;
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 case is to test the following test scenarios: 1) Get Simple DS
@@ -93,7 +91,7 @@ public class DataSourceJTAJUnitTest {
try {
Properties props = new Properties();
String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
ds = connect(props);
tableName = CacheUtils.init(ds, "JTATest");
// System.out.println ("Table name: " + tableName);
@@ -274,7 +272,7 @@ public class DataSourceJTAJUnitTest {
try {
Properties props = new Properties();
String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
ds = connect(props);
tableName = CacheUtils.init(ds, "JTATest");
System.out.println("Table name: " + tableName);
@@ -585,7 +583,7 @@ public class DataSourceJTAJUnitTest {
try {
Properties props = new Properties();
String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
ds = connect(props);
tableName = CacheUtils.init(ds, "JTATest");
// System.out.println ("Table name: " + tableName);
@@ -749,7 +747,7 @@ public class DataSourceJTAJUnitTest {
try {
Properties props = new Properties();
String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
ds = connect(props);
tableName = CacheUtils.init(ds, "JTATest");
// System.out.println ("Table name: " + tableName);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
index b78cdf7..58cde28 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.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.internal.datasource.GemFireBasicDataSource;
import com.gemstone.gemfire.internal.datasource.GemFireTransactionDataSource;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -33,7 +32,7 @@ import java.sql.Connection;
import java.sql.SQLException;
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 GlobalTransactionJUnitTest extends TestCase {
@@ -49,7 +48,7 @@ public class GlobalTransactionJUnitTest extends TestCase {
props = new Properties();
props.setProperty(MCAST_PORT, "0");
String path = TestUtil.getResourcePath(GlobalTransactionJUnitTest.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);
utx = new UserTransactionImpl();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
index 2bd6790..9ac3f39 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.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.internal.datasource.GemFireTransactionDataSource;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -38,7 +37,7 @@ import java.sql.Statement;
import java.util.Properties;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
//import java.sql.SQLException;
@@ -65,8 +64,8 @@ public class TransactionTimeOutJUnitTest extends TestCase {
wr.write(modified_file_str);
wr.flush();
wr.close();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
- // props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME,"D:\\projects\\JTA\\cachejta.xml");
+ props.setProperty(CACHE_XML_FILE, path);
+ // props.setProperty(cacheXmlFile,"D:\\projects\\JTA\\cachejta.xml");
ds1 = DistributedSystem.connect(props);
cache = CacheFactory.create(ds1);
cache.getLogger().fine("SWAP:running test:"+getName());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
index 874a04d..f5cd573 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
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.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
@@ -35,6 +34,8 @@ import java.io.*;
import java.sql.SQLException;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class ExceptionsDUnitTest extends DistributedTestCase {
static DistributedSystem ds;
@@ -125,7 +126,7 @@ public class ExceptionsDUnitTest extends DistributedTestCase {
wr.write(modified_file_str);
wr.flush();
wr.close();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
// String tableName = "";
// props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
index 9dd4dbe..fc6d02a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
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.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.test.dunit.*;
@@ -34,6 +33,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class IdleTimeOutDUnitTest extends DistributedTestCase {
static DistributedSystem ds;
@@ -128,7 +129,7 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
wr.write(modified_file_str);
wr.flush();
wr.close();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
String tableName = "";
// props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 644809f..7d66a41 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
@@ -36,7 +35,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class LoginTimeOutDUnitTest extends DistributedTestCase {
private static final Logger logger = LogService.getLogger();
@@ -132,7 +131,7 @@ public class LoginTimeOutDUnitTest extends DistributedTestCase {
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");
String tableName = "";
cache = new CacheFactory(props).create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index ca5f6f7..a6ce3bd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
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.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.test.dunit.*;
@@ -34,6 +33,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class MaxPoolSizeDUnitTest extends DistributedTestCase {
static DistributedSystem ds;
@@ -126,7 +127,7 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
wr.write(modified_file_str);
wr.flush();
wr.close();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
String tableName = "";
// props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 710b7dc..1d3dde8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
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.OSProcess;
import com.gemstone.gemfire.internal.datasource.GemFireTransactionDataSource;
import com.gemstone.gemfire.internal.jta.CacheUtils;
@@ -36,6 +35,8 @@ import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
*This test tests TransactionTimeOut functionality
*/
@@ -61,7 +62,7 @@ public class TransactionTimeOutDUnitTest extends DistributedTestCase {
wr.flush();
wr.close();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
// props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10321");
try {
// ds = DistributedSystem.connect(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index 109c316..3cd06e5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.internal.jta.JTAUtils;
@@ -38,6 +37,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* This test case is to test the following test scenarios: 1) Behaviour of
* Transaction Manager in multy threaded thransactions. We will have around five
@@ -184,7 +185,7 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
wr.write(modified_file_str1);
wr.flush();
wr.close();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+ props.setProperty(CACHE_XML_FILE, path);
String tableName = "";
// props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
index fa835be..6cb3ce5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -32,6 +32,8 @@ import java.io.*;
import java.sql.SQLException;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
*This test sees if the TransactionTimeOut works properly
*/
@@ -57,9 +59,9 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
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(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10321");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
try {
// ds = DistributedSystem.connect(props);
ds = (new TxnTimeOutDUnitTest("temp")).getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
index d4ef01b..7c186cd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
@@ -41,8 +41,7 @@ import java.io.FileNotFoundException;
import java.util.Properties;
import java.util.Scanner;
-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.*;
/**
@@ -81,14 +80,14 @@ public class DistributedSystemLogFileJUnitTest {
final String logFileName = name.getMethodName() + "-system-0.log";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+ properties.put(LOG_FILE, logFileName);
+ properties.put(LOG_LEVEL, "config");
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, "");
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File logFile = new File(logFileName);
if (logFile.exists()) {
@@ -469,14 +468,14 @@ public class DistributedSystemLogFileJUnitTest {
final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ properties.put(LOG_FILE, logFileName);
+ properties.put(LOG_LEVEL, "fine");
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, "");
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File logFile = new File(logFileName);
if (logFile.exists()) {
@@ -685,14 +684,14 @@ public class DistributedSystemLogFileJUnitTest {
final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "debug");
+ properties.put(LOG_FILE, logFileName);
+ properties.put(LOG_LEVEL, "debug");
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, "");
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File logFile = new File(logFileName);
if (logFile.exists()) {
@@ -902,15 +901,15 @@ public class DistributedSystemLogFileJUnitTest {
final String securityLogFileName = "security" + name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ properties.put(LOG_FILE, logFileName);
+ properties.put(LOG_LEVEL, "fine");
properties.put(DistributionConfig.SECURITY_LOG_FILE_NAME, securityLogFileName);
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, "");
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File securityLogFile = new File(securityLogFileName);
if (securityLogFile.exists()) {
@@ -1020,16 +1019,16 @@ public class DistributedSystemLogFileJUnitTest {
final String securityLogFileName = "security" + name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ properties.put(LOG_FILE, logFileName);
+ properties.put(LOG_LEVEL, "fine");
properties.put(DistributionConfig.SECURITY_LOG_FILE_NAME, securityLogFileName);
properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "fine");
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, "");
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File securityLogFile = new File(securityLogFileName);
if (securityLogFile.exists()) {
@@ -1199,15 +1198,15 @@ public class DistributedSystemLogFileJUnitTest {
final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ properties.put(LOG_FILE, logFileName);
+ properties.put(LOG_LEVEL, "fine");
properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "info");
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, "");
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File logFile = new File(logFileName);
if (logFile.exists()) {
@@ -1348,15 +1347,15 @@ public class DistributedSystemLogFileJUnitTest {
final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "info");
+ properties.put(LOG_FILE, logFileName);
+ properties.put(LOG_LEVEL, "info");
properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "fine");
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, "");
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File logFile = new File(logFileName);
if (logFile.exists()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
index f5baa9c..f6bf465 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal.logging;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -70,13 +72,13 @@ public class LocatorLogFileJUnitTest {
final String locators = "localhost[" + port + "]";
final Properties properties = new Properties();
- properties.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+ properties.put(LOG_LEVEL, "config");
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, locators);
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
final File logFile = new File(name.getMethodName() + "-locator-" + port + ".log");
if (logFile.exists()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
index d767e98..ee43682 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
@@ -29,6 +29,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Tests performance of logging when level is OFF.
*
@@ -45,8 +47,8 @@ public class LogWriterPerformanceTest extends LoggingPerformanceTestCase {
final Properties props = new Properties();
this.logFile = new File(this.configDirectory, DistributionConfig.GEMFIRE_PREFIX + "log");
final String logFilePath = IOUtils.tryGetCanonicalPathElseGetAbsolutePath(logFile);
- props.setProperty(DistributionConfig.LOG_FILE_NAME, logFilePath);
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
+ props.setProperty(LOG_FILE, logFilePath);
+ props.setProperty(LOG_LEVEL, "info");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index 2e86404..f9eed64 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.logging.log4j.custom;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.logging.log4j.Configurator;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -40,8 +39,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.*;
import static com.gemstone.gemfire.internal.logging.log4j.custom.CustomConfiguration.*;
import static org.assertj.core.api.Assertions.assertThat;
@@ -84,7 +82,7 @@ public class CustomConfigWithCacheIntegrationTest {
Properties gemfireProperties = new Properties();
gemfireProperties.put(LOCATORS, "");
gemfireProperties.put(MCAST_PORT, "0");
- gemfireProperties.put(DistributionConfig.LOG_LEVEL_NAME, "info");
+ gemfireProperties.put(LOG_LEVEL, "info");
this.cache = new CacheFactory(gemfireProperties).create();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 3b57d7c..861209d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static com.jayway.awaitility.Awaitility.with;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -116,7 +116,7 @@ public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
public Properties getDistributedSystemProperties() {
final Properties props = new Properties();
props.put(MCAST_PORT, "0");
- props.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+ props.put(STATISTIC_SAMPLING_ENABLED, "true");
if (isSmallerVM.get()) {
props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, getSmallerOffHeapMemorySize());
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 8aa78af..3482f20 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal.statistics;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
@@ -23,7 +25,6 @@ import com.gemstone.gemfire.cache.util.RegionMembershipListenerAdapter;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
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.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.*;
@@ -125,9 +126,9 @@ public class StatisticsDUnitTest extends CacheTestCase {
public void run2() throws CacheException {
new File(dir).mkdir();
final Properties props = new Properties();
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "1000");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, pubArchives[pubVM]);
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(STATISTIC_SAMPLE_RATE, "1000");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, pubArchives[pubVM]);
final InternalDistributedSystem system = getSystem(props);
// assert that sampler is working as expected
@@ -179,9 +180,9 @@ public class StatisticsDUnitTest extends CacheTestCase {
public Object call() throws Exception {
new File(dir).mkdir();
final Properties props = new Properties();
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "1000");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, subArchive);
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(STATISTIC_SAMPLE_RATE, "1000");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, subArchive);
final InternalDistributedSystem system = getSystem(props);
final PubSubStats statistics = new PubSubStats(system, "sub-1", 1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
index ee59e8a..eb2201f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.Statistics;
import com.gemstone.gemfire.StatisticsType;
import com.gemstone.gemfire.StatisticsTypeFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Test;
@@ -32,7 +31,7 @@ import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.assertEquals;
/**
@@ -52,7 +51,7 @@ public class AtomicStatsJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
// props.setProperty("statistic-sample-rate", "60000");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
DistributedSystem ds = DistributedSystem.connect(props);
String statName = "TestStats";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index fcb9862..d0ffdd0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -34,6 +34,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Client health stats check
*
@@ -242,14 +244,14 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
public static void createClientCache(Host host, Integer port, int clientNum, boolean subscriptionEnabled, boolean durable) throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, "durable-"+clientNum);
- props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000");
+ props.setProperty(DURABLE_CLIENT_ID, "durable-"+clientNum);
+ props.setProperty(DURABLE_CLIENT_TIMEOUT, "300000");
// props.setProperty("log-file", getTestMethodName()+"_client_" + clientNum + ".log");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, getTestMethodName() + "_client_" + clientNum
+ props.setProperty(LOG_LEVEL, "info");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, getTestMethodName() + "_client_" + clientNum
+ ".gfs");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
ClientCacheFactory ccf = new ClientCacheFactory(props);
if(subscriptionEnabled){
@@ -259,8 +261,8 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
}
if(durable){
- ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "DurableClientId_" + clientNum);
- ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 300);
+ ccf.set(DURABLE_CLIENT_ID, "DurableClientId_" + clientNum);
+ ccf.set(DURABLE_CLIENT_TIMEOUT, "" + 300);
}
ccf.addPoolServer(host.getHostName(), port);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
index 5dda3da..a4c0d84 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.query.data.Position;
@@ -90,9 +92,9 @@ public class DataBrowserJSONValidationJUnitTest {
final Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
+ props.setProperty(STATISTIC_SAMPLE_RATE, "60000");
props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index ca56c07..4335af3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
@@ -31,8 +31,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
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.*;
/**
@@ -211,7 +210,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
InetAddress bindAddr = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index d699727..ffa9e72 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedMember;
@@ -202,7 +204,7 @@ public class ManagementTestBase extends DistributedTestCase {
public Cache createCache(Properties props) {
System.setProperty("dunitLogPerTest", "true");
- props.setProperty(DistributionConfig.LOG_FILE_NAME, getTestMethodName() + "-.log");
+ props.setProperty(LOG_FILE, getTestMethodName() + "-.log");
ds = (new ManagementTestBase("temp")).getSystem(props);
cache = CacheFactory.create(ds);
managementService = ManagementService.getManagementService(cache);
@@ -224,9 +226,9 @@ public class ManagementTestBase extends DistributedTestCase {
props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
}
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.LOG_FILE_NAME, getTestMethodName() + "-.log");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(LOG_FILE, getTestMethodName() + "-.log");
ds = (new ManagementTestBase("temp")).getSystem(props);
cache = CacheFactory.create(ds);
managementService = ManagementService.getManagementService(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 7816cc3..583e48f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -42,8 +42,7 @@ import org.junit.experimental.categories.Category;
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.*;
/**
* Tests the UniversalMembershipListenerAdapter.
@@ -832,10 +831,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final Properties serverProperties = getSystem().getProperties();
//Below removed properties are already got copied as cluster SSL properties
- serverProperties.remove(DistributionConfig.SSL_ENABLED_NAME);
- serverProperties.remove(DistributionConfig.SSL_CIPHERS_NAME);
- serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
- serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
+ serverProperties.remove(SSL_ENABLED);
+ serverProperties.remove(SSL_CIPHERS);
+ serverProperties.remove(SSL_PROTOCOLS);
+ serverProperties.remove(SSL_REQUIRE_AUTHENTICATION);
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
@@ -1524,10 +1523,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final String serverMemberId = serverMember.toString();
final Properties serverProperties = getSystem().getProperties();
- serverProperties.remove(DistributionConfig.SSL_ENABLED_NAME);
- serverProperties.remove(DistributionConfig.SSL_CIPHERS_NAME);
- serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
- serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
+ serverProperties.remove(SSL_ENABLED);
+ serverProperties.remove(SSL_CIPHERS);
+ serverProperties.remove(SSL_PROTOCOLS);
+ serverProperties.remove(SSL_REQUIRE_AUTHENTICATION);
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
index c5b0e8f..8525c90 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
@@ -35,7 +35,7 @@ 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.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -59,9 +59,9 @@ public class DistributedSystemStatsJUnitTest {
final Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
+ props.setProperty(STATISTIC_SAMPLE_RATE, "60000");
props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
// set JMX_MANAGER_UPDATE_RATE to practically an infinite value, so that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
index 8481bcd..3bba787 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management.bean.stats;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -48,11 +50,11 @@ public abstract class MBeanStatsTestCase {
//System.setProperty("gemfire.stats.debug.debugSampleCollector", "true");
final Properties props = new Properties();
- //props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "finest");
+ //props.setProperty(LOG_LEVEL, "finest");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
+ props.setProperty(STATISTIC_SAMPLE_RATE, "60000");
this.system = (InternalDistributedSystem) DistributedSystem.connect(props);
assertNotNull(this.system.getStatSampler());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 43c67e4..8a2aab7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -139,7 +139,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
assertEquals(true, cmdResult.getStatus().equals(Status.OK));
assertEquals(true, resultStr.contains("G1"));
assertEquals(true, resultStr.contains(controllerName));
- assertEquals(true, resultStr.contains(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME));
+ assertEquals(true, resultStr.contains(ARCHIVE_FILE_SIZE_LIMIT));
assertEquals(true, !resultStr.contains("copy-on-read"));
cmdResult = executeCommand(command + " --" + CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS + "=false");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index 11d4c49..e0ce006 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -60,8 +60,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
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.LogWriterUtils.getLogWriter;
import static com.jayway.awaitility.Awaitility.waitAtMost;
@@ -773,8 +772,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
final Properties locatorProps = new Properties();
locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
- locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+ locatorProps.setProperty(LOG_LEVEL, "fine");
+ locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
@@ -836,7 +835,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
cache = getCache();
assertNotNull(cache);
@@ -878,7 +877,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
cache = getCache();
assertNotNull(cache);
@@ -907,8 +906,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
final Properties locatorProps = new Properties();
locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
- locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+ locatorProps.setProperty(LOG_LEVEL, "fine");
+ locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
@@ -988,7 +987,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
cache = getCache();
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 4ed7821..804314b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -41,8 +41,7 @@ import java.io.IOException;
import java.util.Properties;
import java.util.regex.Pattern;
-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.*;
/**
@@ -340,8 +339,8 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
final Properties locatorProps = new Properties();
locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
- locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+ locatorProps.setProperty(LOG_LEVEL, "fine");
+ locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null, locatorProps);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index fcfd16e..60d80c9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -441,10 +441,10 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
final File locatorLogFile = new File("locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+ locatorProps.setProperty(NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
- locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+ locatorProps.setProperty(LOG_LEVEL, "fine");
+ locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
@@ -524,7 +524,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
assertNotNull(cache);
@@ -576,7 +576,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index 0be65d2..8683ef3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -29,7 +29,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;
/**
@@ -74,14 +74,14 @@ public class HTTPServiceSSLSupportJUnitTest {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME, "password");
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME, "JKS");
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, "SSL");
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, "true");
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME, jks.getCanonicalPath());
- localProps.setProperty(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME, "password");
+ localProps.setProperty(CLUSTER_SSL_ENABLED, "true");
+ localProps.setProperty(CLUSTER_SSL_KEYSTORE, jks.getCanonicalPath());
+ localProps.setProperty(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
+ localProps.setProperty(CLUSTER_SSL_KEYSTORE_TYPE, "JKS");
+ localProps.setProperty(CLUSTER_SSL_PROTOCOLS, "SSL");
+ localProps.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
+ localProps.setProperty(CLUSTER_SSL_TRUSTSTORE, jks.getCanonicalPath());
+ localProps.setProperty(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
DistributionConfigImpl config = new DistributionConfigImpl(localProps);
@@ -101,12 +101,12 @@ public class HTTPServiceSSLSupportJUnitTest {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true");
+ localProps.setProperty(SSL_ENABLED, "true");
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStore", jks.getCanonicalPath());
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStorePassword", "password");
- localProps.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, "SSL");
- localProps.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
+ localProps.setProperty(SSL_PROTOCOLS, "SSL");
+ localProps.setProperty(SSL_REQUIRE_AUTHENTICATION, "true");
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStore", jks.getCanonicalPath());
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStorePassword", "password");
@@ -129,10 +129,10 @@ public class HTTPServiceSSLSupportJUnitTest {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true");
+ localProps.setProperty(SSL_ENABLED, "true");
- localProps.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, "SSL");
- localProps.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
+ localProps.setProperty(SSL_PROTOCOLS, "SSL");
+ localProps.setProperty(SSL_REQUIRE_AUTHENTICATION, "true");
Properties sslProps = new Properties();
sslProps.setProperty("javax.net.ssl.keyStore", jks.getCanonicalPath());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index 456da75..88ba958 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -40,8 +40,7 @@ import java.io.File;
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.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
@Category(DistributedTest.class)
@@ -600,10 +599,10 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
final File locatorLogFile = new File("locator-" + locatorPort + ".log");
final Properties locatorProps = new Properties();
- locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+ locatorProps.setProperty(NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
- locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+ locatorProps.setProperty(LOG_LEVEL, "fine");
+ locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
@@ -684,7 +683,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
assertNotNull(cache);
@@ -729,7 +728,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index e190dba..385d200 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.compression.SnappyCompressor;
@@ -62,9 +64,9 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
private Properties createProperties(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/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index fb50491..931cdbe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.query.IndexStatistics;
import com.gemstone.gemfire.cache.query.IndexType;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.lang.MutableIdentifiable;
import com.gemstone.gemfire.internal.lang.ObjectUtils;
import com.gemstone.gemfire.internal.lang.StringUtils;
@@ -45,6 +44,8 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the index-based GemFire shell
* (Gfsh) commands.
@@ -126,7 +127,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
private Properties createDistributedSystemProperties(final String gemfireName) {
final Properties distributedSystemProperties = new Properties();
- distributedSystemProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ distributedSystemProperties.setProperty(LOG_LEVEL, getDUnitLogLevel());
distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName);
return distributedSystemProperties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index fb21bf3..28ae887 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -41,8 +41,7 @@ import java.io.File;
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 com.gemstone.gemfire.test.dunit.Assert.assertEquals;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName;
@@ -78,9 +77,9 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
private Properties createProperties(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;
@@ -171,10 +170,10 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, getServerHostName(host) + "[" + locatorPort + "]");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ props.setProperty(LOG_LEVEL, "info");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
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/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index a4d5496..689d33a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -58,7 +60,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
invokeInEveryVM(new SerializableRunnable("reset log level") {
public void run() {
if (cachedLogLevel != null) {
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, cachedLogLevel);
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, cachedLogLevel);
cachedLogLevel = null;
}
}
@@ -124,7 +126,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
public void testShowLogDefault() throws IOException {
Properties props = new Properties();
try {
- props.setProperty(DistributionConfig.LOG_FILE_NAME, "testShowLogDefault.log");
+ props.setProperty(LOG_FILE, "testShowLogDefault.log");
setUpJmxManagerOnVm0ThenConnect(props);
final VM vm1 = Host.getHost(0).getVM(0);
final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
@@ -146,7 +148,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testShowLogNumLines() {
Properties props = new Properties();
- props.setProperty(DistributionConfig.LOG_FILE_NAME, "testShowLogNumLines.log");
+ props.setProperty(LOG_FILE, "testShowLogNumLines.log");
try {
setUpJmxManagerOnVm0ThenConnect(props);
final VM vm1 = Host.getHost(0).getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index d58a226..d1ee565 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.distributed.Locator;
@@ -261,8 +263,8 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
final Properties locatorProps = new Properties();
locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
locatorProps.setProperty(MCAST_PORT, "0");
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
- locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+ locatorProps.setProperty(LOG_LEVEL, "fine");
+ locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
locatorProps);
@@ -365,7 +367,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
- localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+ localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
cache = getCache();
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index 42ef6eb..e94aa5a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionContext;
@@ -164,10 +166,10 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
// props.setProperty(DistributionConfig.LOCATORS_NAME, getServerHostName(host) + "[" + locatorPort + "]");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ props.setProperty(LOG_LEVEL, "info");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
return props;
}
[37/55] [abbrv] incubator-geode git commit: GEODE-1450: Move
ExampleJSONAuthorization out of 'test' and into 'main'
Posted by hi...@apache.org.
GEODE-1450: Move ExampleJSONAuthorization out of 'test' and into 'main'
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1aa39174
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1aa39174
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1aa39174
Branch: refs/heads/feature/GEODE-1372
Commit: 1aa39174daa8ab2b2017013a62ff297fda7362e4
Parents: d24a5fb
Author: Jens Deppe <jd...@pivotal.io>
Authored: Thu Jun 2 10:46:59 2016 -0700
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Thu Jun 2 10:46:59 2016 -0700
----------------------------------------------------------------------
.../gemfire/security/templates/SampleJsonAuthorization.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1aa39174/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java b/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java
index 5723ea5..dca64e7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java
@@ -178,11 +178,10 @@ public class SampleJsonAuthorization implements AccessControl, Authenticator {
for (JsonNode op : r.get("operationsAllowed")) {
String[] parts = op.asText().split(":");
- if (regionNames == null) {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*", false));
- } else {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames, false));
- }
+ String resourcePart = (parts.length > 0) ? parts[0] : null;
+ String operationPart = (parts.length > 1) ? parts[1] : null;
+ String regionPart = (regionNames != null) ? regionNames : "*";
+ role.permissions.add(new ResourceOperationContext(resourcePart, operationPart, regionPart, false));
}
roleMap.put(role.name, role);
[41/55] [abbrv] incubator-geode git commit: GEODE-308: Separate hydra
from dunit and junit tests in gemfire-core
Posted by hi...@apache.org.
GEODE-308: Separate hydra from dunit and junit tests in gemfire-core
Removed hydra classes.
Merge branch 'feature/GEODE-308' of https://github.com/kjduling/incubator-geode into pull
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fb719d0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fb719d0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fb719d0a
Branch: refs/heads/feature/GEODE-1372
Commit: fb719d0a1a5d2a33045c210807b4b4b5c1d80afe
Parents: 61ad7e4
Author: Kevin J. Duling <kd...@pivotal.io>
Authored: Tue May 31 15:39:16 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Jun 3 14:10:06 2016 -0700
----------------------------------------------------------------------
.../PartitionedRegionTestUtilsDUnitTest.java | 10 +-
.../gemfire/test/dunit/standalone/ChildVM.java | 28 +-
geode-core/src/test/java/hydra/GsRandom.java | 311 -----------
.../test/java/hydra/HydraRuntimeException.java | 33 --
geode-core/src/test/java/hydra/Log.java | 219 --------
.../src/test/java/hydra/LogVersionHelper.java | 45 --
.../src/test/java/hydra/log/AnyLogWriter.java | 555 -------------------
.../java/hydra/log/CircularOutputStream.java | 131 -----
.../parReg/query/unittest/NewPortfolio.java | 37 +-
.../src/test/java/perffmwk/Formatter.java | 14 +-
.../PartitionedRegionCqQueryDUnitTest.java | 39 +-
11 files changed, 51 insertions(+), 1371 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index c0c7529..d1083ad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -17,15 +17,13 @@
package com.gemstone.gemfire.internal.cache;
-import hydra.GsRandom;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Random;
import java.util.Set;
import com.gemstone.gemfire.DataSerializable;
@@ -88,7 +86,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
vm0.invoke(new CacheSerializableRunnable("GetSomeKeys") {
public void run2() throws CacheException {
PartitionedRegion pr = (PartitionedRegion) getCache().getRegion(r);
- GsRandom rand = new GsRandom(123);
+ Random rand = new Random(123);
// Assert that its empty
for(int i=0; i<5; i++) {
LogWriterUtils.getLogWriter().info("Invocation " + i + " of getSomeKeys");
@@ -125,7 +123,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
val = (Integer) pr.get(key);
assertNotNull(val);
assertTrue(val.intValue() >= 0);
- assertTrue(val.intValue() < MAXKEYS);
+ assertTrue(val.intValue() < MAXKEYS);
}
} catch (ClassNotFoundException cnfe) {
Assert.fail("GetSomeKeys failed with ClassNotFoundException", cnfe);
@@ -530,7 +528,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
assertNotNull(p);
assertEquals(3, p.getTotalNumberOfBuckets());
// Create one bucket
- p.put(new Integer(0), "zero");
+ p.put(new Integer(0), "zero");
assertEquals(1, p.getRegionAdvisor().getCreatedBucketsCount());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ChildVM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ChildVM.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ChildVM.java
index 5301ffe..b1fe786 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ChildVM.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ChildVM.java
@@ -18,14 +18,12 @@ package com.gemstone.gemfire.test.dunit.standalone;
import java.rmi.Naming;
-import hydra.HydraRuntimeException;
-import hydra.Log;
-import org.apache.logging.log4j.Logger;
-
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.test.dunit.standalone.DUnitLauncher.MasterRemote;
+import org.apache.logging.log4j.Logger;
+
/**
*
*/
@@ -39,24 +37,19 @@ public class ChildVM {
public static void stopVM() {
stopMainLoop = true;
}
-
- static {
- createHydraLogWriter();
- }
-
+
private final static Logger logger = LogService.getLogger();
- private static RemoteDUnitVM dunitVM;
-
+
public static void main(String[] args) throws Throwable {
try {
- int namingPort = Integer.getInteger(DUnitLauncher.RMI_PORT_PARAM).intValue();
- int vmNum = Integer.getInteger(DUnitLauncher.VM_NUM_PARAM).intValue();
+ int namingPort = Integer.getInteger(DUnitLauncher.RMI_PORT_PARAM);
+ int vmNum = Integer.getInteger(DUnitLauncher.VM_NUM_PARAM);
int pid = OSProcess.getId();
logger.info("VM" + vmNum + " is launching" + (pid > 0? " with PID " + pid : ""));
MasterRemote holder = (MasterRemote) Naming.lookup("//localhost:" + namingPort + "/" + DUnitLauncher.MASTER_PARAM);
DUnitLauncher.init(holder);
DUnitLauncher.locatorPort = holder.getLocatorPort();
- dunitVM = new RemoteDUnitVM();
+ final RemoteDUnitVM dunitVM = new RemoteDUnitVM();
Naming.rebind("//localhost:" + namingPort + "/vm" + vmNum, dunitVM);
holder.signalVMReady();
//This loop is here so this VM will die even if the master is mean killed.
@@ -69,11 +62,4 @@ public class ChildVM {
System.exit(1);
}
}
-
- private static void createHydraLogWriter() {
- try {
- Log.createLogWriter("dunit-childvm", "fine");
- } catch (HydraRuntimeException ignore) {
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/hydra/GsRandom.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/hydra/GsRandom.java b/geode-core/src/test/java/hydra/GsRandom.java
deleted file mode 100644
index bed02da..0000000
--- a/geode-core/src/test/java/hydra/GsRandom.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hydra;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * This is a simple extension of java.util.Random that allows for the
- * generation of random numbers within ranges. It also allows for the
- * generation of random strings (within ranges as well).
- * @see java.lang.Math#random()
- * @see java.util.Random
- * @since JDK1.0
- */
-
-public class GsRandom extends java.util.Random implements Serializable {
-
- /**
- *
- * ourString is a privately held instance of a String with
- * with some junk characters
- *
- */
-
- static protected String ourString = "854ku45Q985a.lsdk;,.ifpq4z58Ao45u.sdflkjsdgkjqwJKL:EIUR[p4pnm,.zxc239*h1@0*Fn/~5.+3&gwNa(.3K-c/2bd(kb1.(=wvz!/56NIwk-4/(#mDhn%kd#9jas9_n!KC0-c>3*(fbn3Fl)Fhaw.2?nz~l;1q3=Fbak1>ah1Bci23fripB319v*bnFl2Ba-cH$lfb?A)_2bgFo2_+Vv$al+b124kasbFV[2G}b@9ASFbCk2.KIhb4K";
-
- /**
- * Creates a new random number generator. Its seed is initialized to
- * a value based on the current time.
- *
- * @see java.lang.System#currentTimeMillis()
- * @see java.util.Random#Random()
- */
-
- public GsRandom() {
- super();
- }
-
- /**
- * Creates a new random number generator using a single
- * <code>long</code> seed.
- *
- * @param seed the initial seed.
- * @see java.util.Random#Random(long)
- */
-
- public GsRandom(long seed) {
- super(seed);
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>boolean</code>
- * value from this random number generator's sequence
- *
- * @return the next pseudorandom, uniformly distributed <code>boolean</code>
- * value from this random number generator's sequence.
- */
-
- public boolean nextBoolean() {
-
- return (this.next(1) == 0);
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>char</code>
- * value from this random number generator's sequence
- * There is a hack here to prevent '}' so as to eliminate the possiblity
- * of generating a sequence which would falsely get marked as a suspect
- * string while we are matching the pattern <code>{[0-9]+}</code>.
- * @return the next pseudorandom, uniformly distributed <code>char</code>
- * value from this random number generator's sequence.
- */
-
- public char nextChar() {
-
- char c = (char) this.next(16);
- if( c == '}' ) c = nextChar(); //prevent right bracket, try again
- return c;
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>byte</code>
- * value from this random number generator's sequence
- *
- * @return the next pseudorandom, uniformly distributed <code>byte</code>
- * value from this random number generator's sequence.
- */
-
- public byte nextByte() {
-
- return (byte) this.next(8);
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>double</code>
- * value from this random number generator's sequence within a range
- * from 0 to max.
- *
- * @param max the maximum range (inclusive) for the pseudorandom.
- * @return the next pseudorandom, uniformly distributed <code>double</code>
- * value from this random number generator's sequence.
- */
- public double nextDouble(double max) {
-
- return nextDouble(0.0, max);
-
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>double</code>
- * value from this random number generator's sequence within a range
- * from min to max.
- *
- * @param min the minimum range (inclusive) for the pseudorandom.
- * @param max the maximum range (inclusive) for the pseudorandom.
- * @return the next pseudorandom, uniformly distributed <code>double</code>
- * value from this random number generator's sequence.
- */
-
- public double nextDouble(double min, double max) {
-
- return nextDouble() * (max - min) + min;
-
- // return nextDouble(max-min) + min;
- }
-
- public short nextShort() {
- return (short) this.nextChar();
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>long</code>
- * value from this random number generator's sequence within a range
- * from 0 to max.
- *
- * @param max the maximum range (inclusive) for the pseudorandom.
- * @return the next pseudorandom, uniformly distributed <code>long</code>
- * value from this random number generator's sequence.
- */
-
- public long nextLong(long max) {
-
- if (max == Long.MAX_VALUE) {
- max--;
- }
-
- return Math.abs(this.nextLong()) % (max+1);
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>long</code>
- * value from this random number generator's sequence within a range
- * from min to max.
- *
- * @param min the minimum range (inclusive) for the pseudorandom.
- * @param max the maximum range (inclusive) for the pseudorandom.
- * @return the next pseudorandom, uniformly distributed <code>long</code>
- * value from this random number generator's sequence.
- */
-
- public long nextLong(long min, long max) {
-
-
- return nextLong(max-min) + min;
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>int</code>
- * value from this random number generator's sequence within a range
- * from 0 to max (inclusive -- which is different from {@link
- * Random#nextInt}).
- *
- * @param max the maximum range (inclusive) for the pseudorandom.
- * @return the next pseudorandom, uniformly distributed <code>int</code>
- * value from this random number generator's sequence.
- */
-
- public int nextInt(int max) {
-
- if (max == Integer.MAX_VALUE) {
- max--;
- }
-
- int theNext = this.nextInt();
- // Math.abs behaves badly when given min int, so avoid
- if (theNext == Integer.MIN_VALUE) {
- theNext = Integer.MIN_VALUE + 1;
- }
- return Math.abs(theNext) % (max+1);
- }
-
- /**
- * Returns the next pseudorandom, uniformly distributed <code>int</code>
- * value from this random number generator's sequence within a range
- * from min to max.
- * If max < min, returns 0 .
- *
- * @param min the minimum range (inclusive) for the pseudorandom.
- * @param max the maximum range (inclusive) for the pseudorandom.
- * @return the next pseudorandom, uniformly distributed <code>int</code>
- * value from this random number generator's sequence.
- */
-
- public int nextInt(int min, int max) {
- if (max < min)
- return 0; // handle max == 0 and avoid divide-by-zero exceptions
-
- return nextInt(max-min) + min;
- }
-
- /**
- * Returns a large, pregenerated string.
- *
- * @return a large, pregenerated string.
- */
-
- private String string() {
- return ourString;
- }
-
- /**
- *
- * Returns a random Date.
- *
- * @return A random Date.
- */
-
- public Date nextDate() {
- return new Date(nextLong());
- }
-
- /**
- *
- * Returns a randomly-selected element of Vector vec.
- *
- */
- public Object randomElement(Vector vec) {
- Object result;
- synchronized (vec) { // fix 26810
- int index = nextInt(0, vec.size() - 1);
- result = vec.elementAt(index);
- }
- return result;
- }
-
- /**
- * Returns a random subset of a pregenerated string. Both the
- * length and offset of the string are pseudorandom values.
- *
- * @return a random subset of a pregenerated string.
- */
-
- public String randomString() {
-
- return this.randomString(this.string().length());
- }
-
- /**
- * Returns a bounded random subset of a pregenerated large
- * string. The length can be no longer than max. max must be no
- * longer than the length of the pregenerated string.
- *
- * @param max the maximum length of the random string to generate.
- * @return a bounded random string with a length between 0 and
- * max length inclusive.
- */
-
- public String randomString(int max) {
-
- int length = this.nextInt(0, max);
- byte[] bytes = new byte[length];
- this.nextBytes(bytes);
- return new String(bytes);
- }
-
- /**
- *
- * Like randomString(), but returns only readable characters.
- *
- */
- public String randomReadableString(int max) {
-
- int stringlen = this.string().length();
- if ( max > stringlen )
- throw new HydraRuntimeException
- (
- "GsRandom.randomReadableString is limited to " + stringlen +
- " characters, cannot create string of length " + max
- );
-
- int length = this.nextInt(0, max);
- int offset = this.nextInt(0, stringlen - length);
- return this.string().substring(offset, offset+length);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/hydra/HydraRuntimeException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/hydra/HydraRuntimeException.java b/geode-core/src/test/java/hydra/HydraRuntimeException.java
deleted file mode 100644
index 668c191..0000000
--- a/geode-core/src/test/java/hydra/HydraRuntimeException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hydra;
-
-import com.gemstone.gemfire.*;
-
-public class HydraRuntimeException extends GemFireException {
-
- public HydraRuntimeException(String s) {
- super(s);
- }
- public HydraRuntimeException(String s,Exception e) {
- super(s,e);
- }
- public HydraRuntimeException(String s,Throwable t) {
- super(s,t);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/hydra/Log.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/hydra/Log.java b/geode-core/src/test/java/hydra/Log.java
deleted file mode 100644
index 2c306be..0000000
--- a/geode-core/src/test/java/hydra/Log.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hydra;
-
-import com.gemstone.gemfire.LogWriter;
-
-import hydra.log.AnyLogWriter;
-
-import java.util.Hashtable;
-
-/**
-*
-* Manages a singleton instance of {@link com.gemstone.gemfire.LogWriter}
-* to do all the logging for a VM. The instance is created using
-* <code>createLogWriter</code> and accessed using <code>getLogWriter</code>.
-*
-*/
-public class Log {
-
- // the singleton instance
- private static AnyLogWriter logWriter;
-
- // the name of the singleton instance
- private static String logName;
-
- // cache for log writers
- private static Hashtable cache;
-
- /**
- * Creates a singleton log writer that logs to stdout.
- * @param name the name of the singleton log writer.
- * @param levelName only messages at this level or higher will be logged.
- * @return the singleton log writer.
- * @throws HydraRuntimeException if log writer has already been created.
- * @throws IllegalArgumentException if level is illegal.
- */
- public synchronized static LogWriter createLogWriter( String name, String levelName ) {
- if ( logWriter == null ) {
- logWriter = new AnyLogWriter( levelName );
- } else {
- throw new HydraRuntimeException( "Log writer has already been created" );
- }
- logName = name;
- return logWriter;
- }
- /**
- * Creates a singleton log writer that logs to a file.
- * @param name the name of the singleton log writer.
- * @param filePrefix the prefix for the name of the log file.
- * @param levelName only messages at this level or higher will be logged.
- * @param append whether to append to an existing log file.
- * @return the singleton log writer.
- * @throws HydraRuntimeException if log writer has already been created.
- * @throws IllegalArgumentException if level is illegal.
- */
- public synchronized static LogWriter createLogWriter( String name, String filePrefix, String levelName, boolean append ) {
- if ( logWriter == null ) {
- logWriter = new AnyLogWriter( filePrefix, levelName, append );
- } else {
- throw new HydraRuntimeException( "Log writer has already been created" );
- }
- logName = name;
- return logWriter;
- }
- /**
- * Creates a singleton log writer that logs to a file in a specified directory.
- * @param name the name of the singleton log writer.
- * @param filePrefix the prefix for the name of the log file.
- * @param levelName only messages at this level or higher will be logged.
- * @param dir the directory in which to create the log file.
- * @param append whether to append to an existing log file.
- * @return the singleton log writer.
- * @throws HydraRuntimeException if log writer has already been created.
- * @throws IllegalArgumentException if level is illegal.
- */
- public synchronized static LogWriter createLogWriter( String name, String filePrefix, String levelName, String dir, boolean append ) {
- if ( logWriter == null ) {
- logWriter = new AnyLogWriter( filePrefix, levelName, dir, append );
- } else {
- throw new HydraRuntimeException( "Log writer has already been created" );
- }
- logName = name;
- return logWriter;
- }
- /**
- * Creates a singleton log writer that logs to a file.
- * @param name the name of the singleton log writer.
- * @param filePrefix the prefix for files created by this log writer.
- *
- * @return the singleton log writer.
- * @throws HydraRuntimeException if file can't be created or if log writer has
- * already been created.
- * @throws IllegalArgumentException if level is illegal.
- */
- public synchronized static LogWriter createLogWriter( String name,
- String filePrefix,
- boolean fileLogging,
- String fileLogLevelName,
- int fileMaxKBPerVM ) {
- if ( logWriter == null ) {
- logWriter = new AnyLogWriter( filePrefix, fileLogging, fileLogLevelName,
- fileMaxKBPerVM );
- } else {
- throw new HydraRuntimeException( "Log writer has already been created" );
- }
- logName = name;
- return logWriter;
- }
- /**
- * Closes the singleton log writer. After this method executes, there is no
- * singleton log writer.
- * @throws HydraRuntimeException if the singleton log writer does not exist.
- */
- public static void closeLogWriter() {
- if ( logWriter == null ) {
- throw new HydraRuntimeException( "Log writer does not exist" );
- } else {
- logName = null;
- logWriter = null;
- }
- }
- /**
- * Caches the singleton log writer so another log writer can be created.
- * After this method executes, there is no singleton log writer.
- * @throws HydraRuntimeException if the singleton log writer does not exist or
- * has already been cached.
- */
- public static void cacheLogWriter() {
- if ( logWriter == null ) {
- throw new HydraRuntimeException( "Log writer has not been created" );
- } else {
- if ( cache == null )
- cache = new Hashtable();
- if ( cache.get( logName ) != null )
- throw new HydraRuntimeException( "Log writer " + logName + " has already been cached" );
- cache.put( logName, logWriter );
- logName = null;
- logWriter = null;
- }
- }
- /**
- * Uncaches the log writer with the specified name, blowing away the existing one
- * (unless it was previously cached). After this method executes, the named log
- * writer is the singleton log writer.
- * @param name the name of the log writer to uncache.
- * @return the uncached (now active) log writer.
- * @throws HydraRuntimeException if the named log writer does not exist or there
- * is already a singleton log writer.
- */
- public static LogWriter uncacheLogWriter( String name ) {
- if ( cache == null )
- throw new HydraRuntimeException( "Log writer " + name + " has not been cached" );
- if ( logWriter != null )
- throw new HydraRuntimeException( "Log writer " + name + " is still active" );
- AnyLogWriter lw = (AnyLogWriter) cache.get( name );
- if ( lw == null )
- throw new HydraRuntimeException( "Log writer " + name + " has not been cached" );
- logName = name;
- logWriter = lw;
- return logWriter;
- }
- /**
- * Fetches the singleton log writer.
- * @throws HydraRuntimeException if log writer has not been created.
- */
- public static LogWriter getLogWriter() {
- if ( logWriter == null )
- throw new HydraRuntimeException( "Attempt to getLogWriter() before createLogWriter()" );
- return logWriter;
- }
- /**
- *
- * Fetches the current log level of the singleton log writer.
- *
- */
- public static String getLogWriterLevel() {
- return LogVersionHelper.levelToString(logWriter.getLevel());
- }
- /**
- *
- * Resets the log level of the singleton log writer.
- *
- */
- public static void setLogWriterLevel( String levelName ) {
- logWriter.setLevel(LogVersionHelper.levelNameToCode(levelName));
- }
- /**
- * Small Log test program
- */
- public static void main(String[] args) {
- Thread.currentThread().setName( "chester" );
-
- Log.createLogWriter( "test", "finer" );
-
- Log.getLogWriter().fine( "fine" );
- Log.getLogWriter().finer( "finer" );
- Log.getLogWriter().finest( "finest" );
-
- Log.setLogWriterLevel( "all" );
- Log.getLogWriter().fine( "fine" );
- Log.getLogWriter().finer( "finer" );
- Log.getLogWriter().finest( "finest" );
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/hydra/LogVersionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/hydra/LogVersionHelper.java b/geode-core/src/test/java/hydra/LogVersionHelper.java
deleted file mode 100644
index 9278ab2..0000000
--- a/geode-core/src/test/java/hydra/LogVersionHelper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hydra;
-
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
-import com.gemstone.gemfire.internal.logging.LogWriterImpl;
-import com.gemstone.gemfire.LogWriter;
-
-/**
- * Provides version-dependent support for logging changes.
- */
-public class LogVersionHelper {
-
- protected static String levelToString(int level) {
- return LogWriterImpl.levelToString(level);
- }
-
- protected static int levelNameToCode(String level) {
- return LogWriterImpl.levelNameToCode(level);
- }
-
- protected static ThreadGroup getLoggingThreadGroup(String group, LogWriter logger) {
- return LoggingThreadGroup.createThreadGroup(group, (InternalLogWriter)logger);
- }
-
- protected static String getMergeLogFilesClassName() {
- return "com.gemstone.gemfire.internal.logging.MergeLogFiles";
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/hydra/log/AnyLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/hydra/log/AnyLogWriter.java b/geode-core/src/test/java/hydra/log/AnyLogWriter.java
deleted file mode 100644
index 369f35b..0000000
--- a/geode-core/src/test/java/hydra/log/AnyLogWriter.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hydra.log;
-
-import hydra.HydraRuntimeException;
-
-import com.gemstone.gemfire.*;
-import com.gemstone.gemfire.i18n.LogWriterI18n;
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-import com.gemstone.gemfire.internal.logging.LocalLogWriter;
-import com.gemstone.gemfire.internal.logging.LogWriterImpl;
-import com.gemstone.gemfire.i18n.StringId;
-
-import java.io.*;
-
-/**
- *
- * A {@link com.gemstone.gemfire.LogWriter} that writes to a file logger,
- * depending on whether it is turned on via LogPrms#file_logging.
- * <p>
- * The log level query methods answer true if a file logger is active and
- * answer true. See LogPrms#file_logLevel.
- */
-
-public class AnyLogWriter implements InternalLogWriter {
-
- private boolean FILE_LOGGING;
-// private String filePrefix;
- private InternalLogWriter file;
-
- /**
- * Create a log writer to stdout.
- * @param levelName the log level.
- */
- public AnyLogWriter( String levelName ) {
- this.FILE_LOGGING = true;
- int level = LogWriterImpl.levelNameToCode( levelName );
- this.file = new LocalLogWriter( level, System.out );
- }
-
- /**
- * Create a log writer to a file of unlimited size.
- * @param filePrefix the prefix for the filename of the log.
- * @param levelName the log level.
- */
- public AnyLogWriter( String filePrefix, String levelName, boolean append ) {
- this.FILE_LOGGING = true;
- FileOutputStream fos;
- String fn = filePrefix + ".log";
- try {
- fos = new FileOutputStream( fn, append );
- } catch( IOException e ) {
- throw new HydraRuntimeException( "Unable to open " + fn, e );
- }
- PrintStream ps = new PrintStream( fos, true ); // autoflush
- System.setOut( ps ); System.setErr( ps );
- int level = LogWriterImpl.levelNameToCode( levelName );
- this.file = new LocalLogWriter( level, ps );
- }
-
- /**
- * Create a log writer to a file of unlimited size in the specified directory.
- * @param filePrefix the prefix for the filename of the log.
- * @param levelName the log level.
- * @param dir the directory in which to create the file.
- */
- public AnyLogWriter( String filePrefix, String levelName, String dir, boolean append ) {
- this.FILE_LOGGING = true;
- FileOutputStream fos;
- String fn = dir + File.separator + filePrefix + ".log";
- try {
- fos = new FileOutputStream( fn, append );
- } catch( IOException e ) {
- throw new HydraRuntimeException( "Unable to open " + fn, e );
- }
- PrintStream ps = new PrintStream( fos, true ); // autoflush
- System.setOut( ps ); System.setErr( ps );
- int level = LogWriterImpl.levelNameToCode( levelName );
- this.file = new LocalLogWriter( level, ps );
- }
-
- /**
- * Create a log writer to a file. May be circular.
- * @param filePrefix the prefix for names of files created by this logwriter.
- * @param fileLogging turn on logging to the file.
- * @param fileLogLevelName name of the file log level.
- * @param fileMaxKBPerVM the maximum size of the file log per VM, in kilobytes .
- */
- public AnyLogWriter( String filePrefix, boolean fileLogging,
- String fileLogLevelName, int fileMaxKBPerVM ) {
-
-// this.filePrefix = filePrefix;
- if ( fileLogging ) {
- this.FILE_LOGGING = fileLogging;
- if ( fileMaxKBPerVM < 0 )
- throw new IllegalArgumentException( "Illegal (negative) file log length: " + fileMaxKBPerVM );
- int maxBytes = fileMaxKBPerVM * 1024;
- CircularOutputStream cos;
- String fn = filePrefix + ".log";
- try {
- cos = new CircularOutputStream( fn, maxBytes );
- } catch( IOException e ) {
- throw new HydraRuntimeException( "Unable to create " + fn, e );
- }
- // create a local log writer using the circular file
- int level = LogWriterImpl.levelNameToCode( fileLogLevelName );
- this.file = new LocalLogWriter( level, new PrintStream( cos ) );
- }
- }
-
- /**
- * Gets the writer's level. Returns the level obtained from active logger.
- */
- public int getLevel() {
- if ( FILE_LOGGING )
- return ((LocalLogWriter)file).getLogWriterLevel();
- else
- return LogWriterImpl.NONE_LEVEL;
- }
- /**
- * Sets the writer's level. Applies to any active logger.
- * @throws IllegalArgumentException if level is not in legal range
- */
- public void setLevel(int newLevel) {
- if ( FILE_LOGGING )
- ((LocalLogWriter)file).setLevel( newLevel );
- }
-
- public void setLogWriterLevel(int newLevel) {
- setLevel(newLevel);
- }
-
-////////////////////////////////////////////////////////////////////////////////
-//// LOGWRITER INTERFACE /////
-////////////////////////////////////////////////////////////////////////////////
-
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#severeEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean severeEnabled() {
- if ( FILE_LOGGING )
- return file.severeEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#severe(String,Throwable)}.
- */
- public void severe(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.severe(msg,ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#severe(String)}.
- */
- public void severe(String msg) {
- if ( FILE_LOGGING ) file.severe(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#severe(Throwable)}.
- */
- public void severe(Throwable ex) {
- if ( FILE_LOGGING ) file.severe(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#errorEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean errorEnabled() {
- if ( FILE_LOGGING )
- return file.errorEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#error(String,Throwable)}.
- */
- public void error(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.error(msg, ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#error(String)}.
- */
- public void error(String msg) {
- if ( FILE_LOGGING ) file.error(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#error(Throwable)}.
- */
- public void error(Throwable ex) {
- if ( FILE_LOGGING ) file.error(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#warningEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean warningEnabled() {
- if ( FILE_LOGGING )
- return file.warningEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#warning(String,Throwable)}.
- */
- public void warning(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.warning(msg,ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#warning(String)}.
- */
- public void warning(String msg) {
- if ( FILE_LOGGING ) file.warning(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#warning(Throwable)}.
- */
- public void warning(Throwable ex) {
- if ( FILE_LOGGING ) file.warning(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#infoEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean infoEnabled() {
- if ( FILE_LOGGING )
- return file.infoEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#info(String,Throwable)}.
- */
- public void info(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.info(msg,ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#info(String)}.
- */
- public void info(String msg) {
- if ( FILE_LOGGING ) file.info(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#info(Throwable)}.
- */
- public void info(Throwable ex) {
- if ( FILE_LOGGING ) file.info(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#configEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean configEnabled() {
- if ( FILE_LOGGING )
- return file.configEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#config(String,Throwable)}.
- */
- public void config(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.config(msg,ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#config(String)}.
- */
- public void config(String msg) {
- if ( FILE_LOGGING ) file.config(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#config(Throwable)}.
- */
- public void config(Throwable ex) {
- if ( FILE_LOGGING ) file.config(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#fineEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean fineEnabled() {
- if ( FILE_LOGGING )
- return file.fineEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#fine(String,Throwable)}.
- */
- public void fine(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.fine(msg,ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#fine(String)}.
- */
- public void fine(String msg) {
- if ( FILE_LOGGING ) file.fine(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#fine(Throwable)}.
- */
- public void fine(Throwable ex) {
- if ( FILE_LOGGING ) file.fine(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finerEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean finerEnabled() {
- if ( FILE_LOGGING )
- return file.finerEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finer(String,Throwable)}.
- */
- public void finer(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.finer(msg,ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finer(String)}.
- */
- public void finer(String msg) {
- if ( FILE_LOGGING ) file.finer(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finer(Throwable)}.
- */
- public void finer(Throwable ex) {
- if ( FILE_LOGGING ) file.finer(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finestEnabled}.
- * Answers true if the file logger answers true.
- */
- public boolean finestEnabled() {
- if ( FILE_LOGGING )
- return file.finestEnabled();
- else
- return false;
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finest(String,Throwable)}.
- */
- public void finest(String msg, Throwable ex) {
- if ( FILE_LOGGING ) file.finest(msg,ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finest(String)}.
- */
- public void finest(String msg) {
- if ( FILE_LOGGING ) file.finest(msg);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#finest(Throwable)}.
- */
- public void finest(Throwable ex) {
- if ( FILE_LOGGING ) file.finest(ex);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#entering(String,String)}.
- */
- public void entering(String sourceClass, String sourceMethod) {
- if ( FILE_LOGGING ) file.entering(sourceClass,sourceMethod);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#exiting(String,String)}.
- */
- public void exiting(String sourceClass, String sourceMethod) {
- if ( FILE_LOGGING ) file.exiting(sourceClass,sourceMethod);
- }
- /**
- * Implements {@link com.gemstone.gemfire.LogWriter#throwing(String,String,Throwable)}.
- */
- public void throwing(String sourceClass, String sourceMethod, Throwable thrown) {
- if ( FILE_LOGGING ) file.throwing(sourceClass,sourceMethod,thrown);
- }
- public java.util.logging.Handler getHandler() {
- return null;
- }
-
- public void config(StringId msgId, Object param, Throwable ex) {
- config(msgId.toLocalizedString(param), ex);
- }
-
- public void config(StringId msgId, Object param) {
- config(msgId.toLocalizedString(param));
- }
-
- public void config(StringId msgId, Object[] params, Throwable ex) {
- config(msgId.toLocalizedString(params), ex);
- }
-
- public void config(StringId msgId, Object[] params) {
- config(msgId.toLocalizedString(params));
- }
-
- public void config(StringId msgId, Throwable ex) {
- config(msgId.toLocalizedString(), ex);
- }
-
- public void config(StringId msgId) {
- config(msgId.toLocalizedString());
- }
-
- public void error(StringId msgId, Object param, Throwable ex) {
- error(msgId.toLocalizedString(param), ex);
- }
-
- public void error(StringId msgId, Object param) {
- error(msgId.toLocalizedString(param));
- }
-
- public void error(StringId msgId, Object[] params, Throwable ex) {
- error(msgId.toLocalizedString(params), ex);
- }
-
- public void error(StringId msgId, Object[] params) {
- error(msgId.toLocalizedString(params));
- }
-
- public void error(StringId msgId, Throwable ex) {
- error(msgId.toLocalizedString(), ex);
- }
-
- public void error(StringId msgId) {
- error(msgId.toLocalizedString());
- }
-
- public void info(StringId msgId, Object param, Throwable ex) {
- info(msgId.toLocalizedString(param), ex);
- }
-
- public void info(StringId msgId, Object param) {
- info(msgId.toLocalizedString(param));
- }
-
- public void info(StringId msgId, Object[] params, Throwable ex) {
- info(msgId.toLocalizedString(params), ex);
- }
-
- public void info(StringId msgId, Object[] params) {
- info(msgId.toLocalizedString(params));
- }
-
- public void info(StringId msgId, Throwable ex) {
- info(msgId.toLocalizedString(), ex);
- }
-
- public void info(StringId msgId) {
- info(msgId.toLocalizedString());
- }
-
- public void severe(StringId msgId, Object param, Throwable ex) {
- severe(msgId.toLocalizedString(param), ex);
- }
-
- public void severe(StringId msgId, Object param) {
- severe(msgId.toLocalizedString(param));
- }
-
- public void severe(StringId msgId, Object[] params, Throwable ex) {
- severe(msgId.toLocalizedString(params), ex);
- }
-
- public void severe(StringId msgId, Object[] params) {
- severe(msgId.toLocalizedString(params));
- }
-
- public void severe(StringId msgId, Throwable ex) {
- severe(msgId.toLocalizedString(), ex);
- }
-
- public void severe(StringId msgId) {
- severe(msgId.toLocalizedString());
- }
-
- public void warning(StringId msgId, Object param, Throwable ex) {
- warning(msgId.toLocalizedString(param), ex);
- }
-
- public void warning(StringId msgId, Object param) {
- warning(msgId.toLocalizedString(param));
- }
-
- public void warning(StringId msgId, Object[] params, Throwable ex) {
- warning(msgId.toLocalizedString(params), ex);
- }
-
- public void warning(StringId msgId, Object[] params) {
- warning(msgId.toLocalizedString(params));
- }
-
- public void warning(StringId msgId, Throwable ex) {
- warning(msgId.toLocalizedString(), ex);
- }
-
- public void warning(StringId msgId) {
- warning(msgId.toLocalizedString());
- }
- /* (non-Javadoc)
- * @see com.gemstone.gemfire.LogWriterI18n#convertToLogWriter()
- */
- public LogWriter convertToLogWriter() {
- return this;
- }
-
- /* (non-Javadoc)
- * @see com.gemstone.gemfire.LogWriter#convertToLogWriterI18n()
- */
- public LogWriterI18n convertToLogWriterI18n() {
- return this;
- }
-
- @Override
- public int getLogWriterLevel() {
- return file.getLogWriterLevel();
- }
-
- @Override
- public boolean isSecure() {
- return false;
- }
-
- @Override
- public String getConnectionName() {
- return null;
- }
-
- @Override
- public void put(int msgLevel, String msg, Throwable exception) {
- file.put(msgLevel, msg, exception);
- }
-
- @Override
- public void put(int msgLevel, StringId msgId, Object[] params,Throwable exception) {
- file.put(msgLevel, msgId, params, exception);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/hydra/log/CircularOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/hydra/log/CircularOutputStream.java b/geode-core/src/test/java/hydra/log/CircularOutputStream.java
deleted file mode 100644
index 266f57d..0000000
--- a/geode-core/src/test/java/hydra/log/CircularOutputStream.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hydra.log;
-
-import java.io.*;
-
-/**
- * Implements a circular output stream with an upper limit on the number of bytes
- * it contains.
- */
-public class CircularOutputStream extends OutputStream {
-
- private static byte marker = '%';
-
- String name;
- int maxBytes;
- boolean rolling = false;
- RandomAccessFile raf;
-
- /**
- * Constructs a new circular output stream.
- * @param name the name of the output stream.
- * @param maxBytes the maximum number of bytes in the output stream.
- * @throws IOException if the stream cannot be created or written.
- */
- public CircularOutputStream( String name, int maxBytes )
- throws IOException {
- this.name = name;
- this.maxBytes = maxBytes;
- this.rolling = ( maxBytes > 0 );
- try {
- this.raf = new RandomAccessFile( name, "rw" );
- } catch( FileNotFoundException e ) {
- e.printStackTrace();
- throw new IOException( "Unable to create stream named " + name );
- }
- if ( this.rolling ) {
- // write the initial marker
- this.raf.write( marker );
- }
- }
- /**
- * Implements {@link java.io.OutputStream#close}.
- */
- /*
- public void close() {
- this.raf.close();
- }
- */
- /**
- * Implements {@link java.io.OutputStream#flush}.
- */
- /*
- public void flush() {
- }
- */
- /**
- * Implements {@link java.io.OutputStream#write(byte[])}.
- */
- @Override
- public void write( byte[] b ) throws IOException {
- write( b, 0, b.length );
- }
- /**
- * Implements {@link java.io.OutputStream#write(byte[],int,int)}.
- */
- @Override
- public void write( byte[] b, int off, int len ) throws IOException {
- if ( this.rolling ) {
- // back over marker character
- long fptr = this.raf.getFilePointer() - 1;
- this.raf.seek( fptr );
- // write bytes
- int space = (int)( this.maxBytes - fptr );
- if ( len <= space ) {
- this.raf.write( b, off, len );
- } else {
- this.raf.write( b, off, space );
- this.raf.seek(0);
- this.raf.write( b, off + space, len - space );
- }
- // wrap around if landed at the end
- if ( this.raf.getFilePointer() == this.maxBytes )
- this.raf.seek(0);
- // write marker character
- this.raf.write( marker );
- } else {
- this.raf.write( b, off, len );
- }
- }
- /**
- * Implements {@link java.io.OutputStream#write(int)}.
- */
- @Override
- public void write( int b ) throws IOException {
- // back over marker character
- long fptr = this.raf.getFilePointer() - 1;
- this.raf.seek( fptr );
- // write byte
- this.raf.writeByte( b );
- // wrap around if landed at the end
- if ( this.raf.getFilePointer() == this.maxBytes )
- this.raf.seek(0);
- // write marker character
- this.raf.write( marker );
- }
-
- public static void main( String[] args ) throws IOException {
- CircularOutputStream t = new CircularOutputStream( "frip", 10 );
- PrintStream ps = new PrintStream( t, true ); // autoflush
- System.setOut( ps ); System.setErr( ps );
-
- System.out.println( "WHERE WILL THIS GO?" );
- String s = "AND WHAT ABOUT THIS?\n";
- t.write( s.getBytes() );
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
index 9bdb861..65620f9 100755
--- a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
+++ b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
@@ -16,7 +16,6 @@
*/
package parReg.query.unittest;
-import hydra.Log;
import java.io.Serializable;
import java.util.*;
@@ -96,7 +95,7 @@ public class NewPortfolio implements Serializable {
}
public void init( int i ) {
- this.name = new Integer(i).toString();
+ this.name = Integer.toString(i);
this.id = i;
this.status = i % 2 == 0 ? "active" : "inactive";
this.type = "type" + (i % NUM_OF_TYPES);
@@ -119,7 +118,7 @@ public class NewPortfolio implements Serializable {
secId += i * 7;
if (secId > NUM_OF_SECURITIES)
secId -= NUM_OF_SECURITIES;
- props.setProperty("secId", new Integer(secId).toString());
+ props.setProperty("secId", Integer.toString(secId));
Position pos = new Position();
pos.init(props);
@@ -145,8 +144,8 @@ public class NewPortfolio implements Serializable {
*/
protected Properties getProps() {
Properties props = new Properties();
- Double qty = new Double(rng.nextInt(MAX_QTY) * 100.00);
- Double mktValue = new Double(rng.nextDouble() * MAX_PRICE);
+ Double qty = rng.nextInt(MAX_QTY) * 100.00;
+ Double mktValue = rng.nextDouble() * MAX_PRICE;
props.setProperty("qty", qty.toString());
props.setProperty("mktValue", mktValue.toString());
@@ -162,36 +161,27 @@ public class NewPortfolio implements Serializable {
if (anObj == null) {
return false;
}
-// Log.getLogWriter().info("comparing\n"+this+"\n and "+anObj);
if (anObj.getClass().getName().equals(this.getClass().getName())) { // cannot do class identity check for pdx tets
-// Log.getLogWriter().info("checkpoint 1,.this class is checked " + this.getClass().getName() );
NewPortfolio np = (NewPortfolio)anObj;
if (!np.name.equals(this.name) || (np.id != this.id) || !np.type.equals(this.type) || !np.status.equals(this.status)) {
-// Log.getLogWriter().info("checkpoint 1,obj " +np.name + " " + np.id + " " + np.type );
return false;
}
-// Log.getLogWriter().info("checkpoint 2, NP name, id checked" );
-
+
if (np.positions == null) {
if (this.positions != null) {
return false;
}
} else {
-// Log.getLogWriter().info("checkpoint 3, checking position size" );
if (np.positions.size() != this.positions.size()) {
- Log.getLogWriter().info("checkpoint 3, position size failed" );
return false;
}
else { //loops thru the map of positions
Iterator itr = np.positions.values().iterator();
Position pos;
while (itr.hasNext()) {
-// Log.getLogWriter().info("checkpoint 4, to check iteration" );
pos = (Position)itr.next();
-// Log.getLogWriter().info("checkpoint 4, to check pos" );
if (!this.positions.containsValue(pos)){
-// Log.getLogWriter().info("checkpoint 5, check pos failed" );
return false;
}
}
@@ -199,7 +189,6 @@ public class NewPortfolio implements Serializable {
}
} else {
//not same class
-// Log.getLogWriter().info("checkpoint 6, not the same class");
return false;
}
return true;
@@ -231,25 +220,9 @@ public class NewPortfolio implements Serializable {
fieldMap.put("type", type);
fieldMap.put("positions", positions);
fieldMap.put("undefinedTestField", undefinedTestField);
-// Log.getLogWriter().info("created map in tests/parReg.query.NewPortfolio: " + fieldMap);
return fieldMap;
}
- /** Restore the fields of this instance using the values of the Map, created
- * by createPdxHelperMap()
- */
- public void restoreFromPdxHelperMap(Map aMap) {
-// Log.getLogWriter().info("restoring from map into " + this.getClass().getName() + ": " + aMap);
- this.myVersion = (String)aMap.get("myVersion");
- this.id = (Integer)aMap.get("id");
- this.name = (String)aMap.get("name");
- this.status = (String)aMap.get("status");
- this.type = (String)aMap.get("type");
- this.positions = (Map)aMap.get("positions");
- this.undefinedTestField = (String)aMap.get("undefinedTestField");
-// Log.getLogWriter().info("returning instance from map in tests/parReg.query.NewPortfolio: " + this);
- }
-
@Override
public String toString() {
StringBuffer sb = new StringBuffer();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/geode-core/src/test/java/perffmwk/Formatter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/perffmwk/Formatter.java b/geode-core/src/test/java/perffmwk/Formatter.java
index 410c850..1f6a49c 100644
--- a/geode-core/src/test/java/perffmwk/Formatter.java
+++ b/geode-core/src/test/java/perffmwk/Formatter.java
@@ -17,11 +17,11 @@
package perffmwk;
-import hydra.HydraRuntimeException;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
+import java.io.PrintWriter;
+import java.text.DecimalFormat;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
/**
* Contains common code used to format reports.
@@ -111,7 +111,7 @@ public class Formatter {
*/
public static String padLeft( String s, int length ) {
if ( s.length() > length ) {
- throw new HydraRuntimeException( s + " cannot be padded to length " + length + ", it is too long" );
+ throw new RuntimeException( s + " cannot be padded to length " + length + ", it is too long" );
}
String t = "";
for ( int i = 0; i < length - s.length(); i++ ) {
@@ -124,7 +124,7 @@ public class Formatter {
*/
public static String padRight( String s, int length ) {
if ( s.length() > length ) {
- throw new HydraRuntimeException( s + " cannot be padded to length " + length + ", it is too long" );
+ throw new RuntimeException( s + " cannot be padded to length " + length + ", it is too long" );
}
String t = new String( s );
for ( int i = 0; i < length - s.length(); i++ ) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb719d0a/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 acede33..de93c75 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
@@ -16,24 +16,43 @@
*/
package com.gemstone.gemfire.cache.query.cq.dunit;
-import com.gemstone.gemfire.cache.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.io.IOException;
+import java.util.HashSet;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
-import com.gemstone.gemfire.cache.query.*;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
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.cache30.CacheTestCase;
import com.gemstone.gemfire.cache30.ClientServerTestCase;
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.DistributedSystemConfigProperties.*;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
/**
* Test class for Partitioned Region and CQs
@@ -1418,8 +1437,6 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
if (localRegion != null) {
// REGION NULL
- Log.getLogWriter().info("Local region is NOT null in client 1");
-
Wait.pause(5*1000);
CqQuery[] cqs = getCache().getQueryService().getCqs();
if (cqs != null && cqs.length > 0) {
[39/55] [abbrv] incubator-geode git commit: GEODE-1469: correctly
handle the step arguements in http request
Posted by hi...@apache.org.
GEODE-1469: correctly handle the step arguements in http request
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/711fc351
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/711fc351
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/711fc351
Branch: refs/heads/feature/GEODE-1372
Commit: 711fc3518eb802d9400e740a4011a189ca0fd372
Parents: a3a721a
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Tue May 31 10:33:16 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu Jun 2 15:38:23 2016 -0700
----------------------------------------------------------------------
.../cli/multistep/CLIMultiStepHelper.java | 22 +++++++----------
.../controllers/AbstractCommandsController.java | 6 ++---
.../controllers/ConfigCommandsController.java | 2 +-
.../support/LoginHandlerInterceptor.java | 25 +++++++++++++-------
.../internal/web/http/ClientHttpRequest.java | 9 +++++++
5 files changed, 38 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/711fc351/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/multistep/CLIMultiStepHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/multistep/CLIMultiStepHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/multistep/CLIMultiStepHelper.java
index 393f09b..0e05bc5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/multistep/CLIMultiStepHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/multistep/CLIMultiStepHelper.java
@@ -20,9 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.springframework.shell.event.ParseResult;
-import org.springframework.util.ReflectionUtils;
-
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.management.cli.Result;
@@ -42,6 +39,9 @@ import com.gemstone.gemfire.management.internal.cli.result.ResultData;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
+import org.springframework.shell.event.ParseResult;
+import org.springframework.util.ReflectionUtils;
+
/**
* Utility class to abstract CompositeResultData for Multi-step commands
* Also contain execution strategy for multi-step commands
@@ -115,8 +115,12 @@ public class CLIMultiStepHelper {
if (shell.isConnectedAndReady()) {
if (GfshParseResult.class.isInstance(parseResult)) {
GfshParseResult gfshParseResult = (GfshParseResult) parseResult;
-
- CommandRequest commandRequest = new CommandRequest(gfshParseResult, prepareJSONArgs(shell.getEnv(), nextStepArgs));
+ // this makes sure that "quit" step will correctly update the environment with empty stepArgs
+ if (nextStepArgs != null) {
+ GfJsonObject argsJSon = nextStepArgs.getSectionGfJsonObject();
+ shell.setEnvProperty(CLIMultiStepHelper.STEP_ARGS, argsJSon.toString());
+ }
+ CommandRequest commandRequest = new CommandRequest(gfshParseResult, shell.getEnv());
commandRequest.setCustomInput(changeStepName(gfshParseResult.getUserInput(), nextStep.getName()));
commandRequest.getCustomParameters().put(CliStrings.QUERY__STEPNAME, nextStep.getName());
@@ -159,14 +163,6 @@ public class CLIMultiStepHelper {
}
}
- public static Map<String, String> prepareJSONArgs(Map<String, String> env, SectionResultData nextStepArgs) {
- if (nextStepArgs != null) {
- GfJsonObject argsJSon = nextStepArgs.getSectionGfJsonObject();
- env.put(CLIMultiStepHelper.STEP_ARGS, argsJSon.toString());
- }
- return env;
- }
-
public static SectionResultData extractArgumentsForNextStep(Result result) {
CommandResult cResult = (CommandResult) result;
if (ResultData.TYPE_COMPOSITE.equals(cResult.getType())) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/711fc351/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
index f78c6f9..0d94c7f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
@@ -534,16 +534,16 @@ public abstract class AbstractCommandsController {
}
protected Callable<ResponseEntity<String>> getProcessCommandCallable(final String command){
- return getProcessCommandCallable(command, null);
+ return getProcessCommandCallable(command, getEnvironment(), null);
}
- protected Callable<ResponseEntity<String>> getProcessCommandCallable(final String command, final byte[][] fileData){
+ protected Callable<ResponseEntity<String>> getProcessCommandCallable(final String command, final Map<String, String> environment, final byte[][] fileData){
Callable callable = new Callable<ResponseEntity<String>>() {
@Override
public ResponseEntity<String> call() throws Exception {
String result = null;
try {
- result = processCommand(command, fileData);
+ result = processCommand(command, environment, fileData);
}
catch(NotAuthorizedException ex){
return new ResponseEntity<String>(ex.getMessage(), HttpStatus.FORBIDDEN);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/711fc351/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
index ebacd3d..ece461b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
@@ -193,7 +193,7 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
command.addOption(CliStrings.IMPORT_SHARED_CONFIG__ZIP, zipFileName);
- return getProcessCommandCallable(command.toString(), ConvertUtils.convert(zipFileResources));
+ return getProcessCommandCallable(command.toString(), getEnvironment(), ConvertUtils.convert(zipFileResources));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/711fc351/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
index 13face2..52cce90 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
@@ -16,22 +16,25 @@
*/
package com.gemstone.gemfire.management.internal.web.controllers.support;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
+import com.gemstone.gemfire.management.internal.cli.multistep.CLIMultiStepHelper;
import com.gemstone.gemfire.management.internal.security.ResourceConstants;
+import com.gemstone.gemfire.management.internal.web.util.UriUtils;
import com.gemstone.gemfire.security.Authenticator;
+
import org.apache.logging.log4j.Logger;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* The GetEnvironmentHandlerInterceptor class handles extracting Gfsh environment variables encoded in the HTTP request
* message as request parameters.
@@ -73,10 +76,14 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter {
for (Enumeration<String> requestParameters = request.getParameterNames(); requestParameters.hasMoreElements(); ) {
final String requestParameter = requestParameters.nextElement();
-
if (requestParameter.startsWith(ENVIRONMENT_VARIABLE_REQUEST_PARAMETER_PREFIX)) {
+ String requestValue = request.getParameter(requestParameter);
+ //GEODE-1469: since we enced stepArgs, we will need to decode it here. See #ClientHttpRequest
+ if(requestParameter.contains(CLIMultiStepHelper.STEP_ARGS)){
+ requestValue = UriUtils.decode(requestValue);
+ }
requestParameterValues.put(requestParameter.substring(ENVIRONMENT_VARIABLE_REQUEST_PARAMETER_PREFIX.length()),
- request.getParameter(requestParameter));
+ requestValue);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/711fc351/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
index 447733d..4548d04 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import com.gemstone.gemfire.internal.lang.Filter;
import com.gemstone.gemfire.internal.lang.ObjectUtils;
import com.gemstone.gemfire.internal.util.CollectionUtils;
+import com.gemstone.gemfire.management.internal.cli.multistep.CLIMultiStepHelper;
import com.gemstone.gemfire.management.internal.web.domain.Link;
import com.gemstone.gemfire.management.internal.web.util.UriUtils;
@@ -257,6 +258,14 @@ public class ClientHttpRequest implements HttpRequest {
final Map<String, List<Object>> queryParameters = CollectionUtils.removeKeys(
new LinkedMultiValueMap<String, Object>(getParameters()), new Filter<Map.Entry<String, List<Object>>>() {
@Override public boolean accept(final Map.Entry<String, List<Object>> entry) {
+ //GEODE-1469: since stepArgs has json string in there, we will need to encode it so that it won't interfere with the expand() call afterwards
+ if(entry.getKey().contains(CLIMultiStepHelper.STEP_ARGS)){
+ List<Object> stepArgsList = entry.getValue();
+ if(stepArgsList!=null){
+ String stepArgs = (String)stepArgsList.remove(0);
+ stepArgsList.add(UriUtils.encode(stepArgs));
+ }
+ }
return !pathVariables.contains(entry.getKey());
}
});
[31/55] [abbrv] incubator-geode git commit: GEODE-1377: Fixed missing
import
Posted by hi...@apache.org.
GEODE-1377: Fixed missing import
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b42d6e99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b42d6e99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b42d6e99
Branch: refs/heads/feature/GEODE-1372
Commit: b42d6e9912f3fe530c5e369df5ce7c22c823e4c3
Parents: 1e985eb
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Jun 2 10:04:55 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:04:55 2016 +1000
----------------------------------------------------------------------
.../internal/repository/IndexRepositoryImplPerformanceTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b42d6e99/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 da9735f..8ed3ba5 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
@@ -30,6 +30,7 @@ import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector;
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.filesystem.FileSystemStats;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
import com.gemstone.gemfire.cache.query.QueryException;
import com.gemstone.gemfire.test.junit.categories.PerformanceTest;
[22/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 5ac830b..4e2b690 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -52,7 +52,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index 7d2ab74..cb10074 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -40,7 +40,7 @@ import java.io.ObjectOutputStream;
import java.net.InetAddress;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
index 5bebf99..7ea48ce 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
@@ -38,8 +38,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index aff0e1e..fb3c5a7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -59,7 +59,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
index fdfb46e..c761c0d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
@@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index f312d3c..5430dea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.distributed.internal.tcpserver;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.Locator;
-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.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
@@ -38,7 +37,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This tests the rolling upgrade for locators with
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
index 32748b3..df05a3d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache30.CacheMapTxnDUnitTest;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
index fb62980..9a72a48 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,7 +30,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Same tests as that of {@link TXExpiryJUnitTest} after setting
@@ -46,7 +46,7 @@ public class DistTXExpiryJUnitTest extends TXExpiryJUnitTest {
protected void createCache() throws CacheException {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
- p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
+ p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
.connect(p));
AttributesFactory af = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
index 0f91d55..8d95bcc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Run the basic transaction functionality tests in TXJUnitTest after setting
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
index e7e5a1e..a78216a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.CacheTransactionManager;
import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.TXManagerImpl;
import com.gemstone.gemfire.internal.cache.TXManagerImplJUnitTest;
import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
@@ -28,8 +28,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static junit.framework.TestCase.assertTrue;
/**
@@ -48,7 +48,7 @@ public class DistTXManagerImplJUnitTest extends TXManagerImplJUnitTest {
Properties props = new Properties();
props.put(MCAST_PORT, "0");
props.put(LOCATORS, "");
- props.put(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
+ props.put(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
cache = new CacheFactory(props).create();
region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("testRegion");
CacheTransactionManager txmgr = cache.getCacheTransactionManager();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
index 2dfa96b..76f7736 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache30.TXOrderDUnitTest;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
index 539062a..be91e81 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.CacheTransactionManager;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.offheap.TxReleasesOffHeapOnCloseJUnitTest;
import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -26,8 +26,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
@@ -46,8 +46,8 @@ public class DistTXReleasesOffHeapOnCloseJUnitTest extends
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "1m");
- props.put(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
+ props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "1m");
+ props.put(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
cache = new CacheFactory(props).create();
CacheTransactionManager txmgr = cache.getCacheTransactionManager();
assert(txmgr.isDistributed());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
index 1350ecb..c0fbd8d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache30.TXRestrictionsDUnitTest;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
index 53e8344..8aa5c51 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.internal.cache.TransactionsWithDeltaDUnitTest;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
index 976d0e9..851078d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,7 +30,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Same tests as that of {@link TXWriterJUnitTest} after setting
@@ -45,7 +45,7 @@ public class DistTXWriterJUnitTest extends TXWriterJUnitTest {
protected void createCache() throws CacheException {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
- p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
+ p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
this.cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(p));
AttributesFactory<?, ?> af = new AttributesFactory<String, String>();
af.setScope(Scope.DISTRIBUTED_NO_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
index 755c462..bd6a2f2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,7 +30,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Same tests as that of {@link TXWriterOOMEJUnitTest} after setting
@@ -45,7 +45,7 @@ public class DistTXWriterOOMEJUnitTest extends TXWriterOOMEJUnitTest {
protected void createCache() throws CacheException {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
- p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
+ p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
.connect(p));
AttributesFactory<?, ?> af = new AttributesFactory<String, String>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
index 2ecd31a..38c033f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.internal.cache.execute.PRTransactionDUnitTest;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
index 8e98f04..f696795 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PRTXJUnitTest;
import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
@@ -30,7 +30,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Same tests as that of {@link PRTXJUnitTest} after setting
@@ -47,7 +47,7 @@ public class PRDistTXJUnitTest extends PRTXJUnitTest {
protected void createCache() throws Exception {
Properties p = new Properties();
p.setProperty(MCAST_PORT, "0"); // loner
- p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
+ p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
.connect(p));
createRegion();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
index 4306444..5affa6a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.internal.cache.execute.PRTransactionWithVersionsDUni
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class PRDistTXWithVersionsDUnitTest extends
PRTransactionWithVersionsDUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
index a2d88c2..4267292 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.disttx;
import com.gemstone.gemfire.internal.cache.partitioned.PersistentPartitionedRegionWithTransactionDUnitTest;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
index 287ab86..cf1cbe8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.internal;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -24,7 +23,7 @@ import org.junit.experimental.categories.Category;
import java.lang.reflect.Method;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
index 393d848..db34dad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
@@ -23,8 +23,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
@Category(IntegrationTest.class)
public class Bug51616JUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
index c53a3d1..e3e086b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal;
import com.gemstone.gemfire.Statistics;
import com.gemstone.gemfire.StatisticsType;
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.GemFireStatSampler.LocalStatListenerImpl;
import com.gemstone.gemfire.internal.cache.control.HeapMemoryMonitor;
@@ -43,7 +42,7 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeFalse;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
index 7522211..5663894 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
@@ -27,7 +27,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
index 9cf0844..9f66653 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
@@ -28,8 +28,8 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
import java.util.UUID;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
index fc1e40d..e7683dd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
@@ -42,7 +42,7 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
index ea3fd64..157fe7e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.regex.Pattern;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index 02bb437..7576756 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -21,8 +21,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
@@ -457,7 +456,7 @@ public class JarDeployerDUnitTest extends CacheTestCase {
// Add the alternate directory to the distributed system, get it back out, and then create
// a JarDeployer object with it.
Properties properties = new Properties();
- properties.put(SystemConfigurationProperties.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
+ properties.put(DistributedSystemConfigProperties.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
InternalDistributedSystem distributedSystem = getSystem(properties);
final JarDeployer jarDeployer = new JarDeployer(distributedSystem.getConfig().getDeployWorkingDir());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
index a2e7414..b507156 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.DiskStoreImpl;
import com.gemstone.gemfire.pdx.PdxInstance;
import com.gemstone.gemfire.pdx.PdxReader;
@@ -38,7 +37,7 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.CopyOnWriteArrayList;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class PdxDeleteFieldDUnitTest extends CacheTestCase{
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
index 7b12de8..19d5e6f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
@@ -31,8 +31,8 @@ import java.io.File;
import java.util.Collection;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
index 6e63465..f85f750 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.DiskStoreImpl;
import com.gemstone.gemfire.pdx.PdxInstance;
import com.gemstone.gemfire.pdx.PdxReader;
@@ -39,7 +38,7 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.CopyOnWriteArrayList;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class PdxRenameDUnitTest extends CacheTestCase{
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
index 5f6aac5..720b04c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
@@ -32,8 +32,8 @@ import java.util.Collection;
import java.util.Properties;
import java.util.regex.Pattern;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
index d2c9de9..d37d952 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
@@ -26,8 +26,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
index 6868acb..02fee67 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertTrue;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
index 8200961..cb9135e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
@@ -26,7 +26,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
index 704b7d5..89efa8f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
@@ -32,7 +32,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
index 005d569..d9eea38 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
@@ -26,7 +26,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
index d00c87b..1e6de9a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
@@ -30,7 +30,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
index dd84a72..1f85e5f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
index ba105c4..90fc87c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
@@ -35,8 +35,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests that if a node doing GII experiences DiskAccessException, it should
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
index fd76e65..bb2faf0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.DistributionMessage;
import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
@@ -36,7 +35,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index c701f7c..fc7b443 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -26,8 +26,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Test for bug 41957.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
index a1f8c07..eb4faf6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class Bug45934DUnitTest extends CacheTestCase {
public Bug45934DUnitTest(String name) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
index 85ebf7d..4e6f93c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -26,8 +26,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -124,7 +124,7 @@ public class Bug48182JUnitTest {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
+ props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).create();
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
index 078197b..4656b91 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
@@ -25,8 +25,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
index 7e8a23b..f8314bb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
index 67fd72c..ad1a8aa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
@@ -35,7 +35,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index bb8c119..bc1c8af 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Class <code>ClientServerGetAllDUnitTest</code> test client/server getAll.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index 2e5d0aa..d46172b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -33,7 +33,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This tests the fix for bug #43407 under a variety of configurations and
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
index 8115701..22efdea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.Region.Entry;
@@ -44,8 +44,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
index 4aabc5c..315caff 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
@@ -23,8 +23,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
index 197b028..919556d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -45,7 +45,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* tests for the concurrentMapOperations. there are more tests in ClientServerMiscDUnitTest
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
index 34ad0fe..d585d26 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
@@ -17,12 +17,11 @@
package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/** A test of 46438 - missing response to an update attributes message */
public class ConnectDisconnectDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 151a8e5..cf42b9b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* @since GemFire 6.1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
index 0475e37..390d1c2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
index 60a0548..5819060 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.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.internal.HeapDataOutputStream;
import com.gemstone.gemfire.internal.InternalDataSerializer;
import com.gemstone.gemfire.internal.Version;
@@ -33,7 +32,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
index 0ac0d11..ccf6c87 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.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.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -29,7 +28,7 @@ import java.io.File;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
index 6defbba..840cb67 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.gemstone.gemfire.util.test.TestUtil;
import org.junit.After;
@@ -31,7 +30,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
index fc15247..76eaab8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
@@ -33,7 +32,7 @@ import java.io.FileWriter;
import java.io.PrintWriter;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
index dee130f..b38de12 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
@@ -30,8 +30,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
index 005555a..fd64ceb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
@@ -16,13 +16,12 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DiskStoreFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -32,8 +31,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
index 490aa8b..d2291f1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
index e6ac042..edcc089 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
@@ -20,13 +20,12 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
@@ -41,8 +40,8 @@ import java.util.HashMap;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
index 84dcd1b..7a8a3d5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.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.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -30,7 +29,7 @@ import java.io.FilenameFilter;
import java.util.Arrays;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
index faad1d2..7d78d69 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
index 8ffcf07..cf279cc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -37,7 +37,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class FixedPRSinglehopDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
index 55ae144..4120fca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionAdvisee;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.AvailablePort.Keeper;
@@ -35,7 +34,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the GridAdvisor
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 59ea3e7..b441ef1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -37,8 +37,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests the size of clientUpdateMessageImpl with the size calculated by
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
index aed01c1..b4f1c98 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.io.*;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests for the incremental backup feature.
[34/55] [abbrv] incubator-geode git commit: GEODE-1463: Legacy
OperationContexts do not set the appropriate Shiro permission tuple
Posted by hi...@apache.org.
GEODE-1463: Legacy OperationContexts do not set the appropriate Shiro
permission tuple
- Moved ResourceOperationContext into a 'public' package.
- Converted OperationContext into an interface.
- Cleaned up the hierarchy of everything that previously
extended OperationContext.
- Marked GetOperationContext as abstract seeing that
GetOperationContextImpl extends it and there are no uses of
GetOperationContext anywhere. (So why does it still exist?).
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/670fae4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/670fae4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/670fae4b
Branch: refs/heads/feature/GEODE-1372
Commit: 670fae4b3950fa1ce302461312dd1251d8ea2d8a
Parents: 557fae1
Author: Jens Deppe <jd...@pivotal.io>
Authored: Tue May 31 07:44:25 2016 -0700
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Thu Jun 2 10:08:25 2016 -0700
----------------------------------------------------------------------
.../operations/CloseCQOperationContext.java | 24 +--
.../operations/DestroyOperationContext.java | 15 +-
.../operations/ExecuteCQOperationContext.java | 24 ++-
.../ExecuteFunctionOperationContext.java | 45 ++---
.../GetDurableCQsOperationContext.java | 28 +--
.../cache/operations/GetOperationContext.java | 35 +---
.../operations/InterestOperationContext.java | 26 +--
.../operations/InvalidateOperationContext.java | 17 +-
.../cache/operations/KeyOperationContext.java | 46 +----
.../operations/KeySetOperationContext.java | 35 +---
.../operations/KeyValueOperationContext.java | 14 +-
.../cache/operations/OperationContext.java | 33 ++--
.../operations/PutAllOperationContext.java | 34 +---
.../cache/operations/PutOperationContext.java | 28 +--
.../cache/operations/QueryOperationContext.java | 86 +++-----
.../operations/RegionClearOperationContext.java | 14 +-
.../RegionCreateOperationContext.java | 28 +--
.../RegionDestroyOperationContext.java | 13 +-
.../operations/RegionOperationContext.java | 30 +--
.../RegisterInterestOperationContext.java | 13 +-
.../operations/RemoveAllOperationContext.java | 34 +---
.../operations/StopCQOperationContext.java | 24 +--
.../UnregisterInterestOperationContext.java | 13 +-
.../internal/GetOperationContextImpl.java | 10 +-
.../internal/ResourceOperationContext.java | 128 ++++++++++++
.../ServerToClientFunctionResultSender.java | 2 +-
.../operations/ContainsKeyOperationContext.java | 13 +-
.../cache/tier/sockets/BaseCommandQuery.java | 5 +-
.../internal/security/GeodeSecurityUtil.java | 36 ++--
.../security/shiro/CustomAuthRealm.java | 12 +-
.../internal/security/MBeanServerWrapper.java | 3 +-
.../security/ResourceOperationContext.java | 85 --------
.../operations/OperationPartsJUnitTest.java | 195 +++++++++++++++++++
.../security/ExampleJSONAuthorization.java | 5 +-
.../internal/security/JSONAuthorization.java | 5 +-
.../ResourceOperationContextJUnitTest.java | 5 +-
.../internal/security/TestCommand.java | 19 +-
.../codeAnalysis/sanctionedSerializables.txt | 3 +-
38 files changed, 515 insertions(+), 670 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
index 1924605..b984981 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
@@ -37,28 +37,8 @@ public class CloseCQOperationContext extends ExecuteCQOperationContext {
* @param regionNames
* names of regions that are part of the query string
*/
- public CloseCQOperationContext(String cqName, String queryString,
- Set regionNames) {
- super(cqName, queryString, regionNames, false);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.CLOSE_CQ</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.CLOSE_CQ;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return false;
+ public CloseCQOperationContext(String cqName, String queryString, Set regionNames) {
+ super(OperationCode.CLOSE_CQ, cqName, queryString, regionNames, false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
index c00b1a7..b681c15 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
@@ -33,7 +33,7 @@ public class DestroyOperationContext extends KeyOperationContext {
* the key for this operation
*/
public DestroyOperationContext(Object key) {
- super(key);
+ this(key, false);
}
/**
@@ -45,18 +45,7 @@ public class DestroyOperationContext extends KeyOperationContext {
* true to set the post-operation flag
*/
public DestroyOperationContext(Object key, boolean postOperation) {
- super(key, postOperation);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.DESTROY</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.DESTROY;
+ super(OperationCode.DESTROY, key, postOperation);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
index a2b8ab2..068849c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
@@ -44,19 +44,25 @@ public class ExecuteCQOperationContext extends QueryOperationContext {
*/
public ExecuteCQOperationContext(String cqName, String queryString,
Set regionNames, boolean postOperation) {
- super(queryString, regionNames, postOperation);
- this.cqName = cqName;
+ this(OperationCode.EXECUTE_CQ, cqName, queryString, regionNames, postOperation);
}
/**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return the <code>OperationCode</code> of this operation
+ * Constructor for the EXECUTE_CQ operation only intended for use by subclasses.
+ *
+ * @param cqName
+ * the name of the continuous query being registered
+ * @param queryString
+ * the query string for this operation
+ * @param regionNames
+ * names of regions that are part of the query string
+ * @param postOperation
+ * true to set the post-operation flag
*/
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.EXECUTE_CQ;
+ protected ExecuteCQOperationContext(OperationCode code, String cqName, String queryString,
+ Set regionNames, boolean postOperation) {
+ super(code, queryString, regionNames, postOperation);
+ this.cqName = cqName;
}
/** Return the name of the continuous query. */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
index dafc5c0..bfbe4d1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
@@ -16,7 +16,8 @@
*/
package com.gemstone.gemfire.cache.operations;
-import java.io.Serializable;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
+
import java.util.Set;
/**
@@ -25,53 +26,44 @@ import java.util.Set;
* @since GemFire 6.0
*
*/
-public class ExecuteFunctionOperationContext extends OperationContext {
+public class ExecuteFunctionOperationContext extends ResourceOperationContext {
private String functionId;
- private String regionName;
-
- private boolean optizeForWrite;
+ private boolean optimizeForWrite;
- private boolean isPostOperation;
-
private Set keySet;
private Object arguments;
private Object result;
+ /**
+ * Constructor for the EXECUTE_FUNCTION operation.
+ *
+ * @param functionName the name of the function being executed
+ * @param regionName the name of the region on which the function is being executed
+ * @param keySet the set of keys against which the function is filtered
+ * @param arguments the array of function arguments
+ * @param optimizeForWrite boolean indicating whether this function is optimized for writing
+ * @param isPostOperation boolean indicating whether this context is for post-operation evaluation
+ */
public ExecuteFunctionOperationContext(String functionName,
String regionName, Set keySet, Object arguments,
boolean optimizeForWrite, boolean isPostOperation) {
+ super(Resource.DATA, OperationCode.EXECUTE_FUNCTION, regionName, isPostOperation);
this.functionId = functionName;
- this.regionName = regionName;
this.keySet = keySet;
this.arguments = arguments;
- this.optizeForWrite = optimizeForWrite;
- this.isPostOperation = isPostOperation;
- }
-
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.EXECUTE_FUNCTION;
- }
-
- @Override
- public boolean isPostOperation() {
- return this.isPostOperation;
+ this.optimizeForWrite = optimizeForWrite;
}
public String getFunctionId() {
return this.functionId;
}
- public String getRegionName() {
- return this.regionName;
- }
-
public boolean isOptimizeForWrite() {
- return this.optizeForWrite;
+ return this.optimizeForWrite;
}
public Object getResult() {
@@ -90,7 +82,4 @@ public class ExecuteFunctionOperationContext extends OperationContext {
this.result = oneResult;
}
- public void setIsPostOperation(boolean isPostOperation) {
- this.isPostOperation = isPostOperation;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
index abec6b6..9082e42 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
@@ -17,8 +17,7 @@
package com.gemstone.gemfire.cache.operations;
-import java.util.Set;
-
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
/**
* Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#GET_DURABLE_CQS} operation for the pre-operation
@@ -26,34 +25,13 @@ import java.util.Set;
*
* @since GemFire 7.0
*/
-public class GetDurableCQsOperationContext extends OperationContext {
+public class GetDurableCQsOperationContext extends ResourceOperationContext {
/**
* Constructor for the GET_DURABLE_CQS operation.
- *
-
*/
public GetDurableCQsOperationContext() {
- super();
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.GET_DURABLE_CQS</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.GET_DURABLE_CQS;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return false;
+ super(Resource.DATA, OperationCode.GET_DURABLE_CQS, false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
index f276d2c..ade353c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
@@ -25,37 +25,18 @@ package com.gemstone.gemfire.cache.operations;
*
* @since GemFire 5.5
*/
-public class GetOperationContext extends KeyValueOperationContext {
+public abstract class GetOperationContext extends KeyValueOperationContext {
/**
* Constructor for the operation.
- *
- * @param key
- * the key for this operation
- * @param postOperation
- * true if the context is for the post-operation case
- */
- public GetOperationContext(Object key, boolean postOperation) {
- super(key, null, false, postOperation);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.GET</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.GET;
- }
-
- /**
- * Set the post-operation flag to true.
+ *
+ * @param code the {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode} for this
+ * context
+ * @param key the key for this operation
+ * @param postOperation true if the context is for the post-operation case
*/
- @Override
- public void setPostOperation() {
- super.setPostOperation();
+ protected GetOperationContext(OperationCode code, Object key, boolean postOperation) {
+ super(code, key, null, false, postOperation);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
index 18aff9e..0643ec6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
@@ -18,12 +18,14 @@
package com.gemstone.gemfire.cache.operations;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
+
/**
* Encapsulates registration/unregistration of interest in a region.
*
* @since GemFire 5.5
*/
-public abstract class InterestOperationContext extends OperationContext {
+public abstract class InterestOperationContext extends ResourceOperationContext {
/** The key or list of keys being registered/unregistered. */
private Object key;
@@ -32,27 +34,19 @@ public abstract class InterestOperationContext extends OperationContext {
private InterestType interestType;
/**
- * Constructor for the register interest operation.
- *
- * @param key
- * the key or list of keys being registered/unregistered
- * @param interestType
- * the <code>InterestType</code> of the register request
+ * Constructor for the register interest operation. This constructor is only for subclasses.
+ *
+ * @param code the {@link OperationCode} for this context
+ * @param key the key or list of keys being registered/unregistered
+ * @param interestType the <code>InterestType</code> of the register request
*/
- public InterestOperationContext(Object key, InterestType interestType) {
+ protected InterestOperationContext(OperationCode code, Object key, InterestType interestType) {
+ super(Resource.DATA, code, false);
this.key = key;
this.interestType = interestType;
}
/**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return false;
- }
-
- /**
* Get the key for this register/unregister interest operation.
*
* @return the key to be registered/unregistered.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
index dd8ce38..6830276 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
@@ -27,13 +27,13 @@ package com.gemstone.gemfire.cache.operations;
public class InvalidateOperationContext extends KeyOperationContext {
/**
- * Constructor for the operation.
+ * Constructor for the INVALIDATE operation.
*
* @param key
* the key for this operation
*/
public InvalidateOperationContext(Object key) {
- super(key);
+ super(OperationCode.INVALIDATE, key);
}
/**
@@ -46,18 +46,7 @@ public class InvalidateOperationContext extends KeyOperationContext {
* sending updates
*/
public InvalidateOperationContext(Object key, boolean isPostOperation) {
- super(key, isPostOperation);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.INVALIDATE</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.INVALIDATE;
+ super(OperationCode.INVALIDATE, key, isPostOperation);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
index 985af0b..c0e7145 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
@@ -17,6 +17,7 @@
package com.gemstone.gemfire.cache.operations;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
/**
* Encapsulates a region operation that requires only a key object for the
@@ -26,7 +27,7 @@ package com.gemstone.gemfire.cache.operations;
*
* @since GemFire 5.5
*/
-public abstract class KeyOperationContext extends OperationContext {
+public abstract class KeyOperationContext extends ResourceOperationContext {
/** The key object of the operation */
private Object key;
@@ -34,19 +35,14 @@ public abstract class KeyOperationContext extends OperationContext {
/** Callback object for the operation (if any) */
private Object callbackArg;
- /** True if this is a post-operation context */
- private boolean postOperation;
-
/**
* Constructor for the operation.
*
* @param key
* the key for this operation
*/
- public KeyOperationContext(Object key) {
- this.key = key;
- this.callbackArg = null;
- this.postOperation = false;
+ public KeyOperationContext(OperationCode code, Object key) {
+ this(code, key, false);
}
/**
@@ -57,40 +53,10 @@ public abstract class KeyOperationContext extends OperationContext {
* @param postOperation
* true to set the post-operation flag
*/
- public KeyOperationContext(Object key, boolean postOperation) {
+ protected KeyOperationContext(OperationCode code, Object key, boolean postOperation) {
+ super(Resource.DATA, code, postOperation);
this.key = key;
this.callbackArg = null;
- this.postOperation = postOperation;
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return The <code>OperationCode</code> of this operation. This is one of
- * {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#DESTROY}
- * or {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#CONTAINS_KEY}
- * for <code>KeyOperationContext</code>, and one of
- * {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#GET} or
- * {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#PUT} for
- * <code>KeyValueOperationContext</code>.
- */
- @Override
- public abstract OperationCode getOperationCode();
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return this.postOperation;
- }
-
- /**
- * Set the post-operation flag to true.
- */
- protected void setPostOperation() {
- this.postOperation = true;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
index 0b8bccc..1664b2a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.operations;
import java.util.Set;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
/**
* Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#KEY_SET} operation for both the
@@ -28,14 +28,11 @@ import com.gemstone.gemfire.cache.operations.OperationContext;
*
* @since GemFire 5.5
*/
-public class KeySetOperationContext extends OperationContext {
+public class KeySetOperationContext extends ResourceOperationContext {
/** The set of keys for the operation */
private Set keySet;
- /** True if this is a post-operation context */
- private boolean postOperation;
-
/**
* Constructor for the operation.
*
@@ -43,33 +40,7 @@ public class KeySetOperationContext extends OperationContext {
* true to set the post-operation flag
*/
public KeySetOperationContext(boolean postOperation) {
- this.postOperation = postOperation;
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.KEY_SET</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.KEY_SET;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return this.postOperation;
- }
-
- /**
- * Set the post-operation flag to true.
- */
- public void setPostOperation() {
- this.postOperation = true;
+ super(Resource.DATA, OperationCode.KEY_SET, postOperation);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
index 415f842..1a92613 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
@@ -54,12 +54,9 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
* byte array
* @since GemFire 6.5
*/
- public KeyValueOperationContext(Object key, Object value,
- boolean isObject) {
- super(key);
+ protected KeyValueOperationContext(OperationCode code, Object key, Object value, boolean isObject) {
+ super(code, key);
setValue(value,isObject);
- //this.value = value;
- // this.isObject = isObject;
}
/**
@@ -76,12 +73,9 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
* true if the context is at the time of sending updates
* @since GemFire 6.5
*/
- public KeyValueOperationContext(Object key, Object value,
- boolean isObject, boolean postOperation) {
- super(key, postOperation);
+ protected KeyValueOperationContext(OperationCode code, Object key, Object value, boolean isObject, boolean postOperation) {
+ super(code, key, postOperation);
setValue(value,isObject);
- //this.value = value;
- //this.isObject = isObject;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
index 20b528c..ca0a549 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.cache.operations;
-import org.apache.shiro.authz.permission.WildcardPermission;
+import org.apache.shiro.authz.Permission;
/**
* Encapsulates a cache operation and the data associated with it for both the
@@ -30,16 +30,17 @@ import org.apache.shiro.authz.permission.WildcardPermission;
*
* @since GemFire 5.5
*/
-public abstract class OperationContext extends WildcardPermission{
- public static String ALL_REGIONS="*";
+public interface OperationContext extends Permission {
- public enum Resource {
+ String ALL_REGIONS = "*";
+
+ enum Resource {
NULL,
CLUSTER,
DATA
- };
+ }
- public enum OperationCode {
+ enum OperationCode {
@Deprecated
GET,
@Deprecated
@@ -298,13 +299,13 @@ public abstract class OperationContext extends WildcardPermission{
* Return the operation code associated with the <code>OperationContext</code>
* object.
*/
- public abstract OperationCode getOperationCode();
+ OperationCode getOperationCode();
- public Resource getResource(){
+ default Resource getResource() {
return Resource.NULL;
}
- public String getRegionName(){
+ default String getRegionName() {
return ALL_REGIONS;
}
@@ -318,7 +319,7 @@ public abstract class OperationContext extends WildcardPermission{
* context object in the pre-processing stage. In the post-processing stage
* the context object shall contain results of the query.
*/
- public abstract boolean isPostOperation();
+ boolean isPostOperation();
/**
* When called post-operation, returns true if the operation was one that performed an update.
@@ -329,7 +330,7 @@ public abstract class OperationContext extends WildcardPermission{
*
* @since GemFire 6.6
*/
- public boolean isClientUpdate() {
+ default boolean isClientUpdate() {
if (isPostOperation()) {
switch (getOperationCode()) {
case PUT:
@@ -350,7 +351,7 @@ public abstract class OperationContext extends WildcardPermission{
* True if the context is created before sending the updates to a client.
*/
@Deprecated
- public boolean isClientUpdate(OperationContext context) {
+ default boolean isClientUpdate(OperationContext context) {
OperationCode opCode = context.getOperationCode();
return context.isPostOperation()
&& (opCode.isPut() || opCode.isPutAll() || opCode.isDestroy()
@@ -359,12 +360,4 @@ public abstract class OperationContext extends WildcardPermission{
|| opCode.isRegionDestroy() || opCode.isRegionClear());
}
- @Override
- public String toString(){
- if(ALL_REGIONS.equals(getRegionName()))
- return getResource()+":"+getOperationCode();
- else
- return getResource()+":"+getOperationCode()+":"+getRegionName();
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
index d8acba9..71c3c22 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.operations;
import java.util.Map;
-import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
import com.gemstone.gemfire.cache.operations.internal.UpdateOnlyMap;
/**
@@ -28,14 +28,11 @@ import com.gemstone.gemfire.cache.operations.internal.UpdateOnlyMap;
*
* @since GemFire 5.7
*/
-public class PutAllOperationContext extends OperationContext {
+public class PutAllOperationContext extends ResourceOperationContext {
/** The set of keys for the operation */
private final UpdateOnlyMap map;
- /** True if this is a post-operation context */
- private boolean postOperation = false;
-
private Object callbackArg;
/**
@@ -43,36 +40,11 @@ public class PutAllOperationContext extends OperationContext {
*
*/
public PutAllOperationContext(Map map) {
+ super(Resource.DATA, OperationCode.PUTALL, false);
this.map = new UpdateOnlyMap(map);
}
/**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.PUTALL</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.PUTALL;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return this.postOperation;
- }
-
- /**
- * Set the post-operation flag to true.
- */
- protected void setPostOperation() {
- this.postOperation = true;
- }
-
- /**
* Returns the map whose keys and values will be put.
* Note that only the values of this map can be changed.
* You can not add or remove keys.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
index de24fd1..b24d838 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
@@ -63,10 +63,8 @@ public class PutOperationContext extends KeyValueOperationContext {
* byte array
* @since GemFire 6.5
*/
- public PutOperationContext(Object key,Object value,
- boolean isObject) {
- super(key, value, isObject);
- this.opType = UNKNOWN;
+ public PutOperationContext(Object key,Object value, boolean isObject) {
+ this(key, value, isObject, false);
}
/**
@@ -83,10 +81,8 @@ public class PutOperationContext extends KeyValueOperationContext {
* true if the context is at the time of sending updates
* @since GemFire 6.5
*/
- public PutOperationContext(Object key, Object value,
- boolean isObject, boolean postOperation) {
- super(key, value, isObject, postOperation);
- this.opType = UNKNOWN;
+ public PutOperationContext(Object key, Object value, boolean isObject, boolean postOperation) {
+ this(key, value, isObject, UNKNOWN, postOperation);
}
/**
@@ -106,24 +102,12 @@ public class PutOperationContext extends KeyValueOperationContext {
* true if the context is at the time of sending updates
* @since GemFire 6.5
*/
- public PutOperationContext(Object key, Object value,
- boolean isObject, byte opType, boolean isPostOperation) {
- super(key, value, isObject, isPostOperation);
+ public PutOperationContext(Object key, Object value, boolean isObject, byte opType, boolean isPostOperation) {
+ super(OperationCode.PUT, key, value, isObject, isPostOperation);
this.opType = opType;
}
/**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.PUT</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.PUT;
- }
-
- /**
* Return whether the operation is a create or update or unknown.
*
* The user should check against {@link PutOperationContext#CREATE},
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
index 9113f79..bc774bc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.operations;
import java.util.Set;
-import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
/**
* Encapsulates a cache query operation for both the pre-operation and
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.operations.OperationContext;
*
* @since GemFire 5.5
*/
-public class QueryOperationContext extends OperationContext {
+public class QueryOperationContext extends ResourceOperationContext {
/** The query string of this query operation. */
private String queryString;
@@ -38,73 +38,38 @@ public class QueryOperationContext extends OperationContext {
/** The result of query operation */
private Object queryResult;
- /** True if this is a post-operation context */
- private boolean postOperation;
-
/** The bind parameters for the query */
private Object[] queryParams;
/**
* Constructor for the query operation.
- *
- * @param queryString
- * the query string for this operation
- * @param regionNames
- * names of regions that are part of the query string
- * @param postOperation
- * true to set the post-operation flag
+ *
+ * @param queryString the query string for this operation
+ * @param regionNames names of regions that are part of the query string
+ * @param postOperation true to set the post-operation flag
*/
- public QueryOperationContext(String queryString, Set regionNames,
- boolean postOperation) {
+ public QueryOperationContext(String queryString, Set regionNames, boolean postOperation) {
+ this(OperationCode.QUERY, queryString, regionNames, postOperation);
+ }
+
+ QueryOperationContext(OperationCode code, String queryString, Set regionNames, boolean postOperation) {
+ super(Resource.DATA, code, postOperation);
this.queryString = queryString;
this.regionNames = regionNames;
- this.queryResult = null;
- this.postOperation = postOperation;
}
/**
* Constructor for the query operation.
- *
- * @param queryString
- * the query string for this operation
- * @param regionNames
- * names of regions that are part of the query string
- * @param postOperation
- * true to set the post-operation flag
- * @param queryParams
- * the bind parameters for the query
+ *
+ * @param queryString the query string for this operation
+ * @param regionNames names of regions that are part of the query string
+ * @param postOperation true to set the post-operation flag
+ * @param queryParams the bind parameters for the query
*/
- public QueryOperationContext(String queryString, Set regionNames,
- boolean postOperation, Object[] queryParams) {
- this(queryString, regionNames, postOperation);
+ public QueryOperationContext(String queryString, Set regionNames, boolean postOperation, Object[] queryParams) {
+ this(OperationCode.QUERY, queryString, regionNames, postOperation);
this.queryParams = queryParams;
}
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return the <code>OperationCode</code> of this operation
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.QUERY;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return this.postOperation;
- }
-
- /**
- * Set the post-operation flag to true.
- */
- public void setPostOperation() {
- this.postOperation = true;
- }
/** Return the query string of this query operation. */
public String getQuery() {
@@ -113,7 +78,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Modify the query string.
- *
+ *
* @param query
* the new query string for this query.
*/
@@ -124,7 +89,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Get the names of regions that are part of the query string.
- *
+ *
* @return names of regions being queried.
*/
public Set getRegionNames() {
@@ -133,7 +98,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Set the names of regions that are part of the query string.
- *
+ *
* @param regionNames names of regions being queried
*/
public void setRegionNames(Set regionNames) {
@@ -142,7 +107,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Get the result of the query execution.
- *
+ *
* @return result of the query.
*/
public Object getQueryResult() {
@@ -151,7 +116,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Set the result of query operation.
- *
+ *
* @param queryResult
* the new result of the query operation.
*/
@@ -161,11 +126,10 @@ public class QueryOperationContext extends OperationContext {
/**
* Get the bind parameters for the query
- *
+ *
* @return bind parameters for the query
*/
public Object[] getQueryParams() {
return queryParams;
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
index f3ac414..120584e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
@@ -33,18 +33,6 @@ public class RegionClearOperationContext extends RegionOperationContext {
* true to set the post-operation flag
*/
public RegionClearOperationContext(boolean postOperation) {
- super(postOperation);
+ super(OperationCode.REGION_CLEAR, postOperation);
}
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.REGION_CLEAR</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.REGION_CLEAR;
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
index 4b92ae9..6985d91 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
@@ -17,16 +17,15 @@
package com.gemstone.gemfire.cache.operations;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
+
/**
* Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_CREATE} operation for both the
* pre-operation and post-operation cases.
*
* @since GemFire 5.5
*/
-public class RegionCreateOperationContext extends OperationContext {
-
- /** True if this is a post-operation context */
- private boolean postOperation;
+public class RegionCreateOperationContext extends ResourceOperationContext {
/**
* Constructor for the region creation operation.
@@ -35,26 +34,7 @@ public class RegionCreateOperationContext extends OperationContext {
* true to set the post-operation flag
*/
public RegionCreateOperationContext(boolean postOperation) {
- this.postOperation = postOperation;
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.REGION_CREATE</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.REGION_CREATE;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return this.postOperation;
+ super(Resource.DATA, OperationCode.REGION_CREATE, postOperation);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
index b2d19c1..c4b7375 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
@@ -33,18 +33,7 @@ public class RegionDestroyOperationContext extends RegionOperationContext {
* true to set the post-operation flag
*/
public RegionDestroyOperationContext(boolean postOperation) {
- super(postOperation);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.REGION_DESTROY</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.REGION_DESTROY;
+ super(OperationCode.REGION_DESTROY, postOperation);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
index c631a78..4c41cdc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
@@ -18,6 +18,8 @@
package com.gemstone.gemfire.cache.operations;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
+
/**
* Encapsulates a region-level operation in both the pre-operation and
* post-operation cases. The operations this class encapsulates are
@@ -26,42 +28,20 @@ package com.gemstone.gemfire.cache.operations;
*
* @since GemFire 5.5
*/
-public abstract class RegionOperationContext extends OperationContext {
+public abstract class RegionOperationContext extends ResourceOperationContext {
/** Callback object for the operation (if any) */
private Object callbackArg;
- /** True if this is a post-operation context */
- private boolean postOperation;
-
/**
* Constructor for a region operation.
*
* @param postOperation
* true to set the post-operation flag
*/
- public RegionOperationContext(boolean postOperation) {
+ protected RegionOperationContext(OperationCode code, boolean postOperation) {
+ super(Resource.DATA, code, postOperation);
this.callbackArg = null;
- this.postOperation = postOperation;
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return The <code>OperationCode</code> of this operation. This is one of
- * {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_CLEAR} or
- * {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_DESTROY}.
- */
- @Override
- public abstract OperationCode getOperationCode();
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return this.postOperation;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
index f5cda63..78cc533 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
@@ -43,22 +43,11 @@ public class RegisterInterestOperationContext extends InterestOperationContext {
*/
public RegisterInterestOperationContext(Object key,
InterestType interestType, InterestResultPolicy policy) {
- super(key, interestType);
+ super(OperationCode.REGISTER_INTEREST, key, interestType);
this.policy = policy;
}
/**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.REGISTER_INTEREST</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.REGISTER_INTEREST;
- }
-
- /**
* Get the <code>InterestResultPolicy</code> of this register/unregister
* operation.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
index c33d85d..3c0a51c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.operations;
import java.util.Collection;
import java.util.Collections;
-import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
/**
* Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REMOVEALL} operation for both the
@@ -28,14 +28,11 @@ import com.gemstone.gemfire.cache.operations.OperationContext;
*
* @since GemFire 8.1
*/
-public class RemoveAllOperationContext extends OperationContext {
+public class RemoveAllOperationContext extends ResourceOperationContext {
/** The collection of keys for the operation */
private Collection<?> keys;
- /** True if this is a post-operation context */
- private boolean postOperation = false;
-
private Object callbackArg;
/**
@@ -43,36 +40,11 @@ public class RemoveAllOperationContext extends OperationContext {
*
*/
public RemoveAllOperationContext(Collection<?> keys) {
+ super(Resource.DATA, OperationCode.REMOVEALL);
this.keys = keys;
}
/**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.RemoveAll</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.REMOVEALL;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return this.postOperation;
- }
-
- /**
- * Set the post-operation flag to true.
- */
- protected void setPostOperation() {
- this.postOperation = true;
- }
-
- /**
* Returns the keys for this removeAll in an unmodifiable collection.
*/
public Collection<?> getKeys() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
index eae3ec5..5cc4f69 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
@@ -38,28 +38,8 @@ public class StopCQOperationContext extends ExecuteCQOperationContext {
* @param regionNames
* names of regions that are part of the query string
*/
- public StopCQOperationContext(String cqName, String queryString,
- Set regionNames) {
- super(cqName, queryString, regionNames, false);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.STOP_CQ</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.STOP_CQ;
- }
-
- /**
- * True if the context is for post-operation.
- */
- @Override
- public boolean isPostOperation() {
- return false;
+ public StopCQOperationContext(String cqName, String queryString, Set regionNames) {
+ super(OperationCode.STOP_CQ, cqName, queryString, regionNames, false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
index 868d455..076712c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
@@ -36,18 +36,7 @@ public class UnregisterInterestOperationContext extends InterestOperationContext
*/
public UnregisterInterestOperationContext(Object key,
InterestType interestType) {
- super(key, interestType);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.UNREGISTER_INTEREST</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.UNREGISTER_INTEREST;
+ super(OperationCode.UNREGISTER_INTEREST, key, interestType);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImpl.java
index f664061..6096c53 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImpl.java
@@ -32,9 +32,15 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
public class GetOperationContextImpl extends GetOperationContext implements Releasable {
private boolean released;
-
+
+ /**
+ * Constructor for a concrete {@link GetOperationContext}
+ *
+ * @param key the key object
+ * @param postOperation boolean indication whether this is a post-operation
+ */
public GetOperationContextImpl(Object key, boolean postOperation) {
- super(key, postOperation);
+ super(OperationCode.GET, key, postOperation);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/ResourceOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/ResourceOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/ResourceOperationContext.java
new file mode 100644
index 0000000..636af05
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/internal/ResourceOperationContext.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.cache.operations.internal;
+
+import com.gemstone.gemfire.cache.operations.OperationContext;
+import org.apache.shiro.authz.permission.WildcardPermission;
+
+/**
+ * This is the base class for all {@link OperationContext}s. For JMX and CLI operations this is the
+ * concrete class which is passed in to {@link com.gemstone.gemfire.security.AccessControl#authorizeOperation}.
+ */
+public class ResourceOperationContext extends WildcardPermission implements OperationContext {
+
+ private boolean isPostOperation = false;
+ private Object opResult = null;
+
+ // these default values are used when creating a lock around an operation
+ private final Resource resource;
+ private final OperationCode operation;
+ private final String regionName;
+
+ public ResourceOperationContext() {
+ this(Resource.NULL, OperationCode.NULL);
+ }
+
+ public ResourceOperationContext(Resource resource, OperationCode code, boolean isPost) {
+ this(resource.toString(), code.toString(), ALL_REGIONS.toString(), isPost);
+ }
+
+ public ResourceOperationContext(Resource resource, OperationCode code) {
+ this(resource.toString(), code.toString(), ALL_REGIONS.toString(), false);
+ }
+
+ // When only specified a resource and operation, it's assumed that you need access to all regions
+ // in order to perform the operations guarded by this ResourceOperationContext
+ public ResourceOperationContext(String resource, String operation) {
+ this(resource, operation, ALL_REGIONS, false);
+ }
+
+ public ResourceOperationContext(String resource, String operation, String region) {
+ this(resource, operation, region, false);
+ }
+
+ public ResourceOperationContext(String resource, String operation, String regionName, boolean isPost) {
+ this((resource != null) ? Resource.valueOf(resource) : Resource.NULL,
+ (operation != null) ? OperationCode.valueOf(operation) : OperationCode.NULL,
+ (regionName != null) ? regionName : ALL_REGIONS, isPost);
+ }
+
+ public ResourceOperationContext(Resource resource, OperationCode operation, String regionName, boolean isPost) {
+ this.resource = (resource != null) ? resource : Resource.NULL;
+ String resourcePart = (this.resource != Resource.NULL) ? resource.toString() : "*";
+
+ this.operation = (operation != null) ? operation : OperationCode.NULL;
+ String operationPart = (this.operation != OperationCode.NULL) ? operation.toString() : "*";
+
+ this.regionName = (regionName != null) ? regionName : ALL_REGIONS;
+ this.isPostOperation = isPost;
+
+ String shiroPermission = String.format("%s:%s:%s", resourcePart, operationPart, this.regionName);
+ setParts(shiroPermission, true);
+ }
+
+ @Override
+ public final boolean isClientUpdate() {
+ return false;
+ }
+
+ @Override
+ public final OperationCode getOperationCode() {
+ return operation;
+ }
+
+ @Override
+ public final Resource getResource() {
+ return resource;
+ }
+
+ @Override
+ public final String getRegionName() {
+ return this.regionName;
+ }
+
+ @Override
+ public final boolean isPostOperation() {
+ return isPostOperation;
+ }
+
+ public final void setPostOperationResult(Object result) {
+ this.isPostOperation = true;
+ this.opResult = result;
+ }
+
+ /**
+ * Set the post-operation flag to true.
+ */
+ public final void setPostOperation() {
+ this.isPostOperation = true;
+ }
+
+ public final Object getOperationResult() {
+ return this.opResult;
+ }
+
+ @Override
+ public String toString() {
+ if (ALL_REGIONS.equals(getRegionName())) {
+ return getResource() + ":" + getOperationCode();
+ } else {
+ return getResource() + ":" + getOperationCode() + ":" + getRegionName();
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender.java
index 14b81a1..e08e6e3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender.java
@@ -244,7 +244,7 @@ public class ServerToClientFunctionResultSender implements ResultSender {
// results from server
AuthorizeRequestPP authzRequestPP = this.sc.getPostAuthzRequest();
if (authzRequestPP != null) {
- this.authContext.setIsPostOperation(true);
+ this.authContext.setPostOperation();
this.authContext = authzRequestPP.executeFunctionAuthorize(oneResult,
this.authContext);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
index da2fcc7..0ced75a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
@@ -34,18 +34,7 @@ public class ContainsKeyOperationContext extends KeyOperationContext {
* the key for this operation
*/
public ContainsKeyOperationContext(Object key) {
- super(key);
- }
-
- /**
- * Return the operation associated with the <code>OperationContext</code>
- * object.
- *
- * @return <code>OperationCode.CONTAINS_KEY</code>.
- */
- @Override
- public OperationCode getOperationCode() {
- return OperationCode.CONTAINS_KEY;
+ super(OperationCode.CONTAINS_KEY, key);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
index 3a80e25..4635d55 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
@@ -31,7 +31,6 @@ import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.Struct;
import com.gemstone.gemfire.cache.query.internal.CqEntry;
import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
-import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
import com.gemstone.gemfire.cache.query.internal.cq.ServerCQ;
import com.gemstone.gemfire.cache.query.internal.types.CollectionTypeImpl;
import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl;
@@ -65,7 +64,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
*/
protected static boolean processQuery(Message msg, Query query,
String queryString, Set regionNames, long start, ServerCQ cqQuery,
- QueryOperationContext queryContext, ServerConnection servConn,
+ QueryOperationContext queryContext, ServerConnection servConn,
boolean sendResults)
throws IOException, InterruptedException {
return processQueryUsingParams(msg, query, queryString,
@@ -89,7 +88,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
*/
protected static boolean processQueryUsingParams(Message msg, Query query,
String queryString, Set regionNames, long start, ServerCQ cqQuery,
- QueryOperationContext queryContext, ServerConnection servConn,
+ QueryOperationContext queryContext, ServerConnection servConn,
boolean sendResults, Object[] params)
throws IOException, InterruptedException {
ChunkedMessage queryResponseMsg = servConn.getQueryResponseMessage();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
index 838bfc6..6f9079d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.security.shiro.CustomAuthRealm;
import com.gemstone.gemfire.internal.security.shiro.ShiroPrincipal;
import com.gemstone.gemfire.management.internal.security.ResourceOperation;
-import com.gemstone.gemfire.management.internal.security.ResourceOperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
import com.gemstone.gemfire.security.AuthenticationFailedException;
import com.gemstone.gemfire.security.GemFireSecurityException;
import com.gemstone.gemfire.security.NotAuthorizedException;
@@ -192,34 +192,29 @@ public class GeodeSecurityUtil {
private static void authorize(String resource, String operation, String regionName){
regionName = StringUtils.stripStart(regionName, "/");
- authorize(new ResourceOperationContext(resource, operation, regionName));
+ authorize(new ResourceOperationContext(resource, operation, regionName, false));
}
public static void authorize(OperationContext context) {
- if(context==null)
- return;
+ if (context == null) return;
- if(context.getResource()== Resource.NULL && context.getOperationCode()== OperationCode.NULL)
- return;
+ if (context.getResource() == Resource.NULL && context.getOperationCode() == OperationCode.NULL) return;
Subject currentUser = getSubject();
- if(currentUser==null)
- return;
+ if (currentUser == null) return;
try {
currentUser.checkPermission(context);
- }
- catch(ShiroException e){
+ } catch (ShiroException e) {
logger.info(currentUser.getPrincipal() + " not authorized for " + context);
throw new NotAuthorizedException(e.getMessage(), e);
}
}
- private static boolean isSecured(){
- try{
+ private static boolean isSecured() {
+ try {
SecurityUtils.getSecurityManager();
- }
- catch(UnavailableSecurityManagerException e){
+ } catch (UnavailableSecurityManagerException e) {
return false;
}
return true;
@@ -230,30 +225,27 @@ public class GeodeSecurityUtil {
* @param securityProps
*/
public static void initSecurity(Properties securityProps){
- if(securityProps==null)
- return;
+ if (securityProps == null) return;
String shiroConfig = securityProps.getProperty(DistributionConfig.SECURITY_SHIRO_INIT);
String customAuthenticator =securityProps.getProperty(SECURITY_CLIENT_AUTHENTICATOR);
if (!com.gemstone.gemfire.internal.lang.StringUtils.isBlank(shiroConfig)) {
- IniSecurityManagerFactory factory = new IniSecurityManagerFactory("classpath:"+shiroConfig);
+ IniSecurityManagerFactory factory = new IniSecurityManagerFactory("classpath:" + shiroConfig);
// we will need to make sure that shiro uses a case sensitive permission resolver
Section main = factory.getIni().addSection("main");
main.put("geodePermissionResolver", "com.gemstone.gemfire.internal.security.shiro.GeodePermissionResolver");
- if(!main.containsKey("iniRealm.permissionResolver")) {
+ if (!main.containsKey("iniRealm.permissionResolver")) {
main.put("iniRealm.permissionResolver", "$geodePermissionResolver");
}
SecurityManager securityManager = factory.getInstance();
SecurityUtils.setSecurityManager(securityManager);
- }
- else if (!com.gemstone.gemfire.internal.lang.StringUtils.isBlank(customAuthenticator)) {
+ } else if (!com.gemstone.gemfire.internal.lang.StringUtils.isBlank(customAuthenticator)) {
Realm realm = new CustomAuthRealm(securityProps);
SecurityManager securityManager = new DefaultSecurityManager(realm);
SecurityUtils.setSecurityManager(securityManager);
- }
- else{
+ } else {
SecurityUtils.setSecurityManager(null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
index fff008f..7e7a928 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
@@ -89,11 +89,12 @@ public class CustomAuthRealm extends AuthorizingRealm{
@Override
public boolean isPermitted(PrincipalCollection principals, Permission permission) {
- OperationContext context =(OperationContext)permission;
- Principal principal = (Principal)principals.getPrimaryPrincipal();
+ OperationContext context = (OperationContext) permission;
+ Principal principal = (Principal) principals.getPrimaryPrincipal();
+
// if no access control is specified, then we allow all
- if(StringUtils.isBlank(authzFactoryName))
- return true;
+ if (StringUtils.isBlank(authzFactoryName)) return true;
+
AccessControl accessControl = getAccessControl(principal, false);
return accessControl.authorizeOperation(context.getRegionName(), context);
}
@@ -139,8 +140,7 @@ public class CustomAuthRealm extends AuthorizingRealm{
Method instanceGetter = ClassLoadUtil.methodFromName(this.authenticatorFactoryName);
auth = (Authenticator) instanceGetter.invoke(null, (Object[]) null);
} catch (Exception ex) {
- throw new AuthenticationException(
- ex.toString(), ex);
+ throw new AuthenticationException(ex.toString(), ex);
}
if (auth == null) {
throw new AuthenticationException(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
index efbc1f1..8541295 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
@@ -44,6 +44,7 @@ import javax.management.ReflectionException;
import javax.management.loading.ClassLoaderRepository;
import javax.management.remote.MBeanServerForwarder;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
import com.gemstone.gemfire.management.internal.ManagementConstants;
import com.gemstone.gemfire.security.GemFireSecurityException;
import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
@@ -256,7 +257,7 @@ public class MBeanServerWrapper implements MBeanServerForwarder {
String resource = (String)descriptor.getFieldValue("resource");
String operationCode = (String)descriptor.getFieldValue("operation");
if(resource!=null && operationCode!=null){
- return new ResourceOperationContext(resource, operationCode, null);
+ return new ResourceOperationContext(resource, operationCode, null, false);
}
return defaultValue;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
deleted file mode 100644
index 99da1f1..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.management.internal.security;
-
-import com.gemstone.gemfire.cache.operations.OperationContext;
-
-/**
- * This is base class for OperationContext for resource (JMX and CLI) operations
- */
-public class ResourceOperationContext extends OperationContext {
-
- private boolean isPostOperation = false;
- private Object opResult = null;
-
- // these default values are used when creating a lock around an operation
- private Resource resource = Resource.NULL;
- private OperationCode operation = OperationCode.NULL;
- private String regionName = OperationContext.ALL_REGIONS;
-
- public ResourceOperationContext() {
- this(null, null, null);
- }
-
- // When only specified a resource and operation, it's assumed that you need access to all regions in order to perform the operations
- // guarded by this ResourceOperationConext
- public ResourceOperationContext(String resource, String operation) {
- this(resource, operation, OperationContext.ALL_REGIONS);
- }
-
- public ResourceOperationContext(String resource, String operation, String regionName) {
- if (resource != null) this.resource = Resource.valueOf(resource);
- if (operation != null) this.operation = OperationCode.valueOf(operation);
- if (regionName !=null ) this.regionName = regionName;
-
- setParts(this.resource.name()+":"+this.operation.name()+":"+this.regionName, true);
- }
-
- @Override
- public boolean isClientUpdate() {
- return false;
- }
-
- @Override
- public OperationCode getOperationCode() {
- return operation;
- }
-
- @Override
- public Resource getResource() {
- return resource;
- }
-
- @Override
- public String getRegionName(){
- return this.regionName;
- }
-
- @Override
- public boolean isPostOperation() {
- return isPostOperation;
- }
-
- public void setPostOperationResult(Object result) {
- this.isPostOperation = true;
- this.opResult = result;
- }
-
- public Object getOperationResult() {
- return this.opResult;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/OperationPartsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/OperationPartsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/OperationPartsJUnitTest.java
new file mode 100644
index 0000000..46ad79f
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/OperationPartsJUnitTest.java
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.cache.operations;
+
+import com.gemstone.gemfire.cache.operations.internal.GetOperationContextImpl;
+import com.gemstone.gemfire.internal.cache.operations.ContainsKeyOperationContext;
+import com.gemstone.gemfire.test.junit.categories.SecurityTest;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.authz.permission.WildcardPermission;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@Category({ UnitTest.class, SecurityTest.class })
+public class OperationPartsJUnitTest {
+
+ private static final WildcardPermission allDataPermissions =
+ new WildcardPermission(OperationContext.Resource.DATA.toString(), true);
+
+ private Permission makePermission(OperationContext.OperationCode opCode) {
+ return new WildcardPermission(String.format("%s:%s", OperationContext.Resource.DATA, opCode.toString()), true);
+ }
+
+ @Test
+ public void closeCQ() {
+ CloseCQOperationContext context = new CloseCQOperationContext("name", "query", new HashSet<>());
+ assertTrue(makePermission(OperationContext.OperationCode.CLOSE_CQ).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void containsKey() {
+ ContainsKeyOperationContext context = new ContainsKeyOperationContext(null);
+ assertTrue(makePermission(OperationContext.OperationCode.CONTAINS_KEY).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void destroy() {
+ DestroyOperationContext context = new DestroyOperationContext(null);
+ assertTrue(makePermission(OperationContext.OperationCode.DESTROY).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void executeCQ() {
+ ExecuteCQOperationContext context = new ExecuteCQOperationContext("name", "query", new HashSet<>(), false);
+ assertTrue(makePermission(OperationContext.OperationCode.EXECUTE_CQ).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void executeFunction() {
+ ExecuteFunctionOperationContext context = new ExecuteFunctionOperationContext("name", "region", new HashSet<>(), null, true, false);
+ assertTrue(makePermission(OperationContext.OperationCode.EXECUTE_FUNCTION).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void getDurableCQs() {
+ GetDurableCQsOperationContext context = new GetDurableCQsOperationContext();
+ assertTrue(makePermission(OperationContext.OperationCode.GET_DURABLE_CQS).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void get() {
+ GetOperationContext context = new GetOperationContextImpl(null, false);
+ assertTrue(makePermission(OperationContext.OperationCode.GET).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void registerInterest() {
+ RegisterInterestOperationContext context = new RegisterInterestOperationContext(null, null, null);
+ assertTrue(makePermission(OperationContext.OperationCode.REGISTER_INTEREST).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void unregisterInterest() {
+ UnregisterInterestOperationContext context = new UnregisterInterestOperationContext(null, null);
+ assertTrue(makePermission(OperationContext.OperationCode.UNREGISTER_INTEREST).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void invalidate() {
+ InvalidateOperationContext context = new InvalidateOperationContext(null);
+ assertTrue(makePermission(OperationContext.OperationCode.INVALIDATE).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void keySet() {
+ KeySetOperationContext context = new KeySetOperationContext(false);
+ assertTrue(makePermission(OperationContext.OperationCode.KEY_SET).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void putAll() {
+ PutAllOperationContext context = new PutAllOperationContext(new HashMap<>());
+ assertTrue(makePermission(OperationContext.OperationCode.PUTALL).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void put() {
+ PutOperationContext context = new PutOperationContext(null, null, true);
+ assertTrue(makePermission(OperationContext.OperationCode.PUT).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void query() {
+ QueryOperationContext context = new QueryOperationContext("query", null, false);
+ assertTrue(makePermission(OperationContext.OperationCode.QUERY).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void regionClear() {
+ RegionClearOperationContext context = new RegionClearOperationContext(false);
+ assertTrue(makePermission(OperationContext.OperationCode.REGION_CLEAR).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void regionCreate() {
+ RegionCreateOperationContext context = new RegionCreateOperationContext(false);
+ assertTrue(makePermission(OperationContext.OperationCode.REGION_CREATE).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void regionDestroy() {
+ RegionDestroyOperationContext context = new RegionDestroyOperationContext(false);
+ assertTrue(makePermission(OperationContext.OperationCode.REGION_DESTROY).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void removeAll() {
+ RemoveAllOperationContext context = new RemoveAllOperationContext(null);
+ assertTrue(makePermission(OperationContext.OperationCode.REMOVEALL).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+
+ @Test
+ public void stopCQ() {
+ StopCQOperationContext context = new StopCQOperationContext(null, null, null);
+ assertTrue(makePermission(OperationContext.OperationCode.STOP_CQ).implies(context));
+ assertTrue(allDataPermissions.implies(context));
+ assertFalse(context.isPostOperation());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/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 822dc47..cb67f48 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
@@ -19,6 +19,7 @@ package com.gemstone.gemfire.management.internal.security;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.security.AccessControl;
@@ -119,10 +120,10 @@ public class ExampleJSONAuthorization implements AccessControl, Authenticator {
for (int j = 0; j < ops.length(); j++) {
String[] parts = ops.getString(j).split(":");
if(regionNames!=null) {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames));
+ role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames, false));
}
else
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*"));
+ role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*", false));
}
roleMap.put(role.name, role);
[14/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/03f5e0c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/03f5e0c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/03f5e0c0
Branch: refs/heads/feature/GEODE-1372
Commit: 03f5e0c0864d4e955029f39fe682723dea0efe71
Parents: ff81dbf
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue May 31 13:05:56 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../SharedConfigurationEndToEndDUnitTest.java | 18 +++++++++---------
.../gemfire/distributed/AbstractLauncher.java | 2 ++
.../internal/cli/help/utils/HelpUtils.java | 3 ++-
.../com/gemstone/gemfire/GemFireTestCase.java | 4 +---
.../gemfire/distributed/AbstractLauncherTest.java | 1 +
.../LocatorLauncherIntegrationTest.java | 1 +
.../gemfire/distributed/LocatorLauncherTest.java | 1 +
.../ServerLauncherIntegrationTest.java | 1 +
.../gemfire/distributed/ServerLauncherTest.java | 1 +
.../commands/GemfireDataCommandsDUnitTest.java | 2 +-
...onWithCacheLoaderDuringCacheMissDUnitTest.java | 3 +--
...ListAndDescribeDiskStoreCommandsDUnitTest.java | 1 +
.../cli/commands/ShowMetricsDUnitTest.java | 2 +-
13 files changed, 23 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index 5c3d99f..e1bd685 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -51,7 +51,7 @@ import java.util.Set;
import static com.gemstone.gemfire.cache.RegionShortcut.PARTITION;
import static com.gemstone.gemfire.cache.RegionShortcut.REPLICATE;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
import static com.gemstone.gemfire.internal.FileUtil.delete;
import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;
@@ -347,13 +347,13 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
final Properties locatorProps = new Properties();
locatorProps.setProperty(NAME, locator1Name);
locatorProps.setProperty(MCAST_PORT, "0");
- locatorProps.setProperty(SystemConfigurationProperties.LOG_LEVEL, "config");
- locatorProps.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "true");
- locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER, "true");
- locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_START, "true");
- locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost));
- locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_PORT, String.valueOf(jmxPort));
- locatorProps.setProperty(SystemConfigurationProperties.HTTP_SERVICE_PORT, String.valueOf(httpPort));
+ locatorProps.setProperty(LOG_LEVEL, "config");
+ locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
+ locatorProps.setProperty(JMX_MANAGER, "true");
+ locatorProps.setProperty(JMX_MANAGER_START, "true");
+ locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost));
+ locatorProps.setProperty(JMX_MANAGER_PORT, String.valueOf(jmxPort));
+ locatorProps.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort));
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps);
@@ -392,7 +392,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
public Object call() {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(SystemConfigurationProperties.LOCATORS, "localhost:" + locator1Port);
+ localProps.setProperty(LOCATORS, "localhost:" + locator1Port);
localProps.setProperty(NAME, "DataMember");
getSystem(localProps);
Cache cache = getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
index cc27a03..7178ca6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
@@ -46,6 +46,8 @@ import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* The AbstractLauncher class is a base class for implementing various launchers to construct and run different GemFire
* processes, like Cache Servers, Locators, Managers, HTTP servers and so on.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
index b15feda..5d74fa0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.help.utils;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.management.cli.CliMetaData;
import com.gemstone.gemfire.management.internal.cli.help.format.*;
import com.gemstone.gemfire.management.internal.cli.modes.CommandModes;
@@ -30,6 +29,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* @since GemFire 7.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
index cd4e615..7e623e2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import org.junit.After;
import org.junit.Before;
@@ -26,8 +25,7 @@ import org.junit.rules.TestName;
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.assertTrue;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
index 1d05217..9d4a169 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* The AbstractLauncherTest class is a test suite of unit tests testing the contract and functionality
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
index 63e7b99..f5f43f4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
@@ -39,6 +39,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti
import static com.googlecode.catchexception.apis.BDDCatchException.when;
import static org.assertj.core.api.BDDAssertions.assertThat;
import static org.assertj.core.api.BDDAssertions.then;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Integration tests for LocatorLauncher. These tests require file system I/O.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
index e635af6..0e87ae0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
@@ -32,6 +32,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import static org.junit.Assert.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* The LocatorLauncherTest class is a test suite of test cases for testing the contract and functionality of
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
index f781374..da7d4e4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
@@ -38,6 +38,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti
import static com.googlecode.catchexception.apis.BDDCatchException.when;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.BDDAssertions.then;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Integration tests for ServerLauncher class. These tests may require file system and/or network I/O.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
index 7d694cd..0d1f4f3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
@@ -45,6 +45,7 @@ import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.junit.Assert.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* The ServerLauncherTest class is a test suite of unit tests testing the contract, functionality and invariants
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 59eab66..0ced468 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.query.internal.CompiledValue;
import com.gemstone.gemfire.cache.query.internal.QCompiler;
import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.lang.StringUtils;
import com.gemstone.gemfire.management.DistributedRegionMXBean;
@@ -57,6 +56,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Dunit class for testing gemfire data commands : get, put, remove, select, rebalance
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index 79e8b23..ebfe3f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -41,8 +41,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_LEVEL;
-import static com.gemstone.gemfire.distributed.NAME;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index d6ae20f..1aa21f8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -35,6 +35,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertNotNull;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases testing the proper
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index b439e20..6bb228c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.management.*;
import com.gemstone.gemfire.management.cli.Result;
@@ -45,6 +44,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
@Category(DistributedTest.class)
public class ShowMetricsDUnitTest extends CliCommandTestBase {
[49/55] [abbrv] incubator-geode git commit: GEODE-1464: remove sqlf
code
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
index 0704bb8..7e2a0af 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
@@ -908,7 +908,7 @@ public abstract class AbstractGatewaySender implements GatewaySender,
}
} else {
GatewaySenderEventCallbackArgument geCallbackArg = new GatewaySenderEventCallbackArgument(
- callbackArg, this.getMyDSId(), allRemoteDSIds, true);
+ callbackArg, this.getMyDSId(), allRemoteDSIds);
clonedEvent.setCallbackArgument(geCallbackArg);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index c57aebc..ce08e8d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -810,7 +810,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
}
GatewaySenderEventCallbackArgument geCallbackArg = new GatewaySenderEventCallbackArgument(
event.getRawCallbackArgument(), this.sender.getMyDSId(),
- allRemoteDSIds, true);
+ allRemoteDSIds);
event.setCallbackArgument(geCallbackArg);
GatewaySenderEventImpl pdxSenderEvent = new GatewaySenderEventImpl(
EnumListenerEvent.AFTER_UPDATE, event, null); // OFFHEAP: event for pdx type meta data so it should never be off-heap
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index f84dbbb..82476c8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -96,14 +96,10 @@ WrappedCallbackArgument implements DataSerializableFixedID {
* @param originalReceivers
* The list of <code>Gateway</code> s to which the event has been
* originally sent
- * @param serializeCBArg
- * boolean indicating whether to serialize callback argument
- *
*/
public GatewaySenderEventCallbackArgument(Object originalCallbackArg,
- int originatingDSId, List<Integer> originalReceivers,
- boolean serializeCBArg) {
- super(originalCallbackArg, serializeCBArg);
+ int originatingDSId, List<Integer> originalReceivers) {
+ super(originalCallbackArg);
this.originatingDSId = originatingDSId;
initializeReceipientDSIds(originalReceivers);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
index 8a811e2..83811ec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
@@ -515,10 +515,6 @@ public class GatewaySenderEventImpl implements
* //OFFHEAP TODO: Optimize callers by returning a reference to the off heap value
*/
public Object getValue() {
- if (CachedDeserializableFactory.preferObject()) {
- // sqlf does not use CacheDeserializable wrappers
- return getDeserializedValue();
- }
Object rawValue = this.value;
if (rawValue == null) {
rawValue = this.substituteValue;
@@ -535,9 +531,6 @@ public class GatewaySenderEventImpl implements
if (valueIsObject == 0x00) {
//if the value is a byte array, just return it
return rawValue;
- } else if (CachedDeserializableFactory.preferObject()) {
- // sqlf does not use CacheDeserializable wrappers
- return rawValue;
} else if (rawValue instanceof byte[]) {
return CachedDeserializableFactory.create((byte[]) rawValue);
} else {
@@ -947,9 +940,7 @@ public class GatewaySenderEventImpl implements
*/
@Retained(OffHeapIdentifier.GATEWAY_SENDER_EVENT_IMPL_VALUE)
StoredObject so = null;
- if (event.hasDelta()) {
- this.valueIsObject = 0x02;
- } else {
+ {
ReferenceCountHelper.setReferenceCountOwner(this);
so = event.getOffHeapNewValue();
ReferenceCountHelper.setReferenceCountOwner(null);
@@ -969,7 +960,7 @@ public class GatewaySenderEventImpl implements
// can share a reference to the off-heap value.
this.value = event.getCachedSerializedNewValue();
} else {
- final Object newValue = event.getRawNewValue(shouldApplyDelta());
+ final Object newValue = event.getRawNewValue();
assert !(newValue instanceof StoredObject); // since we already called getOffHeapNewValue() and it returned null
if (newValue instanceof CachedDeserializable) {
this.value = ((CachedDeserializable) newValue).getSerializedValue();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 46ff263..e0f8b6f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -567,13 +567,8 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
if (isAccessor)
return; // return from here if accessor node
- // if the current node is marked uninitialized (SQLF DDL replay in
- // progress) then we cannot wait for buckets to recover, because
- // bucket creation has been disabled until DDL replay is complete.
- if(!prQ.getCache().isUnInitializedMember(prQ.getDistributionManager().getId())) {
- //Wait for buckets to be recovered.
- prQ.shadowPRWaitForBucketRecovery();
- }
+ //Wait for buckets to be recovered.
+ prQ.shadowPRWaitForBucketRecovery();
} catch (IOException veryUnLikely) {
logger.fatal(LocalizedMessage.create(LocalizedStrings.SingleWriteSingleReadRegionQueue_UNEXPECTED_EXCEPTION_DURING_INIT_OF_0,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
index 243d8c5..f79f7f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
@@ -203,12 +203,10 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
this(cc, getDefaultAttributes(cc), true);
}
- // used by sqlfabric
public RegionAttributesCreation() {
this(defaultAttributes, true);
}
- // used by sqlfabric
public RegionAttributesCreation(RegionAttributes attrs, boolean defaults) {
this(null, attrs, defaults);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index 13eca56..a09952e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -734,7 +734,6 @@ public class LocalizedStrings {
public static final StringId PartitionedRegion_FAILED_REGISTRATION_PRID_0_NAMED_1 = new StringId(1872, "FAILED_REGISTRATION prId={0} named {1}");
public static final StringId PartitionedRegion_FORCEREATTEMPT_EXCEPTION___0 = new StringId(1873, "ForceReattempt exception : {0}");
public static final StringId PartitionedRegion_NEWLY_ADDED_MEMBER_TO_THE_PR_IS_AN_ACCESSOR_AND_WILL_NOT_RECEIVE_INDEX_INFORMATION_0 = new StringId(1874, "Newly added member to the PR is an accessor and will not receive index information : {0}");
- public static final StringId FunctionService_ROUTING_OBJECTS_SET_IS_NULL = new StringId(1875, "Set for routing objects passed is null");
public static final StringId PartitionedRegion_NO_VM_AVAILABLE_FOR_CONTAINS_KEY_IN_1_ATTEMPTS = new StringId(1877, "No VM available for contains key in {1} attempts");
public static final StringId PartitionedRegion_NO_VM_AVAILABLE_FOR_CONTAINS_VALUE_FOR_KEY_IN_1_ATTEMPTS = new StringId(1878, "No VM available for contains value for key in {1} attempts");
@@ -836,8 +835,6 @@ public class LocalizedStrings {
public static final StringId LocalRegion_THE_FOLLOWING_EXCEPTION_OCCURRED_ATTEMPTING_TO_GET_KEY_0 = new StringId(1995, "The following exception occurred attempting to get key={0}");
- public static final StringId RegionAdvisor_CANNOT_RESET_EXISTING_BUCKET = new StringId(
- 1997, "For region {0}: RegionAdvisor cannot reset existing bucket with ID {1}");
public static final StringId SystemAdmin_LRU_OPTION_HELP = new StringId(1998, "-lru=<type> Sets region''s lru algorithm. Valid types are: none, lru-entry-count, lru-heap-percentage, or lru-memory-size");
public static final StringId SystemAdmin_LRUACTION_OPTION_HELP = new StringId(1999, "-lruAction=<action> Sets the region''s lru action. Valid actions are: none, overflow-to-disk, local-destroy");
public static final StringId SystemAdmin_LRULIMIT_OPTION_HELP = new StringId(2000, "-lruLimit=<int> Sets the region''s lru limit. Valid values are >= 0");
@@ -2973,9 +2970,6 @@ public class LocalizedStrings {
public static final StringId GemFireCache_INITIALIZATION_FAILED_FOR_REGION_0 = new StringId(4609, "Initialization failed for Region {0}");
public static final StringId LocalRegion_INITIALIZATION_FAILED_FOR_REGION_0 = new StringId(4610, "Initialization failed for Region {0}");
public static final StringId PartitionedRegion_0_EVICTIONATTRIBUTES_1_DO_NOT_MATCH_WITH_OTHER_2 = new StringId(4611, "For Partitioned Region {0} the locally configured EvictionAttributes {1} do not match with other EvictionAttributes {2} and may cause misses during reads from VMs with smaller maximums.");
- public static final StringId DSFIDFactory_COULD_NOT_INSTANTIATE_SQLFABRIC_MESSAGE_CLASSID_0_1 = new StringId(4616, "Could not instantiate SQLFabric message [classId:{0}]:{1}");
- public static final StringId DSFIDFactory_ILLEGAL_ACCESS_FOR_SQLFABRIC_MESSAGE_CLASSID_0_1 = new StringId(4617, "Illegal access for SQLFabric message [classId:{0}]:{1}");
- public static final StringId DSFIDFactory_UNKNOWN_CLASSID_0_FOR_SQLFABRIC_MESSAGE = new StringId(4618, "Unknown ClassId [{0}] for SQLFabric message");
public static final StringId AbstractRegionMap_THE_CURRENT_VALUE_WAS_NOT_EQUAL_TO_EXPECTED_VALUE = new StringId(4619, "The current value was not equal to expected value.");
public static final StringId AbstractRegionEntry_THE_CURRENT_VALUE_WAS_NOT_EQUAL_TO_EXPECTED_VALUE = new StringId(4620, "The current value was not equal to expected value.");
public static final StringId AbstractRegionMap_ENTRY_NOT_FOUND_WITH_EXPECTED_VALUE = new StringId(4621, "entry not found with expected value");
@@ -3112,11 +3106,6 @@ public class LocalizedStrings {
public static final StringId AttributesFactory_INVALIDATE_REGION_NOT_SUPPORTED_FOR_PR = new StringId(4784,"ExpirationAction INVALIDATE or LOCAL_INVALIDATE for region is not supported for Partitioned Region.");
public static final StringId AttributesFactory_LOCAL_DESTROY_IS_NOT_SUPPORTED_FOR_PR = new StringId(4785,"ExpirationAction LOCAL_DESTROY is not supported for Partitioned Region.");
public static final StringId AttributesFactory_LOCAL_INVALIDATE_IS_NOT_SUPPORTED_FOR_PR = new StringId(4786,"ExpirationAction LOCAL_INVALIDATE is not supported for Partitioned Region.");
- public static final StringId GemFireUtilLauncher_ARGUMENTS = new StringId(4789, "Usage:\n{0} [{1}] <arguments for the utility specified>\n\nThe command to display a particular utility''s usage is:\n{0} <utility name> --help");
- public static final StringId GemFireUtilLauncher_INVALID_UTILITY_0 = new StringId(4790, "Invalid utility name: {0} was specified.");
- public static final StringId GemFireUtilLauncher_PROBLEM_STARTING_0 = new StringId(4791, "Problem starting {0}.");
- public static final StringId GemFireUtilLauncher_MISSING_COMMAND = new StringId(4792, "** Missing command");
- public static final StringId GemFireUtilLauncher_HELP = new StringId(4793, "** Displaying help information");
public static final StringId AttributesFactory_DESTROY_REGION_NOT_SUPPORTED_FOR_PR = new StringId(4794,"ExpirationAction DESTROY or LOCAL_DESTROY for region is not supported for Partitioned Region.");
public static final StringId ExecuteFunction_DS_NOT_CREATED_OR_NOT_READY = new StringId(4795, "DistributedSystem is either not created or not ready");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
index 82f487f..420b258 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
@@ -106,7 +106,6 @@ public class LoggingThreadGroup extends ThreadGroup {
if (group == null) {
group = new LoggingThreadGroup(name, logWriter);
// force autoclean to false and not inherit from parent group
- // (happens to be true for SQLFabric started threads as seen in #41438)
group.setDaemon(false);
loggingThreadGroups.add(group);
}
@@ -161,7 +160,6 @@ public class LoggingThreadGroup extends ThreadGroup {
if (group == null) {
group = new LoggingThreadGroup(name, logger);
// force autoclean to false and not inherit from parent group
- // (happens to be true for SQLFabric started threads as seen in #41438)
group.setDaemon(false);
loggingThreadGroups.add(group);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
index 353813c..adc1a9e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
@@ -324,40 +324,6 @@ public class ManagerLogWriter extends LocalLogWriter {
}
}
- /* This method is only used by sqlfabric, use getLogNameForOldMainLog instead - xzhou
- *
- */
-// public static File getMainLogName(File log) {
-// /*
-// * this is just searching for the existing logfile name
-// * we need to search for meta log file name
-// *
-// */
-// File dir = log.getAbsoluteFile().getParentFile();
-// int previousMainId = calcNextMainId(dir, true);
-// // comment out the following to fix bug 31789
-//// if (previousMainId > 1) {
-//// previousMainId--;
-//// }
-// previousMainId--;
-// File result = null;
-// do {
-// previousMainId++;
-// StringBuffer buf = new StringBuffer(log.getPath());
-// int insertIdx = buf.lastIndexOf(".");
-// if (insertIdx == -1) {
-// buf
-// .append(formatId(previousMainId))
-// .append(formatId(1));
-// } else {
-// buf.insert(insertIdx, formatId(1));
-// buf.insert(insertIdx, formatId(previousMainId));
-// }
-// result = new File(buf.toString());
-// } while (result.exists());
-// return result;
-// }
-
/**
* as a fix for bug #41474 we use "." if getParentFile returns null
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/PureLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/PureLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/PureLogWriter.java
index 3279bf6..53bac4f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/PureLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/PureLogWriter.java
@@ -186,7 +186,6 @@ public class PureLogWriter extends LogWriterImpl {
return sw.toString();
}
- // split out header writing portion for SQLFabric logging
protected void printHeader(PrintWriter pw, int msgLevel, Date msgDate,
String connectionName, String threadName, long tid) {
pw.println();
@@ -208,7 +207,6 @@ public class PureLogWriter extends LogWriterImpl {
pw.print("] ");
}
- // made public for use by SQLFabric logging
public String put(int msgLevel, Date msgDate, String connectionName,
String threadName, long tid, String msg, String exceptionText) {
String result = formatLogLine(msgLevel, msgDate, connectionName
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
index f3f064a..cd5f7dd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
@@ -33,7 +33,6 @@ public class OffHeapHelper {
/**
* If o is off-heap then return its heap form; otherwise return o since it is already on the heap.
- * Note even if o is sqlf off-heap byte[] or byte[][] the heap form will be created.
*/
public static Object getHeapForm(Object o) {
if (o instanceof StoredObject) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelperImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelperImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelperImpl.java
index 571c2d1..6745414 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelperImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelperImpl.java
@@ -208,7 +208,6 @@ class ReferenceCountHelperImpl {
for (int i=0; i < list.size(); i++) {
RefCountChangeInfo info = list.get(i);
if (owner instanceof RegionEntry) {
- // use identity comparison on region entries since sqlf does some wierd stuff in the equals method
if (owner == info.getOwner()) {
if (info.getUseCount() > 0) {
info.decUseCount();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/annotations/OffHeapIdentifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/annotations/OffHeapIdentifier.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/annotations/OffHeapIdentifier.java
index e275467..23e8dcf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/annotations/OffHeapIdentifier.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/annotations/OffHeapIdentifier.java
@@ -32,13 +32,9 @@ public enum OffHeapIdentifier {
TX_ENTRY_STATE("com.gemstone.gemfire.internal.cache.originalVersionId"),
GATEWAY_SENDER_EVENT_IMPL_VALUE("com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl.valueObj"),
TEST_OFF_HEAP_REGION_BASE_LISTENER("com.gemstone.gemfire.internal.offheap.OffHeapRegionBase.MyCacheListener.ohOldValue and ohNewValue"),
- COMPACT_COMPOSITE_KEY_VALUE_BYTES("com.vmware.sqlfire.internal.engine.store.CompactCompositeKey.valueBytes"),
- // TODO: HOOTS: Deal with this
REGION_ENTRY_VALUE(""),
ABSTRACT_REGION_ENTRY_PREPARE_VALUE_FOR_CACHE("com.gemstone.gemfire.internal.cache.AbstractRegionEntry.prepareValueForCache(...)"),
ABSTRACT_REGION_ENTRY_FILL_IN_VALUE("com.gemstone.gemfire.internal.cache.AbstractRegionEntry.fillInValue(...)"),
- COMPACT_EXEC_ROW_SOURCE("com.vmware.sqlfire.internal.engine.store.CompactExecRow.source"),
- COMPACT_EXEC_ROW_WITH_LOBS_SOURCE("com.vmware.sqlfire.internal.engine.store.CompactExecRowWithLobs.source"),
GEMFIRE_TRANSACTION_BYTE_SOURCE(""),
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
index ead57ce..c8e7361 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.internal.shared;
-import java.io.File;
import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.IOException;
@@ -38,21 +37,17 @@ import com.gemstone.gemfire.SystemFailure;
* Encapsulates native C/C++ calls via JNA. To obtain an instance of
* implementation for a platform, use {@link NativeCalls#getInstance()}.
*
- * This class is also referenced by ODBC/.NET drivers so it should not refer to
- * any classes other than standard JDK or those within the same package.
- *
* @since GemFire 8.0
*/
public abstract class NativeCalls {
/**
* Static instance of NativeCalls implementation. This can be one of JNA
- * implementations in <code>NativeCallsJNAImpl</code> or can fallback to a
+ * implementations in <code>NativeCallsJNAImpl</code> or can fall back to a
* generic implementation in case JNA is not available for the platform.
*
- * Note: this variable is deliberately not final since other drivers like
- * those for ADO.NET or ODBC will plugin their own native implementations of
- * NativeCalls.
+ * Note: this variable is deliberately not final so that other clients
+ * can plug in their own native implementations of NativeCalls.
*/
protected static NativeCalls instance;
@@ -60,7 +55,7 @@ public abstract class NativeCalls {
NativeCalls inst;
try {
// try to load JNA implementation first
- // we do it via reflection since some clients like ADO.NET/ODBC
+ // we do it via reflection since some clients
// may not have it
final Class<?> c = Class
.forName("com.gemstone.gemfire.internal.shared.NativeCallsJNAImpl");
@@ -73,24 +68,8 @@ public abstract class NativeCalls {
inst = null;
}
if (inst == null) {
- // In case JNA implementations cannot be loaded, fallback to generic
- // implementations.
- // Other clients like ADO.NET/ODBC will plugin their own implementations.
- try {
- // using reflection to get the implementation based on OSProcess
- // since this is also used by GemFireXD client; at some point all the
- // functionality of OSProcess should be folded into the JNA impl
- final Class<?> c = Class
- .forName("com.gemstone.gemfire.internal.OSProcess$NativeOSCalls");
- inst = (NativeCalls)c.newInstance();
- } catch (VirtualMachineError e) {
- SystemFailure.initiateFailure(e);
- throw e;
- } catch (Throwable t) {
- SystemFailure.checkFailure();
- // fallback to generic impl in case of a problem
- inst = new NativeCallsGeneric();
- }
+ // fall back to generic implementation in case of a problem
+ inst = new NativeCallsGeneric();
}
instance = inst;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/util/ArrayUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/ArrayUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/ArrayUtils.java
index 4f15b17..04b1a15 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/ArrayUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/ArrayUtils.java
@@ -255,7 +255,7 @@ public abstract class ArrayUtils {
}
else {
first = false;
- // for SQLFire show the first byte[] for byte[][] storage
+ // show the first byte[] for byte[][] storage
objectStringWithBytes(o, sb);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
index 0000fb9..0842d71 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
@@ -24,7 +24,7 @@
* implementations can be plugged in. These HashEntry objects are now assumed to
* be immutable in the sense that they cannot and should not be cloned in a
* rehash, and the rehash mechanism has been recoded using locking for that. For
- * GemFire/SQLFire, this is now used to plugin the RegionEntry implementation
+ * Geode, this is now used to plugin the RegionEntry implementation
* directly as a HashEntry instead of having it as a value and then HashEntry as
* a separate object having references to key/value which reduces the entry
* overhead substantially. Other change is to add a "create" method that creates
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index b5f4149..4ecf3e3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@ -107,7 +107,6 @@ import com.gemstone.gemfire.internal.cache.TXManagerImpl;
import com.gemstone.gemfire.internal.cache.TXStateProxy;
import com.gemstone.gemfire.internal.cache.Token;
import com.gemstone.gemfire.internal.cache.TombstoneService;
-import com.gemstone.gemfire.internal.cache.delta.Delta;
import com.gemstone.gemfire.internal.cache.versions.RegionVersionHolder;
import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector;
import com.gemstone.gemfire.internal.cache.versions.VMRegionVersionVector;
@@ -2964,145 +2963,6 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
/**
- * Delta implementation for the delta tests, appends " 10" if it's a string,
- * or adds 10 if it's an Integer
- */
- static class AddTen implements Delta, Serializable {
-
- public Object apply(EntryEvent<?, ?> putEvent) {
- Object oldValue = putEvent.getOldValue();
- if (oldValue instanceof String) {
- return (String)oldValue + " 10";
- }
- else if (oldValue instanceof Integer) {
- return new Integer(((Integer)oldValue).intValue() + 10);
- }
- else throw new IllegalStateException("unexpected old value");
- }
-
- public Object merge(Object toMerge, boolean isCreate) {
- return null;
- }
-
- public Object merge(Object toMerge) {
- return null;
- }
-
- public Object getResultantValue() {
- return null;
- }
- }
-
- /**
- * Tests that a Delta is applied correctly both locally and on a replicate
- * region.
- */
- public void testDeltaWithReplicate() throws InterruptedException {
- if (!supportsReplication()) {
- return;
- }
- //pauseIfNecessary(100); // wait for previous tearDown to complete
-
- final String name = this.getUniqueName();
- final Object key1 = "KEY1";
- final Object value1 = "VALUE1";
- final Object key2 = "KEY2";
- final Object value2 = new Integer (0xCAFE);
- final Object key3 = "KEY3";
- final Object value3 = "VALUE3";
-
- final Delta delta = new AddTen();
-
- Host host = Host.getHost(0);
- VM vm0 = host.getVM(0);
- VM vm2 = host.getVM(2); // use VM on separate shared memory in case shared regions
-
- SerializableRunnable create = new
- CacheSerializableRunnable("Create Replicate Region") {
- public void run2() throws CacheException {
- RegionAttributes ra = getRegionAttributes();
- AttributesFactory factory =
- new AttributesFactory(ra);
- if (ra.getEvictionAttributes() == null
- || !ra.getEvictionAttributes().getAction().isOverflowToDisk()) {
- factory.setDiskStoreName(null);
- }
- factory.setDataPolicy(DataPolicy.REPLICATE);
- createRegion(name, factory.create());
- }
- };
-
- vm0.invoke(create);
- Thread.sleep(250);
- vm2.invoke(create);
- Thread.sleep(250);
-
- vm0.invoke(new CacheSerializableRunnable("Put data") {
- public void run2() throws CacheException {
- Region region = getRootRegion().getSubregion(name);
- region.put(key1, value1);
- region.put(key2, value2);
- region.put(key3, value3);
- }
- });
-
- Invoke.invokeRepeatingIfNecessary(vm2, new CacheSerializableRunnable("Wait for update") {
- public void run2() throws CacheException {
- Region region = getRootRegion().getSubregion(name);
- assertNotNull(region.getEntry(key1));
- assertNotNull(region.getEntry(key2));
- assertNotNull(region.getEntry(key3));
- }
- }, getRepeatTimeoutMs());
-
- // apply delta
- vm0.invoke(new CacheSerializableRunnable("Apply delta") {
- public void run2() throws CacheException {
- Region region = getRootRegion().getSubregion(name);
- region.put(key1, delta);
- region.put(key2, delta);
- region.put(key3, delta);
- }
- });
-
- CacheSerializableRunnable verify =
- new CacheSerializableRunnable("Verify values") {
- public void run2() throws CacheException {
- Region region = getRootRegion().getSubregion(name);
-
- Region.Entry entry1 = region.getEntry(key1);
- assertNotNull(entry1);
- assertEquals("VALUE1 10", entry1.getValue());
-
- Region.Entry entry2 = region.getEntry(key2);
- assertNotNull(entry2);
- assertEquals(new Integer(0xCAFE + 10), entry2.getValue());
-
- Region.Entry entry3 = region.getEntry(key3);
- assertNotNull(entry3);
- assertEquals("VALUE3 10", entry3.getValue());
- }
- };
-
- Invoke.invokeRepeatingIfNecessary(vm0, verify, getRepeatTimeoutMs());
-
-
- // Destroy the local entries so we know that they are not found by
- // a netSearch
- vm0.invoke(new CacheSerializableRunnable("Remove local entries") {
- public void run2() throws CacheException {
- Region region = getRootRegion().getSubregion(name);
- region.localDestroyRegion();
- }
- });
-
- Invoke.invokeRepeatingIfNecessary(vm2, verify, getRepeatTimeoutMs());
-
- }
-
-
-
- /**
* Tests that a newly-created mirrored region contains all of the
* entries of another region.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 3e153e0..3e133f6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -115,7 +115,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
//////// Test Methods
/**
- * SQLFire uses a colocated locator in a dm-type=normal VM. This tests that
+ * This tests that
* the locator can resume control as coordinator after all locators have been
* shut down and one is restarted. It's necessary to have a lock service
* start so elder failover is forced to happen. Prior to fixing how this worked
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 3538e41..06d0e08 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -36,11 +36,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-/**
- * Port of GemFireXD's corresponding test for distributed transactions
- *
- *
- */
@SuppressWarnings("deprecation")
public class DistributedTransactionDUnitTest extends CacheTestCase {
final protected String CUSTOMER_PR = "customerPRRegion";
@@ -345,11 +340,6 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
- /**
- * From GemFireXD: testTransactionalInsertOnReplicatedTable
- *
- * @throws Exception
- */
public void testTransactionalPutOnReplicatedRegion() throws Exception {
Host host = Host.getHost(0);
VM server1 = host.getVM(0);
@@ -623,8 +613,6 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
}
/*
- * [sjigyasu] This adapation of test from GemFireXD allows the difference in
- * the way GemFire and GemFireXD handle server groups.
* We create 2 partitioned regions one on each server and have a third node
* as accessor and fire transactional operations on it.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
index 07f87a3..ca870cc 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -167,15 +167,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends CacheTestCase {
constdsfids.add(new Byte(DataSerializableFixedID.RESULTS_BAG).intValue());
constdsfids.add(new Byte(DataSerializableFixedID.GATEWAY_EVENT_IMPL_66)
.intValue());
- constdsfids.add(new Byte(DataSerializableFixedID.SQLF_TYPE).intValue());
- constdsfids.add(new Byte(DataSerializableFixedID.SQLF_DVD_OBJECT)
- .intValue());
- constdsfids.add(new Byte(DataSerializableFixedID.SQLF_GLOBAL_ROWLOC)
- .intValue());
- constdsfids.add(new Byte(DataSerializableFixedID.SQLF_GEMFIRE_KEY)
- .intValue());
- constdsfids.add(new Byte(DataSerializableFixedID.SQLF_FORMATIBLEBITSET)
- .intValue());
constdsfids
.add(new Short(DataSerializableFixedID.TOKEN_INVALID).intValue());
constdsfids.add(new Short(DataSerializableFixedID.TOKEN_LOCAL_INVALID)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
index 9462fab..3e83159 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
@@ -465,8 +465,7 @@ public class PRCustomPartitioningDUnitTest extends
/**
* Example implementation of a Partition Resolver which uses part of the value
- * for custom partitioning. This example is a simplification of what SQLFabric
- * may do when the DDL specifies "partition by"
+ * for custom partitioning.
*/
class MonthBasedPartitionResolver implements PartitionResolver, Declarable2 {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
index e08a268..bc974f7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
@@ -73,7 +73,6 @@ public class FetchEntriesMessageJUnitTest {
cache = Fakes.cache();
PartitionedRegion pr = mock(PartitionedRegion.class);
InternalDistributedSystem system = cache.getDistributedSystem();
- when(pr.keyRequiresRegionContext()).thenReturn(false);
FetchEntriesResponse response = new FetchEntriesResponse(system, pr, null, 0);
HeapDataOutputStream chunkStream = createDummyChunk();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index cd659e6..37eee1b 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -963,7 +963,7 @@ fromData,284,2bb9002301003d1c077e07a0000704a70004033e1c10207e1020a0000704a700040
toData,299,033d033e2ab600089e003d1c07803d043e2ab6000b3a041904b9000c01009900271904b9000d0100c0000a3a051905c600131905c1001199000e1c1020803da70006a7ffd5b80012b20013b90014020099001fb80012b20013121505bd001659032a5359041cb8001753b9001804002b1cb9001902001d9900b32ab60008852bb8001abb001b592ab60008b7001c3a040336052ab6000b3a061906b9000c010099008a1906b9000d0100c0000a3a071907c7000d2b03b900190200a7006c1907b6001d3a081908c700132b04b90019020019072bb8001ea7005019041908b6001f360915099a00242b05b90019020084050115053609190419081509b600205719072bb8001ea700212b06b90019020019072b03b6002119071908b6002215090464852bb8001aa7ff72b1
com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
-toData,236,2ab4000a4e2ab4000c3a042d2bb8003d1904c1003e9a00081904c700192b03b9003f02001904c0003ec0003e2bb80040a700341904c1004199001f1904c000413a052b04b9003f02001905b9004201002bb80040a700102b04b9003f020019042bb800432b2ab40012b40044b9003f02002ab4000636052ab40026c6000a150507809136052ab40017c6001d15051008809136052ab40017c1004599000b150510208091360515051080809136052b1505b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
+toData,229,2ab4000a4d2ab4000c4e2c2bb8003d2dc1003e9a00072dc700182b03b9003f02002dc0003ec0003e2bb80040a700312dc1004199001e2dc000413a042b04b9003f02001904b9004201002bb80040a7000f2b04b9003f02002d2bb800432b2ab40012b40044b9003f02002ab4000636042ab40026c6000a150407809136042ab40017c6001d15041008809136042ab40017c1004599000b150410208091360415041080809136042b1504b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllMessage,2
fromData,197,2a2bb7003c2a2bb8003dc0003eb500052a2bb8003f88b500152a2ab40015bd0040b500062ab400159e00722bb800414dbb004259b700434e03360415042ab40015a200202ab400061504bb0040592b2ab4000515042c2db7004453840401a7ffdd2bb9004501003604150499002f2bb800463a0503360615062ab40015a2001d2ab4000615063219051506b60047c00048b5002e840601a7ffe02ab400491140007e99000e2a2bb8003dc0004bb5000b2a2ab400491180007e99000704a7000403b5001ab1
@@ -973,8 +973,9 @@ com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage,2
fromData,171,2a2bb700612bb9006201003d1c047e9900142a2bb900640100b500082ab40008b800651c077e99000d2a2bb900640100b500051c057e99000e2a2bb80066c00067b500062bb800664e2dc100689900252a03b5000d2a2dc00068b80069b500072ab40007c7001b2a2dc00068b5004ca700102a2dc0006ab500072a04b5000d2a2bb80066c0006bb500092a2bb8006cb5000b2a2bb8006db5000a2a1c10407e99000704a7000403b5000cb1
toData,173,2a2bb7006f033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000c9900091c104080933d2b1cb9007002002ab4000899000d2b2ab40008b9007102002ab40005029f000d2b2ab40005b9007102002ab40006c6000b2ab400062bb800722ab4000d99000e2ab400072bb80072a700102ab40007b9005701002bb800722ab400092bb800722ab4000bc000732bb800742ab4000a2bb80075b1
+
com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
-toData,146,2ab4000a4e2d2bb8003f2b2ab40010b40040b9004102002ab4000636042ab40022c6000a150407809136042ab40015c6001d15041008809136042ab40015c1004299000b150410208091360415041080809136042b1504b9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
+toData,136,2ab4000a4d2c2bb8003f2b2ab40010b40040b9004102002ab400063e2ab40022c600081d0780913e2ab40015c600191d100880913e2ab40015c100429900091d102080913e1d108080913e2b1db9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
fromData,197,2a2bb700382a2bb80039c0003ab500032a2bb8003b88b500132a2ab40013bd003cb500042ab400139e00722bb8003d4dbb003e59b7003f4e03360415042ab40013a200202ab400041504bb003c592b2ab4000315042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40013a2001d2ab4000415063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00047b500092a2ab400451180007e99000704a7000403b50018b1
@@ -1075,8 +1076,8 @@ fromData,16,2a2bb7000d2a2bb9000e0100b50002b1
toData,16,2a2bb7000f2b2ab40002b900100200b1
com/gemstone/gemfire/internal/cache/InitialImageOperation$Entry,2
-fromData,107,2a2bb9001b0100b500032bb9001b01003d2a2bb8001cb500122ab40003b8001499000d2ab2001db50002a7001d2ab600159a000e2a2bb8001eb50002a7000b2a2bb8001fb500022a2bb900200100b500041c047e9900162a1c057e99000704a70004032bb80021b5000db1
-toData,125,2b2ab40003b9000f02002ab4000dc6000704a70004033d1c2ab4000dc1001199000705a700040380913d2b1cb9000f02002ab400122bb800132ab40003b800149a00232ab600159a000e2ab400022bb80016a700112ab40002c00017c000172bb800182b2ab40004b9001903002ab4000dc6000b2ab4000d2bb8001ab1
+fromData,89,2a2bb900150100b500032bb9001501003d2a2bb80016b5000f2ab40003b8001199000d2ab20017b50002a7000b2a2bb80018b500022a2bb900190100b500041c047e9900162a1c057e99000704a70004032bb8001ab5000ab1
+toData,101,2b2ab40003b9000c02002ab4000ac6000704a70004033d1c2ab4000ac1000e99000705a700040380913d2b1cb9000c02002ab4000f2bb800102ab40003b800119a000b2ab400022bb800122b2ab40004b9001303002ab4000ac6000b2ab4000a2bb80014b1
com/gemstone/gemfire/internal/cache/InitialImageOperation$FilterInfoMessage,2
fromData,230,2a2bb7008c2a2bb8008db500202ab4000403322bb8008db5003d2ab4000403322bb8008db500402ab4000403322bb8008db500422ab4000403322bb8008db500442ab4000403322bb8008db500462ab4000403322bb8008db500482ab4000403322bb8008db5004a2ab4000403322bb8008db5004c2ab4000404322bb8008db5003d2ab4000404322bb8008db500402ab4000404322bb8008db500422ab4000404322bb8008db500442ab4000404322bb8008db500462ab4000404322bb8008db500482ab4000404322bb8008db5004a2ab4000404322bb8008db5004c2a2bb8008db50033b1
@@ -1175,7 +1176,7 @@ fromData,9,2a2bb8000eb50002b1
toData,9,2ab400022bb8000fb1
com/gemstone/gemfire/internal/cache/QueuedOperation,1
-toData,97,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900442ab400032bb800372ab40002b600169a000d2ab40002b600159900282b2ab40006b9003602002ab40006049f000e2ab400042bb80038a7000b2ab400052bb80037b1
+toData,78,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900312ab400032bb800372ab40002b600169a000d2ab40002b600159900152b2ab40006b9003602002ab400042bb80038b1
com/gemstone/gemfire/internal/cache/RegionEventImpl,2
fromData,48,2a2bb80025b500092a2bb80026b500022a2bb900270100b80028b5000a2a2bb900290100b500032a2bb8002ab5000bb1
@@ -1370,8 +1371,8 @@ fromData,37,2a2bb7004f2a2bb900500100b500052a2bb900500100b500032a2bb80051c00052b5
toData,34,2a2bb7004c2b2ab40005b9004d02002b2ab40003b9004d02002ab400022bb8004eb1
com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl,2
-fromData,102,2a2bb8000cb500032a03b7000d4d2bb8000e3e0336042cc600311d9e002d2a2c2ab40003b6000fc00010b500022ab40002c600172a2a2ab40002b600111d2bb70012b5000404360415049a00121d9e000e2a2a031d2bb70012b50004a700094e2a01b50004b1
-toData,17,2ab600212bb800222ab400042bb80023b1
+fromData,62,2a2bb8000cb500032a03b7000d4d2bb8000e3e2cc600161d9e00122a2c2ab40003b6000fc00010b500022a2a1d2bb70011b50004a700094e2a01b50004b1
+toData,17,2ab6001e2bb8001f2ab400042bb80020b1
com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage$TXRemoteCommitReplyMessage,2
fromData,17,2a2bb7001a2a2bb8001bc0001cb50004b1
@@ -1410,16 +1411,16 @@ fromData,62,2a2bb700152bb9001601003d1c02a0000b2a01b50007a700271cbd00174e03360415
toData,59,2a2bb700192ab40007c7000d2b02b9001a0200a700272ab40007be3d2b1cb9001a0200033e1d1ca200132ab400071d322bb8001b840301a7ffeeb1
com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor$UpdateAttributesMessage,2
-fromData,71,2a2bb7002a2a2bb8002bb500082a2bb9002c0100b500022ab40002b8002d2a2bb8002ec0000eb50005a700094d2a01b500052a2bb900300100b500032a2bb900300100b50004b1
-toData,52,2a2bb700312ab400082bb800322b2ab40002b9003302002ab400052bb800342b2ab40003b9003502002b2ab40004b900350200b1
+fromData,62,2a2bb7002a2a2bb8002bb500082a2bb9002c0100b500022ab40002b8002d2a2bb8002ec0000eb500052a2bb9002f0100b500032a2bb9002f0100b50004b1
+toData,52,2a2bb700302ab400082bb800312b2ab40002b9003202002ab400052bb800332b2ab40003b9003402002b2ab40004b900340200b1
com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation$UpdateEntryVersionMessage,2
fromData,45,2a2bb700322a2bb80033c00034b500022a2bb80033b500092bb800354d2cb6003699000b2a2bb80037b50005b1
toData,118,2a2bb700382ab400022bb800392ab400092bb800392ab40003b6003ac0001e4d2cc1003b99002e2cb6003c4e2db6003d990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fa700262cb60043990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fb1
com/gemstone/gemfire/internal/cache/UpdateOperation$UpdateMessage,2
-fromData,163,2a2bb7006c2bb9006d01003d1cb2006e7e99000704a70004033e1d9900332abb006f59b70070b500042ab400042bb800712bb900720100360415049900102a2bb900730100b80006b50007a700082a01b500042a2bb80074b5000d2a1cb200757e91b5000a2ab6002899000e2a2bb80076b50026a7002e2ab4000a04a0000e2a2bb80074b50010a7000b2a2bb80076b5000f1cb200777e99000b2a2bb80076b50026b1
-toData,235,2ab40003b60039c000784d2a2cb700792a2bb7007a2ab4000a3e2ab40004c6000a1db2006e80913e2ab4000a99001b2ab400059900142ab40003b6005bc6000a1db2007780913e2b1db9007b02002ab40004c6004b2ab400042bb8007c2cc1007d9900352cb6007e3a041904b6007f9a000d2b03b900800200a7001a2b04b9008002002b2ab40003b60081b60082b900830300a7000a2b03b9008002002ab4000d2bb800842ab6002899001e2ab40003b6005b2bb800852ab40003b60039b60086b60087a700262ab4000a2ab400102ab4000f2bb800881db200777e99000e2ab40003b6005b2bb80085b1
+fromData,144,2a2bb700692bb9006a01003d1cb2006b7e99000704a70004033e1d9900332abb006c59b7006db500042ab400042bb8006e2bb9006f0100360415049900102a2bb900700100b80006b50007a700082a01b500042a2bb80071b5000d2a1cb200727e91b5000a2ab6002899000e2a2bb80073b50026a7001b2a2bb80073b5000f1cb200747e99000b2a2bb80073b50026b1
+toData,235,2ab40003b60039c000754d2a2cb700762a2bb700772ab4000a3e2ab40004c6000a1db2006b80913e2ab4000a99001b2ab400059900142ab40003b60058c6000a1db2007480913e2b1db9007802002ab40004c6004b2ab400042bb800792cc1007a9900352cb6007b3a041904b6007c9a000d2b03b9007d0200a7001a2b04b9007d02002b2ab40003b6007eb6007fb900800300a7000a2b03b9007d02002ab4000d2bb800812ab6002899001e2ab40003b600582bb800822ab40003b60039b60083b60084a700262ab4000a2ab400102ab4000f2bb800851db200747e99000e2ab40003b600582bb80082b1
com/gemstone/gemfire/internal/cache/UpdateOperation$UpdateWithContextMessage,2
fromData,14,2a2bb700132a2bb80014b50009b1
@@ -1430,8 +1431,8 @@ fromData,17,2bb800204d2a2cbeb500082a2cb50006b1
toData,9,2ab600212bb80022b1
com/gemstone/gemfire/internal/cache/WrappedCallbackArgument,2
-fromData,9,2a2bb80005b50003b1
-toData,24,2ab4000299000e2ab400032bb80004a70008012bb80004b1
+fromData,9,2a2bb80004b50002b1
+toData,9,2ab400022bb80003b1
com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable,2
fromData,18,2a2ab600072bb8000eb900080200b50002b1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index 4e951af..8ea91f5 100755
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -245,7 +245,6 @@ com/gemstone/gemfire/internal/AbstractConfig$SortedProperties,true,7156507110684
com/gemstone/gemfire/internal/ConfigSource,true,-4097017272431018553,description:java/lang/String,type:com/gemstone/gemfire/internal/ConfigSource$Type
com/gemstone/gemfire/internal/ConfigSource$Type,false
com/gemstone/gemfire/internal/CopyOnWriteHashSet,true,8591978652141659932
-com/gemstone/gemfire/internal/DSFIDFactory$SqlfSerializationException,true,5076687296705595933
com/gemstone/gemfire/internal/DSFIDNotFoundException,true,130596009484324655,dsfid:int,versionOrdinal:short
com/gemstone/gemfire/internal/InternalDataSerializer$SERIALIZATION_VERSION,false
com/gemstone/gemfire/internal/InternalStatisticsDisabledException,true,4146181546364258311
[26/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
GEODE-1377: Renaming SystemConfigurationProperties to DistributedSystemConfigProperties
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1e985eb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1e985eb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1e985eb1
Branch: refs/heads/feature/GEODE-1372
Commit: 1e985eb14b8634ce870e094f0d50bb12aec475aa
Parents: 05ed016
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Jun 2 09:56:54 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../ClientServerRegionFactoryDelegate.java | 2 +-
.../internal/RegionFactoryDelegate.java | 2 +-
.../gemfire/modules/HibernateJUnitTest.java | 2 +-
.../gemstone/gemfire/modules/SecondVMTest.java | 2 +-
.../session/bootstrap/AbstractCache.java | 2 +-
.../modules/session/TestSessionsBase.java | 2 +-
.../LocatorLauncherAssemblyIntegrationTest.java | 3 +-
.../LauncherLifecycleCommandsDUnitTest.java | 2 +-
.../LauncherLifecycleCommandsJUnitTest.java | 3 +-
.../SharedConfigurationEndToEndDUnitTest.java | 3 +-
.../internal/web/RestInterfaceJUnitTest.java | 3 +-
.../web/controllers/RestAPITestBase.java | 3 +-
.../RestAPIsAndInterOpsDUnitTest.java | 3 +-
...APIsOnMembersFunctionExecutionDUnitTest.java | 2 +-
.../RestAPIsQueryAndFEJUnitTest.java | 2 +-
.../controllers/RestAPIsWithSSLDUnitTest.java | 3 +-
.../gemfire/admin/DistributedSystemConfig.java | 3 +-
.../internal/AdminDistributedSystemImpl.java | 2 +-
.../admin/internal/CacheServerConfigImpl.java | 2 +-
.../gemfire/admin/internal/CacheServerImpl.java | 2 +-
.../internal/DistributedSystemConfigImpl.java | 2 +-
.../internal/DistributionLocatorConfigImpl.java | 2 +-
.../EnabledManagedEntityController.java | 2 +-
.../admin/internal/ManagedEntityConfigXml.java | 4 +-
.../admin/internal/ManagedSystemMemberImpl.java | 2 +-
.../admin/jmx/internal/AgentConfigImpl.java | 2 +-
.../jmx/internal/MemberInfoWithStatsMBean.java | 2 +-
.../cache/client/ClientCacheFactory.java | 4 +-
.../client/internal/AuthenticateUserOp.java | 3 +-
.../gemfire/cache/client/internal/PoolImpl.java | 2 -
.../gemfire/distributed/AbstractLauncher.java | 2 +-
.../gemfire/distributed/DistributedSystem.java | 2 +-
.../DistributedSystemConfigProperties.java | 746 +++++++++++++++++++
.../gemfire/distributed/LocatorLauncher.java | 2 +-
.../gemfire/distributed/ServerLauncher.java | 4 +-
.../SystemConfigurationProperties.java | 209 ------
.../internal/AbstractDistributionConfig.java | 5 +-
.../internal/DistributionConfig.java | 12 +-
.../internal/DistributionConfigImpl.java | 7 +-
.../internal/InternalDistributedSystem.java | 4 +-
.../distributed/internal/InternalLocator.java | 2 +-
.../distributed/internal/LocatorStats.java | 2 +-
.../internal/SharedConfiguration.java | 2 +-
.../membership/gms/auth/GMSAuthenticator.java | 8 +-
.../membership/gms/membership/GMSJoinLeave.java | 4 +-
.../gemfire/internal/AbstractConfig.java | 2 +-
.../gemfire/internal/MigrationClient.java | 6 +-
.../gemfire/internal/MigrationServer.java | 6 +-
.../gemstone/gemfire/internal/SystemAdmin.java | 4 +-
.../gemfire/internal/admin/SSLConfig.java | 2 +-
.../admin/remote/RemoteTransportConfig.java | 2 +-
.../internal/cache/CacheServerLauncher.java | 10 +-
.../gemfire/internal/cache/DiskStoreImpl.java | 2 +-
.../gemfire/internal/cache/PoolStats.java | 2 +-
.../cache/tier/sockets/AcceptorImpl.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java | 2 +-
.../tier/sockets/ClientProxyMembershipID.java | 2 +-
.../internal/cache/tier/sockets/HandShake.java | 2 +-
.../cache/tier/sockets/ServerConnection.java | 2 +-
.../tier/sockets/ServerHandShakeProcessor.java | 3 +-
.../internal/cache/xmlcache/CacheXml.java | 5 +-
.../internal/logging/LogWriterFactory.java | 2 +-
.../internal/security/GeodeSecurityUtil.java | 2 +-
.../security/shiro/CustomAuthRealm.java | 2 +-
.../gemfire/internal/tcp/Connection.java | 2 +-
.../management/internal/cli/CommandManager.java | 8 +-
.../internal/cli/commands/ConfigCommands.java | 2 +-
.../cli/commands/LauncherLifecycleCommands.java | 17 +-
.../internal/cli/commands/ShellCommands.java | 14 +-
.../cli/functions/ChangeLogLevelFunction.java | 2 +-
.../GetMemberConfigInformationFunction.java | 2 +-
.../internal/cli/help/utils/HelpUtils.java | 2 -
.../internal/cli/i18n/CliStrings.java | 14 +-
.../internal/cli/shell/JmxOperationInvoker.java | 3 +-
.../DurableClientCommandsController.java | 12 +-
.../gemfire/redis/GemFireRedisServer.java | 2 +-
.../com/gemstone/gemfire/CopyJUnitTest.java | 2 +-
.../gemfire/DiskInstantiatorsJUnitTest.java | 2 +-
.../com/gemstone/gemfire/GemFireTestCase.java | 2 +-
.../gemfire/JtaNoninvolvementJUnitTest.java | 2 +-
.../gemfire/LocalStatisticsJUnitTest.java | 3 +-
.../com/gemstone/gemfire/LonerDMJUnitTest.java | 4 +-
.../com/gemstone/gemfire/TXExpiryJUnitTest.java | 2 +-
.../java/com/gemstone/gemfire/TXJUnitTest.java | 2 +-
.../com/gemstone/gemfire/TXWriterTestCase.java | 2 +-
.../BindDistributedSystemJUnitTest.java | 4 +-
.../internal/DistributedSystemTestCase.java | 2 +-
.../admin/internal/HealthEvaluatorTestCase.java | 2 +-
.../gemfire/cache/CacheListenerJUnitTest.java | 4 +-
.../cache/CacheRegionClearStatsDUnitTest.java | 4 +-
.../cache/ClientServerTimeSyncDUnitTest.java | 2 +-
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 4 +-
.../cache/ConnectionPoolFactoryJUnitTest.java | 3 +-
.../gemfire/cache/PoolManagerJUnitTest.java | 4 +-
.../gemstone/gemfire/cache/ProxyJUnitTest.java | 4 +-
.../gemfire/cache/RegionFactoryJUnitTest.java | 2 +-
...ventQueueEvictionAndExpirationJUnitTest.java | 2 +-
.../SerialAsyncEventQueueImplJUnitTest.java | 2 +-
.../client/ClientCacheFactoryJUnitTest.java | 3 +-
.../client/ClientRegionFactoryJUnitTest.java | 4 +-
.../ClientServerRegisterInterestsDUnitTest.java | 3 +-
.../AutoConnectionSourceImplJUnitTest.java | 4 +-
.../CacheServerSSLConnectionDUnitTest.java | 3 +-
.../internal/ConnectionPoolImplJUnitTest.java | 4 +-
.../cache/client/internal/LocatorTestBase.java | 3 +-
.../client/internal/QueueManagerJUnitTest.java | 4 +-
.../internal/SSLNoClientAuthDUnitTest.java | 3 +-
.../pooling/ConnectionManagerJUnitTest.java | 4 +-
.../management/MXMemoryPoolListenerExample.java | 12 +-
.../management/MemoryThresholdsDUnitTest.java | 4 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 2 +-
.../ExceptionHandlingJUnitTest.java | 4 +-
.../mapInterface/MapFunctionalJUnitTest.java | 4 +-
.../mapInterface/PutAllGlobalLockJUnitTest.java | 4 +-
.../PutOperationContextJUnitTest.java | 4 +-
.../GetOperationContextImplJUnitTest.java | 4 +-
.../query/Bug32947ValueConstraintJUnitTest.java | 2 +-
.../gemfire/cache/query/CacheUtils.java | 2 +-
.../cache/query/PdxStringQueryJUnitTest.java | 2 +-
.../gemfire/cache/query/QueryTestUtils.java | 2 +-
.../cache/query/dunit/HelperTestCase.java | 4 +-
...itionedRegionCompactRangeIndexDUnitTest.java | 2 +-
.../QueryParamsAuthorizationDUnitTest.java | 3 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 2 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 4 +-
...esourceManagerWithQueryMonitorDUnitTest.java | 4 +-
.../functional/IUMRSingleRegionJUnitTest.java | 2 +-
.../functional/IndexCreationJUnitTest.java | 6 +-
.../MultiRegionIndexUsageJUnitTest.java | 2 +-
.../NegativeNumberQueriesJUnitTest.java | 2 +-
...syncIndexUpdaterThreadShutdownJUnitTest.java | 2 +-
.../index/CompactRangeIndexJUnitTest.java | 2 +-
.../index/CopyOnReadIndexDUnitTest.java | 4 +-
.../index/CopyOnReadIndexJUnitTest.java | 2 +-
.../DeclarativeIndexCreationJUnitTest.java | 2 +-
.../NewDeclarativeIndexCreationJUnitTest.java | 2 +-
.../index/PdxCopyOnReadQueryJUnitTest.java | 2 +-
...gRegionCreationIndexUpdateTypeJUnitTest.java | 2 +-
.../index/PutAllWithIndexPerfDUnitTest.java | 4 +-
.../cache/snapshot/RegionSnapshotJUnitTest.java | 3 +-
.../cache/snapshot/SnapshotTestCase.java | 4 +-
.../gemfire/cache30/Bug38741DUnitTest.java | 2 +-
.../gemfire/cache30/Bug40255JUnitTest.java | 2 +-
.../gemfire/cache30/Bug40662JUnitTest.java | 2 +-
.../gemfire/cache30/Bug44418JUnitTest.java | 4 +-
.../gemfire/cache30/CacheLogRollDUnitTest.java | 3 +-
...cheRegionsReliablityStatsCheckDUnitTest.java | 2 +-
.../gemfire/cache30/CacheXml45DUnitTest.java | 2 +-
.../cache30/CacheXmlGeode10DUnitTest.java | 2 +-
.../gemfire/cache30/CacheXmlTestCase.java | 2 +-
.../cache30/ClientMembershipDUnitTest.java | 4 +-
.../ClientRegisterInterestDUnitTest.java | 4 +-
.../cache30/ClientServerCCEDUnitTest.java | 3 +-
...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 2 +-
...dAckPersistentRegionCCEOffHeapDUnitTest.java | 2 +-
.../DistributedAckRegionCCEDUnitTest.java | 3 +-
...DistributedAckRegionCCEOffHeapDUnitTest.java | 2 +-
.../cache30/DistributedAckRegionDUnitTest.java | 2 +-
.../DistributedAckRegionOffHeapDUnitTest.java | 2 +-
.../DistributedMulticastRegionDUnitTest.java | 4 +-
.../DistributedNoAckRegionCCEDUnitTest.java | 2 +-
...stributedNoAckRegionCCEOffHeapDUnitTest.java | 2 +-
.../DistributedNoAckRegionOffHeapDUnitTest.java | 2 +-
.../cache30/GlobalRegionCCEDUnitTest.java | 3 +-
.../GlobalRegionCCEOffHeapDUnitTest.java | 2 +-
.../cache30/GlobalRegionOffHeapDUnitTest.java | 2 +-
.../OffHeapLRUEvictionControllerDUnitTest.java | 2 +-
.../PartitionedRegionOffHeapDUnitTest.java | 2 +-
.../gemfire/cache30/QueueMsgDUnitTest.java | 2 +-
.../gemfire/cache30/ReconnectDUnitTest.java | 3 +-
.../RegionReliabilityListenerDUnitTest.java | 2 +-
.../cache30/RegionReliabilityTestCase.java | 2 +-
.../gemfire/cache30/RequiredRolesDUnitTest.java | 2 +-
.../cache30/RolePerformanceDUnitTest.java | 2 +-
.../gemfire/cache30/SlowRecDUnitTest.java | 3 +-
.../gemfire/cache30/TXDistributedDUnitTest.java | 2 +-
.../AbstractLauncherIntegrationTest.java | 2 +-
.../AbstractLauncherIntegrationTestCase.java | 2 +-
.../distributed/AbstractLauncherTest.java | 2 +-
...stractServerLauncherIntegrationTestCase.java | 2 +-
.../distributed/DistributedMemberDUnitTest.java | 2 +-
.../DistributedSystemConnectPerf.java | 2 +-
.../distributed/DistributedSystemDUnitTest.java | 2 +-
.../distributed/HostedLocatorsDUnitTest.java | 2 +-
.../LauncherMemberMXBeanIntegrationTest.java | 4 +-
.../gemfire/distributed/LocatorDUnitTest.java | 2 +-
.../gemfire/distributed/LocatorJUnitTest.java | 6 +-
.../LocatorLauncherIntegrationTest.java | 2 +-
.../LocatorLauncherLocalIntegrationTest.java | 3 +-
.../LocatorLauncherRemoteIntegrationTest.java | 2 +-
.../distributed/LocatorLauncherTest.java | 2 +-
.../gemfire/distributed/RoleDUnitTest.java | 3 +-
.../ServerLauncherIntegrationTest.java | 2 +-
.../ServerLauncherLocalIntegrationTest.java | 9 +-
.../ServerLauncherRemoteIntegrationTest.java | 6 +-
.../gemfire/distributed/ServerLauncherTest.java | 2 +-
...rverLauncherWithProviderIntegrationTest.java | 2 +-
.../distributed/internal/Bug40751DUnitTest.java | 4 +-
.../ConsoleDistributionManagerDUnitTest.java | 2 +-
.../internal/DistributionConfigJUnitTest.java | 2 +-
.../internal/DistributionManagerDUnitTest.java | 3 +-
.../InternalDistributedSystemJUnitTest.java | 3 +-
.../gemfire/distributed/internal/LDM.java | 2 +-
.../internal/ProductUseLogDUnitTest.java | 2 +-
.../locks/DLockReentrantLockJUnitTest.java | 4 +-
.../membership/MembershipJUnitTest.java | 2 +-
.../gms/auth/GMSAuthenticatorJUnitTest.java | 2 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +-
.../locator/GMSLocatorRecoveryJUnitTest.java | 2 +-
.../gms/membership/StatRecorderJUnitTest.java | 4 +-
.../messenger/JGroupsMessengerJUnitTest.java | 2 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 2 +-
.../TcpServerBackwardCompatDUnitTest.java | 3 +-
.../gemfire/disttx/CacheMapDistTXDUnitTest.java | 2 +-
.../gemfire/disttx/DistTXExpiryJUnitTest.java | 6 +-
.../gemfire/disttx/DistTXJUnitTest.java | 2 +-
.../disttx/DistTXManagerImplJUnitTest.java | 8 +-
.../gemfire/disttx/DistTXOrderDUnitTest.java | 2 +-
.../DistTXReleasesOffHeapOnCloseJUnitTest.java | 10 +-
.../disttx/DistTXRestrictionsDUnitTest.java | 2 +-
.../disttx/DistTXWithDeltaDUnitTest.java | 2 +-
.../gemfire/disttx/DistTXWriterJUnitTest.java | 6 +-
.../disttx/DistTXWriterOOMEJUnitTest.java | 6 +-
.../gemfire/disttx/PRDistTXDUnitTest.java | 2 +-
.../gemfire/disttx/PRDistTXJUnitTest.java | 6 +-
.../disttx/PRDistTXWithVersionsDUnitTest.java | 2 +-
...entPartitionedRegionWithDistTXDUnitTest.java | 2 +-
.../internal/AbstractConfigJUnitTest.java | 3 +-
.../gemfire/internal/Bug51616JUnitTest.java | 4 +-
.../internal/GemFireStatSamplerJUnitTest.java | 3 +-
.../GemFireVersionIntegrationJUnitTest.java | 2 +-
.../gemfire/internal/InlineKeyJUnitTest.java | 4 +-
.../gemfire/internal/JSSESocketJUnitTest.java | 2 +-
.../internal/JarClassLoaderJUnitTest.java | 2 +-
.../gemfire/internal/JarDeployerDUnitTest.java | 5 +-
.../internal/PdxDeleteFieldDUnitTest.java | 3 +-
.../internal/PdxDeleteFieldJUnitTest.java | 4 +-
.../gemfire/internal/PdxRenameDUnitTest.java | 3 +-
.../gemfire/internal/PdxRenameJUnitTest.java | 4 +-
...lityShouldUseArrayEqualsIntegrationTest.java | 4 +-
.../internal/SSLConfigIntegrationJUnitTest.java | 2 +-
.../gemfire/internal/SSLConfigJUnitTest.java | 2 +-
.../gemfire/internal/cache/BackupJUnitTest.java | 2 +-
.../internal/cache/Bug33726JUnitTest.java | 2 +-
.../internal/cache/Bug34583JUnitTest.java | 2 +-
.../internal/cache/Bug37244JUnitTest.java | 2 +-
.../internal/cache/Bug39079DUnitTest.java | 4 +-
.../internal/cache/Bug41091DUnitTest.java | 3 +-
.../internal/cache/Bug41957DUnitTest.java | 4 +-
.../internal/cache/Bug45934DUnitTest.java | 2 +-
.../internal/cache/Bug48182JUnitTest.java | 8 +-
.../cache/CacheLifecycleListenerJUnitTest.java | 4 +-
.../internal/cache/CacheServiceJUnitTest.java | 2 +-
...ssagesRegionCreationAndDestroyJUnitTest.java | 2 +-
.../cache/ClientServerGetAllDUnitTest.java | 2 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 2 +-
.../cache/ClientServerTransactionDUnitTest.java | 6 +-
.../cache/ConcurrentMapLocalJUnitTest.java | 4 +-
.../cache/ConcurrentMapOpsDUnitTest.java | 2 +-
.../cache/ConnectDisconnectDUnitTest.java | 3 +-
.../cache/DeltaPropagationDUnitTest.java | 2 +-
.../cache/DeltaPropagationStatsDUnitTest.java | 2 +-
.../cache/DiskOfflineCompactionJUnitTest.java | 3 +-
.../internal/cache/DiskOldAPIsJUnitTest.java | 3 +-
.../cache/DiskRegCacheXmlJUnitTest.java | 3 +-
.../DiskRegCachexmlGeneratorJUnitTest.java | 3 +-
.../cache/DiskRegionClearJUnitTest.java | 4 +-
.../DiskRegionIllegalArguementsJUnitTest.java | 7 +-
...iskRegionIllegalCacheXMLvaluesJUnitTest.java | 2 +-
.../internal/cache/DiskRegionTestingBase.java | 7 +-
.../cache/DiskStoreFactoryJUnitTest.java | 3 +-
...DistrbutedRegionProfileOffHeapDUnitTest.java | 2 +-
.../cache/FixedPRSinglehopDUnitTest.java | 2 +-
.../internal/cache/GridAdvisorDUnitTest.java | 3 +-
.../HAOverflowMemObjectSizerDUnitTest.java | 4 +-
.../cache/IncrementalBackupDUnitTest.java | 2 +-
.../internal/cache/InterruptDiskJUnitTest.java | 3 +-
...InterruptsConserveSocketsFalseDUnitTest.java | 2 +-
.../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 2 +-
...victionAlgoMemoryEnabledRegionJUnitTest.java | 2 +-
.../internal/cache/MapClearGIIDUnitTest.java | 4 +-
.../internal/cache/MapInterfaceJUnitTest.java | 4 +-
.../cache/OffHeapEvictionDUnitTest.java | 2 +-
.../cache/OffHeapEvictionStatsDUnitTest.java | 2 +-
.../cache/OfflineSnapshotJUnitTest.java | 2 +-
.../cache/P2PDeltaPropagationDUnitTest.java | 2 +-
.../cache/PRConcurrentMapOpsJUnitTest.java | 2 +-
.../cache/PRDataStoreMemoryJUnitTest.java | 2 +-
.../PRDataStoreMemoryOffHeapJUnitTest.java | 2 +-
...dRegionAPIConserveSocketsFalseDUnitTest.java | 2 +-
...gionBucketCreationDistributionDUnitTest.java | 2 +-
...rtitionedRegionCacheXMLExampleDUnitTest.java | 2 +-
.../PartitionedRegionDataStoreJUnitTest.java | 2 +-
...nedRegionLocalMaxMemoryOffHeapDUnitTest.java | 2 +-
...rtitionedRegionOffHeapEvictionDUnitTest.java | 2 +-
...artitionedRegionRedundancyZoneDUnitTest.java | 2 +-
.../PartitionedRegionSingleHopDUnitTest.java | 2 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 2 +-
.../cache/PartitionedRegionTestHelper.java | 4 +-
.../PersistentPartitionedRegionJUnitTest.java | 2 +-
.../internal/cache/RegionListenerJUnitTest.java | 2 +-
.../cache/RemoteTransactionDUnitTest.java | 2 +-
.../internal/cache/RunCacheInOldGemfire.java | 6 +-
.../internal/cache/SingleHopStatsDUnitTest.java | 4 +-
.../internal/cache/TXManagerImplJUnitTest.java | 4 +-
.../cache/TXReservationMgrJUnitTest.java | 4 +-
.../cache/TombstoneCreationJUnitTest.java | 2 +-
.../cache/TransactionsWithDeltaDUnitTest.java | 2 +-
.../internal/cache/UpdateVersionJUnitTest.java | 2 +-
.../cache/control/MemoryMonitorJUnitTest.java | 2 +-
.../control/MemoryMonitorOffHeapJUnitTest.java | 2 +-
.../control/RebalanceOperationDUnitTest.java | 2 +-
...ltiThreadedOplogPerJUnitPerformanceTest.java | 2 +-
.../cache/execute/Bug51193DUnitTest.java | 4 +-
...ributedRegionFunctionExecutionDUnitTest.java | 4 +-
.../execute/FunctionServiceStatsDUnitTest.java | 4 +-
.../MemberFunctionExecutionDUnitTest.java | 2 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 3 +-
...egionFunctionExecutionFailoverDUnitTest.java | 2 +-
.../cache/execute/PRClientServerTestBase.java | 4 +-
.../execute/PRFunctionExecutionDUnitTest.java | 4 +-
.../cache/ha/BlockingHARegionJUnitTest.java | 2 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 4 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 7 +-
.../internal/cache/ha/Bug48879DUnitTest.java | 2 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 4 +-
.../internal/cache/ha/FailoverDUnitTest.java | 4 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 4 +-
.../internal/cache/ha/HAClearDUnitTest.java | 4 +-
.../cache/ha/HAConflationDUnitTest.java | 4 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 4 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 4 +-
.../internal/cache/ha/HAGIIDUnitTest.java | 4 +-
.../cache/ha/HARQAddOperationJUnitTest.java | 2 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 2 +-
.../internal/cache/ha/HARegionJUnitTest.java | 2 +-
.../cache/ha/HARegionQueueJUnitTest.java | 4 +-
.../ha/HARegionQueueStartStopJUnitTest.java | 4 +-
.../cache/ha/HARegionQueueStatsJUnitTest.java | 2 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 2 +-
.../ha/OperationsPropagationDUnitTest.java | 4 +-
.../internal/cache/ha/PutAllDUnitTest.java | 4 +-
.../internal/cache/ha/StatsBugDUnitTest.java | 4 +-
.../cache/locks/TXLockServiceDUnitTest.java | 2 +-
.../internal/cache/lru/LRUClockJUnitTest.java | 6 +-
.../cache/lru/TransactionsWithOverflowTest.java | 4 +-
.../cache/partitioned/Bug43684DUnitTest.java | 2 +-
.../cache/partitioned/Bug47388DUnitTest.java | 2 +-
.../cache/partitioned/Bug51400DUnitTest.java | 2 +-
.../PersistentPartitionedRegionDUnitTest.java | 4 +-
.../PersistentRecoveryOrderDUnitTest.java | 2 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 2 +-
...mpatibilityHigherVersionClientDUnitTest.java | 4 +-
.../cache/tier/sockets/Bug36269DUnitTest.java | 4 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 4 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 4 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 2 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 4 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 4 +-
.../cache/tier/sockets/Bug37805DUnitTest.java | 2 +-
.../CacheServerMaxConnectionsJUnitTest.java | 4 +-
.../cache/tier/sockets/CacheServerTestUtil.java | 6 +-
.../CacheServerTransactionsDUnitTest.java | 4 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 4 +-
.../tier/sockets/ClientConflationDUnitTest.java | 2 +-
.../sockets/ClientHealthMonitorJUnitTest.java | 4 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 2 +-
.../ClientServerForceInvalidateDUnitTest.java | 4 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 4 +-
.../cache/tier/sockets/ConflationDUnitTest.java | 4 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 4 +-
.../DataSerializerPropogationDUnitTest.java | 4 +-
.../DestroyEntryPropagationDUnitTest.java | 4 +-
.../sockets/DurableClientBug39997DUnitTest.java | 2 +-
.../DurableClientQueueSizeDUnitTest.java | 2 +-
.../DurableClientReconnectDUnitTest.java | 2 +-
.../sockets/DurableClientStatsDUnitTest.java | 2 +-
.../sockets/DurableRegistrationDUnitTest.java | 2 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 2 +-
.../sockets/EventIDVerificationDUnitTest.java | 4 +-
...ForceInvalidateOffHeapEvictionDUnitTest.java | 2 +-
.../cache/tier/sockets/HAInterestTestCase.java | 4 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 4 +-
.../InstantiatorPropagationDUnitTest.java | 4 +-
.../tier/sockets/InterestListDUnitTest.java | 2 +-
.../sockets/InterestListEndpointDUnitTest.java | 4 +-
.../sockets/InterestListRecoveryDUnitTest.java | 4 +-
.../sockets/InterestRegrListenerDUnitTest.java | 2 +-
.../sockets/InterestResultPolicyDUnitTest.java | 4 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 2 +-
.../tier/sockets/RedundancyLevelTestBase.java | 4 +-
.../tier/sockets/RegionCloseDUnitTest.java | 4 +-
...erInterestBeforeRegionCreationDUnitTest.java | 4 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 4 +-
.../sockets/ReliableMessagingDUnitTest.java | 4 +-
.../sockets/UnregisterInterestDUnitTest.java | 4 +-
.../sockets/UpdatePropagationDUnitTest.java | 4 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 4 +-
.../cache/wan/AsyncEventQueueTestBase.java | 3 +-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 2 +-
.../AsyncEventQueueValidationsJUnitTest.java | 2 +-
.../CompressionCacheConfigDUnitTest.java | 2 +-
...ompressionCacheListenerOffHeapDUnitTest.java | 2 +-
...ressionRegionOperationsOffHeapDUnitTest.java | 2 +-
.../datasource/AbstractPoolCacheJUnitTest.java | 7 +-
.../internal/datasource/CleanUpJUnitTest.java | 2 +-
.../ConnectionPoolCacheImplJUnitTest.java | 2 +-
.../datasource/ConnectionPoolingJUnitTest.java | 2 +-
.../datasource/DataSourceFactoryJUnitTest.java | 2 +-
.../internal/datasource/RestartJUnitTest.java | 2 +-
.../internal/jta/BlockingTimeOutJUnitTest.java | 2 +-
.../gemfire/internal/jta/CacheUtils.java | 2 +-
.../internal/jta/DataSourceJTAJUnitTest.java | 2 +-
.../internal/jta/ExceptionJUnitTest.java | 2 +-
.../jta/GlobalTransactionJUnitTest.java | 2 +-
.../internal/jta/JtaIntegrationJUnitTest.java | 2 +-
.../internal/jta/TransactionImplJUnitTest.java | 2 +-
.../jta/TransactionManagerImplJUnitTest.java | 2 +-
.../jta/TransactionTimeOutJUnitTest.java | 2 +-
.../jta/UserTransactionImplJUnitTest.java | 2 +-
.../internal/jta/dunit/ExceptionsDUnitTest.java | 4 +-
.../jta/dunit/IdleTimeOutDUnitTest.java | 4 +-
.../jta/dunit/LoginTimeOutDUnitTest.java | 2 +-
.../jta/dunit/MaxPoolSizeDUnitTest.java | 4 +-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 4 +-
.../dunit/TxnManagerMultiThreadDUnitTest.java | 4 +-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 5 +-
.../DistributedSystemLogFileJUnitTest.java | 2 +-
.../logging/LocatorLogFileJUnitTest.java | 6 +-
.../logging/LogWriterPerformanceTest.java | 2 +-
.../CustomConfigWithCacheIntegrationTest.java | 2 +-
.../internal/offheap/InlineKeyJUnitTest.java | 8 +-
.../internal/offheap/OffHeapIndexJUnitTest.java | 8 +-
.../internal/offheap/OffHeapRegionBase.java | 8 +-
.../offheap/OffHeapValidationJUnitTest.java | 8 +-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 3 +-
.../TxReleasesOffHeapOnCloseJUnitTest.java | 8 +-
.../statistics/StatisticsDUnitTest.java | 2 +-
.../internal/stats50/AtomicStatsJUnitTest.java | 2 +-
.../ConcurrentHashMapIteratorJUnitTest.java | 2 +-
.../management/CacheManagementDUnitTest.java | 2 +-
.../management/ClientHealthStatsDUnitTest.java | 3 +-
.../DataBrowserJSONValidationJUnitTest.java | 5 +-
.../management/LocatorManagementDUnitTest.java | 2 +-
.../gemfire/management/ManagementTestBase.java | 3 +-
.../management/OffHeapManagementDUnitTest.java | 2 +-
.../gemfire/management/TypedJsonJUnitTest.java | 2 +-
...ersalMembershipListenerAdapterDUnitTest.java | 3 +-
.../stats/DistributedSystemStatsJUnitTest.java | 3 +-
.../bean/stats/MBeanStatsTestCase.java | 5 +-
.../internal/cli/CliUtilDUnitTest.java | 2 +-
.../cli/HeadlessGfshIntegrationTest.java | 3 +-
.../cli/commands/CliCommandTestBase.java | 3 +-
.../cli/commands/ConfigCommandsDUnitTest.java | 3 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 4 +-
.../cli/commands/DeployCommandsDUnitTest.java | 4 +-
.../commands/DiskStoreCommandsDUnitTest.java | 4 +-
.../cli/commands/FunctionCommandsDUnitTest.java | 3 +-
.../commands/GemfireDataCommandsDUnitTest.java | 2 +-
...WithCacheLoaderDuringCacheMissDUnitTest.java | 3 +-
.../HTTPServiceSSLSupportJUnitTest.java | 2 +-
.../commands/HelpCommandsIntegrationTest.java | 2 +-
.../cli/commands/IndexCommandsDUnitTest.java | 4 +-
...stAndDescribeDiskStoreCommandsDUnitTest.java | 6 +-
.../ListAndDescribeRegionDUnitTest.java | 6 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 3 +-
.../cli/commands/MemberCommandsDUnitTest.java | 4 +-
.../MiscellaneousCommandsDUnitTest.java | 3 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 3 +-
.../cli/commands/QueueCommandsDUnitTest.java | 8 +-
.../SharedConfigurationCommandsDUnitTest.java | 3 +-
.../cli/commands/ShowDeadlockDUnitTest.java | 5 +-
.../cli/commands/ShowMetricsDUnitTest.java | 2 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 6 +-
.../cli/commands/UserCommandsDUnitTest.java | 5 +-
.../functions/DataCommandFunctionJUnitTest.java | 2 +-
.../SharedConfigurationDUnitTest.java | 3 +-
.../SharedConfigurationUsingDirDUnitTest.java | 3 +-
.../utils/XmlUtilsAddNewNodeJUnitTest.java | 2 +-
.../internal/pulse/TestClientIdsDUnitTest.java | 4 +-
.../pulse/TestSubscriptionsDUnitTest.java | 4 +-
.../security/ExampleJSONAuthorization.java | 2 +-
.../GeodeSecurityUtilCustomRealmJUnitTest.java | 2 +-
.../GeodeSecurityUtilWithIniFileJUnitTest.java | 2 +-
.../internal/security/JSONAuthorization.java | 2 +-
.../JsonAuthorizationCacheStartRule.java | 4 +-
.../internal/security/MultiUserDUnitTest.java | 3 +-
.../internal/security/ShiroCacheStartRule.java | 3 +-
.../ReadOpFileAccessControllerJUnitTest.java | 4 +-
.../DomainObjectsAsValuesJUnitTest.java | 2 +-
.../GemcachedDevelopmentJUnitTest.java | 2 +-
.../gemfire/memcached/IntegrationJUnitTest.java | 2 +-
.../gemfire/pdx/AutoSerializableJUnitTest.java | 2 +-
.../ClientsWithVersioningRetryDUnitTest.java | 2 +-
.../pdx/DistributedSystemIdDUnitTest.java | 3 +-
.../gemfire/pdx/JSONFormatterJUnitTest.java | 2 +-
.../pdx/JSONPdxClientServerDUnitTest.java | 2 +-
.../gemfire/pdx/PdxAttributesJUnitTest.java | 2 +-
.../gemfire/pdx/PdxClientServerDUnitTest.java | 2 +-
.../pdx/PdxInstanceFactoryJUnitTest.java | 2 +-
.../gemfire/pdx/PdxInstanceJUnitTest.java | 2 +-
.../gemfire/pdx/PdxSerializableJUnitTest.java | 2 +-
.../gemfire/pdx/PdxStringJUnitTest.java | 2 +-
.../gemstone/gemfire/redis/AuthJUnitTest.java | 6 +-
.../gemfire/redis/ConcurrentStartTest.java | 4 +-
.../gemstone/gemfire/redis/HashesJUnitTest.java | 2 +-
.../gemstone/gemfire/redis/ListsJUnitTest.java | 2 +-
.../gemfire/redis/RedisDistDUnitTest.java | 8 +-
.../gemstone/gemfire/redis/SetsJUnitTest.java | 2 +-
.../gemfire/redis/SortedSetsJUnitTest.java | 2 +-
.../gemfire/redis/StringsJunitTest.java | 2 +-
.../security/ClientAuthenticationTestUtils.java | 2 +-
.../security/ClientAuthorizationTestCase.java | 2 +-
.../security/P2PAuthenticationDUnitTest.java | 10 +-
.../gemfire/security/SecurityTestUtils.java | 2 +-
.../generator/LdapUserCredentialGenerator.java | 2 +-
.../generator/SSLCredentialGenerator.java | 3 +-
.../test/dunit/DistributedTestUtils.java | 2 +-
.../gemfire/test/dunit/LogWriterUtils.java | 2 +-
.../cache/internal/JUnit4CacheTestCase.java | 2 +-
.../internal/JUnit4DistributedTestCase.java | 6 +-
.../test/dunit/standalone/DUnitLauncher.java | 2 +-
.../test/dunit/standalone/ProcessManager.java | 2 +-
...ingGetPropertiesDisconnectsAllDUnitTest.java | 2 +-
...ingGetPropertiesDisconnectsAllDUnitTest.java | 2 +-
.../gemfire/test/golden/GoldenTestCase.java | 4 +-
.../gemfire/test/process/ProcessWrapper.java | 2 +-
.../com/main/WANBootStrapping_Site1_Add.java | 2 +-
.../com/main/WANBootStrapping_Site1_Remove.java | 4 +-
.../com/main/WANBootStrapping_Site2_Add.java | 2 +-
.../com/main/WANBootStrapping_Site2_Remove.java | 2 +-
.../gemfire/cache/query/cq/CQJUnitTest.java | 2 +-
.../cq/dunit/CqDataUsingPoolDUnitTest.java | 2 +-
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 4 +-
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 4 +-
.../cache/query/cq/dunit/CqStateDUnitTest.java | 3 +-
.../PartitionedRegionCqQueryDUnitTest.java | 2 +-
.../cache/query/dunit/PdxQueryCQTestBase.java | 4 +-
.../cache/snapshot/ClientSnapshotDUnitTest.java | 2 +-
.../cache/PRDeltaPropagationDUnitTest.java | 4 +-
.../internal/cache/PutAllCSDUnitTest.java | 4 +-
.../cache/RemoteCQTransactionDUnitTest.java | 2 +-
.../internal/cache/ha/CQListGIIDUnitTest.java | 4 +-
.../cache/ha/HADispatcherDUnitTest.java | 4 +-
.../sockets/ClientToServerDeltaDUnitTest.java | 2 +-
.../DeltaPropagationWithCQDUnitTest.java | 6 +-
...ToRegionRelationCQRegistrationDUnitTest.java | 4 +-
.../tier/sockets/DurableClientTestCase.java | 2 +-
.../CacheServerManagementDUnitTest.java | 3 +-
.../cli/commands/ClientCommandsDUnitTest.java | 2 +-
.../DurableClientCommandsDUnitTest.java | 2 +-
.../security/ClientAuthzObjectModDUnitTest.java | 8 +-
.../gemfire/security/MultiUserAPIDUnitTest.java | 4 +-
...ceneIndexCreationOffHeapIntegrationTest.java | 4 +-
.../cache/lucene/LuceneIntegrationTest.java | 8 +-
.../LuceneIndexRecoveryHAIntegrationTest.java | 2 +-
.../LuceneServiceImplIntegrationTest.java | 2 +-
.../IndexRepositoryImplPerformanceTest.java | 2 +-
...neIndexXmlGeneratorIntegrationJUnitTest.java | 2 +-
...uceneIndexXmlParserIntegrationJUnitTest.java | 2 +-
.../pulse/testbed/GemFireDistributedSystem.java | 2 +-
.../gemfire/tools/pulse/tests/Server.java | 2 +-
.../util/AutoBalancerIntegrationJUnitTest.java | 2 +-
.../internal/cache/UpdateVersionDUnitTest.java | 3 +-
.../cache/wan/CacheClientNotifierDUnitTest.java | 2 +-
.../gemfire/internal/cache/wan/WANTestBase.java | 3 +-
.../cache/wan/disttx/DistTXWANDUnitTest.java | 2 +-
.../wan/misc/NewWanAuthenticationDUnitTest.java | 3 +-
.../SenderWithTransportFilterDUnitTest.java | 4 +-
.../wan/misc/WANConfigurationJUnitTest.java | 2 +-
.../wan/misc/WANLocatorServerDUnitTest.java | 3 +-
...llelGatewaySenderQueueOverflowDUnitTest.java | 4 +-
.../SerialGatewaySenderQueueDUnitTest.java | 4 +-
.../wan/wancommand/WANCommandTestBase.java | 3 +-
...anCommandCreateGatewayReceiverDUnitTest.java | 4 +-
.../WanCommandCreateGatewaySenderDUnitTest.java | 2 +-
...WanCommandGatewayReceiverStartDUnitTest.java | 4 +-
.../WanCommandGatewayReceiverStopDUnitTest.java | 4 +-
.../WanCommandGatewaySenderStartDUnitTest.java | 2 +-
.../WanCommandGatewaySenderStopDUnitTest.java | 2 +-
.../wan/wancommand/WanCommandListDUnitTest.java | 2 +-
.../WanCommandPauseResumeDUnitTest.java | 2 +-
.../wancommand/WanCommandStatusDUnitTest.java | 4 +-
.../ClusterConfigurationDUnitTest.java | 2 +-
.../ConnectCommandWithHttpAndSSLDUnitTest.java | 2 +-
585 files changed, 1596 insertions(+), 1187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
index 225379a..5facd2f 100644
--- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
+++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.modules.util.RegionConfiguration;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
public class ClientServerRegionFactoryDelegate extends RegionFactoryDelegate {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
index e217195..d3c098d 100644
--- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
+++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class RegionFactoryDelegate {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
index 88ffe19..d92d688 100644
--- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
+++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
@@ -44,7 +44,7 @@ import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
index cde19c6..f2fb584 100644
--- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
+++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
@@ -35,7 +35,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.logging.Level;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Ignore("Can this test be deleted?")
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
index c9b9da6..74c7152 100644
--- a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
+++ b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
@@ -36,7 +36,7 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public abstract class AbstractCache {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
index fac2472..292f5ca 100644
--- a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
@@ -36,7 +36,7 @@ import java.beans.PropertyChangeEvent;
import java.io.IOException;
import java.io.PrintWriter;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static junit.framework.Assert.*;
public abstract class TestSessionsBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
index b8c9cca..9bec901 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.AbstractLauncher.Status;
import com.gemstone.gemfire.distributed.LocatorLauncher.Builder;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.process.ProcessType;
import com.gemstone.gemfire.internal.process.ProcessUtils;
@@ -39,7 +38,7 @@ import java.io.File;
import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* These tests are part of assembly as they require the REST war file to be present.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index d468a4a..a0d65b0 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -64,7 +64,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 97251a6..54460c3 100755
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.ServerLauncher;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.DistributionLocator;
import com.gemstone.gemfire.internal.lang.StringUtils;
@@ -35,7 +34,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index e1bd685..93cb31a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.ClassBuilder;
import com.gemstone.gemfire.internal.JarDeployer;
@@ -51,7 +50,7 @@ import java.util.Set;
import static com.gemstone.gemfire.cache.RegionShortcut.PARTITION;
import static com.gemstone.gemfire.cache.RegionShortcut.REPLICATE;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
import static com.gemstone.gemfire.internal.FileUtil.delete;
import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
index c82b481..fdba506 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
@@ -20,7 +20,6 @@ import com.fasterxml.jackson.core.JsonParser.Feature;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.GemFireVersion;
import com.gemstone.gemfire.internal.util.IOUtils;
@@ -50,7 +49,7 @@ import java.io.InputStreamReader;
import java.text.SimpleDateFormat;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index 52d4f09..eca5656 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -20,7 +20,6 @@ package com.gemstone.gemfire.rest.internal.web.controllers;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.GemFireVersion;
@@ -47,7 +46,7 @@ import java.util.List;
import java.util.Properties;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class RestAPITestBase extends DistributedTestCase {
protected Cache cache = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 27e2780..c0b5c79 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -25,7 +25,6 @@ import com.gemstone.gemfire.cache.client.internal.LocatorTestBase;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.server.ServerLoadProbe;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -50,7 +49,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Dunit Test containing inter - operations between REST Client and Gemfire cache client
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index cca3959..901f15f 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
import org.apache.http.client.methods.CloseableHttpResponse;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index 3bceea5..f10d96b 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -39,7 +39,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(IntegrationTest.class)
public class RestAPIsQueryAndFEJUnitTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index af0318b..e82d198 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
import com.gemstone.gemfire.cache.client.internal.LocatorTestBase;
import com.gemstone.gemfire.cache.server.CacheServer;
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.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
@@ -53,7 +52,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index 1c53e42..303242b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -17,12 +17,11 @@
package com.gemstone.gemfire.admin;
import com.gemstone.gemfire.admin.internal.InetAddressUtil;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 38b9218..a5ca836 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -49,7 +49,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Represents a GemFire distributed system for remote administration/management.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
index 1994f05..2653e8f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.admin.CacheServerConfig;
import com.gemstone.gemfire.admin.CacheVmConfig;
import com.gemstone.gemfire.internal.admin.GemFireVM;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* An implementation of <code>CacheVmConfig</code>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
index ee6f597..114dc5b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.internal.admin.GemFireVM;
import com.gemstone.gemfire.internal.admin.remote.RemoteApplicationVM;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Implements the administrative interface to a cache server.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
index d40addc..d85a610 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
@@ -32,7 +32,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* An implementation of the configuration object for an
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
index 818e45f..1a73767 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import java.net.InetAddress;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Provides an implementation of
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
index 0c1eab5..3f944d6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
@@ -32,7 +32,7 @@ import java.io.File;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Implements the actual administration (starting, stopping, etc.) of
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
index fdfd86d..5e26d61 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.admin.internal;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import org.xml.sax.*;
@@ -58,7 +58,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
public static final String REMOTE_COMMAND = "remote-command";
/** The name of the <code>locators</code> element. */
- public static final String LOCATORS = SystemConfigurationProperties.LOCATORS;
+ public static final String LOCATORS = DistributedSystemConfigProperties.LOCATORS;
/** The name of the <code>ssl</code> element. */
public static final String SSL = "ssl";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
index 7b01a62..4cd93b1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.admin.ConfigurationParameter;
import com.gemstone.gemfire.admin.ManagedEntityConfig;
import com.gemstone.gemfire.internal.admin.GemFireVM;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
/**
* A <code>SystemMember</code> that is also managed (or manageable) by
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
index 0f56d0f..bffb59f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
@@ -35,7 +35,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.StringTokenizer;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Provides the JMX Agent configuration properties.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
index 9e80cf3..cf90a3e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.admin.jmx.internal;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.admin.*;
import com.gemstone.gemfire.admin.jmx.Agent;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
index 738361d..250df74 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
@@ -30,8 +30,8 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Factory class used to create the singleton {@link ClientCache client cache} and connect to one or more GemFire Cache Servers. If the application wants to connect to GemFire as a peer it should use {@link com.gemstone.gemfire.cache.CacheFactory} instead.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
index 94c8ecf..1d3360f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.InternalGemFireError;
import com.gemstone.gemfire.cache.client.ServerOperationException;
import com.gemstone.gemfire.distributed.DistributedMember;
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.ServerLocation;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
@@ -45,7 +44,7 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Authenticates this client (or a user) on a server. This op ideally should get
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
index b9f25d7..3844dbb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
@@ -54,8 +54,6 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-
/**
* Manages the client side of client to server connections
* and client queues.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
index 7178ca6..ec1a4f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
@@ -46,7 +46,7 @@ import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The AbstractLauncher class is a base class for implementing various launchers to construct and run different GemFire
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
index 674f46d..092131b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -43,7 +43,7 @@ import java.net.URL;
import java.util.*;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* A "connection" to a GemFire distributed system. A
[33/55] [abbrv] incubator-geode git commit: GEODE-1463: Legacy
OperationContexts do not set the appropriate Shiro permission tuple
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/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 fcbf04e..cb0507a 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
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.security.AccessControl;
@@ -124,9 +125,9 @@ public class JSONAuthorization implements AccessControl, Authenticator {
for (JsonNode op : r.get("operationsAllowed")) {
String[] parts = op.asText().split(":");
if (regionNames == null) {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*"));
+ role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*", false));
} else {
- role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames));
+ role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames, false));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContextJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContextJUnitTest.java
index 46c0e1d..5b07bdf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContextJUnitTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
import com.gemstone.gemfire.cache.operations.OperationContext;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.cache.operations.OperationContext.Resource;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
import org.apache.shiro.authz.permission.WildcardPermission;
@@ -49,12 +50,12 @@ public class ResourceOperationContextJUnitTest {
@Test
public void testConstructor(){
- context = new ResourceOperationContext(null, null, null);
+ context = new ResourceOperationContext();
assertEquals(Resource.NULL, context.getResource());
assertEquals(OperationCode.NULL, context.getOperationCode());
assertEquals(OperationContext.ALL_REGIONS, context.getRegionName());
- context = new ResourceOperationContext(null, null);
+ context = new ResourceOperationContext();
assertEquals(Resource.NULL, context.getResource());
assertEquals(OperationCode.NULL, context.getOperationCode());
assertEquals(OperationContext.ALL_REGIONS, context.getRegionName());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/TestCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/TestCommand.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/TestCommand.java
index 2ddc6ee..0f13246 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/TestCommand.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/TestCommand.java
@@ -22,6 +22,7 @@ import java.util.List;
import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.cache.operations.internal.ResourceOperationContext;
import org.apache.shiro.authz.Permission;
public class TestCommand {
@@ -41,23 +42,23 @@ public class TestCommand {
private static List<TestCommand> testCommands = new ArrayList<>();
- static{
+ static {
init();
}
-
+
private final String command;
private final OperationContext permission;
-
+
public TestCommand(String command, OperationContext permission) {
this.command = command;
this.permission = permission;
}
-
+
private static void createTestCommand(String command, OperationContext permission) {
TestCommand instance = new TestCommand(command, permission);
testCommands.add(instance);
}
-
+
public String getCommand() {
return this.command;
}
@@ -66,13 +67,13 @@ public class TestCommand {
return this.permission;
}
- public static List<TestCommand> getCommands(){
+ public static List<TestCommand> getCommands() {
return testCommands;
}
- public static List<TestCommand> getPermittedCommands(Permission permission){
+ public static List<TestCommand> getPermittedCommands(Permission permission) {
List<TestCommand> result = new ArrayList<>();
- for(TestCommand testCommand:testCommands){
+ for (TestCommand testCommand : testCommands) {
OperationContext cPerm = testCommand.getPermission();
if(cPerm!=null && permission.implies(cPerm)){
result.add(testCommand);
@@ -225,5 +226,5 @@ public class TestCommand {
createTestCommand("disconnect", null);
//Misc commands
//createTestCommand("shutdown", clusterManage);
- };
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/670fae4b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index 89305ac..4e951af 100755
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -130,6 +130,7 @@ com/gemstone/gemfire/cache/execute/FunctionException,true,4893171227542647452
com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException,true,1,id:com/gemstone/gemfire/distributed/DistributedMember
com/gemstone/gemfire/cache/operations/OperationContext$OperationCode,false
com/gemstone/gemfire/cache/operations/OperationContext$Resource,false
+com/gemstone/gemfire/cache/operations/internal/ResourceOperationContext,false,isPostOperation:boolean,opResult:java/lang/Object,operation:com/gemstone/gemfire/cache/operations/OperationContext$OperationCode,regionName:java/lang/String,resource:com/gemstone/gemfire/cache/operations/OperationContext$Resource
com/gemstone/gemfire/cache/partition/PartitionNotAvailableException,true,1
com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException,true,-2629287782021455875
com/gemstone/gemfire/cache/persistence/PartitionOfflineException,true,-6471045959318795870,offlineMembers:java/util/Set
@@ -257,7 +258,6 @@ com/gemstone/gemfire/internal/admin/CompoundRegionSnapshot,true,6295026394298398
com/gemstone/gemfire/internal/admin/StatAlert,true,5725457607122449170,definitionId:int,time:java/util/Date,values:java/lang/Number[]
com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId,true,6587390186971937865,bindAddress:java/lang/String,host:java/net/InetAddress,hostnameForClients:java/lang/String,peerLocator:boolean,port:int,serverLocator:boolean
com/gemstone/gemfire/internal/admin/remote/EntryValueNodeImpl,false,fields:com/gemstone/gemfire/internal/admin/remote/EntryValueNodeImpl[],name:java/lang/String,primitive:boolean,primitiveVal:java/lang/Object,type:java/lang/String
-com/gemstone/gemfire/internal/cache/AbstractRegionMap$1,false,this$0:com/gemstone/gemfire/internal/cache/AbstractRegionMap
com/gemstone/gemfire/internal/cache/BackupLock,false,backupDone:java/util/concurrent/locks/Condition,backupThread:java/lang/Thread,isBackingUp:boolean
com/gemstone/gemfire/internal/cache/BucketAdvisor$SetFromMap,true,2454657854757543876,m:java/util/Map
com/gemstone/gemfire/internal/cache/BucketNotFoundException,false
@@ -282,7 +282,6 @@ com/gemstone/gemfire/internal/cache/ForceableLinkedBlockingQueue,true,-690393397
com/gemstone/gemfire/internal/cache/GemFireCacheImpl$3,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
com/gemstone/gemfire/internal/cache/GemFireCacheImpl$4,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
com/gemstone/gemfire/internal/cache/GemFireCacheImpl$5,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
-com/gemstone/gemfire/internal/cache/GemFireCacheImpl$6,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
com/gemstone/gemfire/internal/cache/IdentityArrayList,true,449125332499184497,size:int,wrapped:boolean
com/gemstone/gemfire/internal/cache/IncomingGatewayStatus,true,-4579815367602658353,_memberId:java/lang/String,_socketAddress:java/net/InetAddress,_socketPort:int
com/gemstone/gemfire/internal/cache/InitialImageOperation$GIIStatus,false
[08/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
index d12a31c..54bc4a4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.util.RegionRoleListenerAdapter;
import com.gemstone.gemfire.distributed.Role;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.membership.InternalRole;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -27,6 +26,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
import java.util.Set;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Tests the functionality of the {@link RegionRoleListener} class.
*
@@ -64,7 +64,7 @@ public class RegionReliabilityListenerDUnitTest extends ReliabilityTestCase {
Host.getHost(0).getVM(vm).invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, rolesProp[vm]);
+ config.setProperty(ROLES, rolesProp[vm]);
getSystem(config);
}
});
@@ -83,7 +83,7 @@ public class RegionReliabilityListenerDUnitTest extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
// create region in controller...
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index db3fedd..21e77d8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.query.QueryService;
import com.gemstone.gemfire.cache.util.RegionMembershipListenerAdapter;
import com.gemstone.gemfire.distributed.Role;
import com.gemstone.gemfire.distributed.internal.DM;
-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.distributed.internal.membership.InternalRole;
@@ -36,6 +35,8 @@ import java.io.ByteArrayOutputStream;
import java.util.*;
import java.util.concurrent.locks.Lock;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Tests region reliability defined by MembershipAttributes.
*
@@ -70,7 +71,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
}
}
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, rolesValue.toString());
+ config.setProperty(ROLES, rolesValue.toString());
return getSystem(config);
}
@@ -430,7 +431,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -516,7 +517,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -597,7 +598,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -655,7 +656,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -738,7 +739,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -826,7 +827,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -869,7 +870,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -933,7 +934,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -1005,7 +1006,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -1047,7 +1048,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
@@ -1169,7 +1170,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
@@ -1334,7 +1335,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
index eee3071..385b79b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.Role;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.membership.InternalRole;
import com.gemstone.gemfire.test.dunit.*;
@@ -28,6 +27,8 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Tests the functionality of the {@link RequiredRoles} class.
*
@@ -64,7 +65,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
// create region in controller...
@@ -126,7 +127,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
Host.getHost(0).getVM(vm).invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, rolesProp[vm]);
+ config.setProperty(ROLES, rolesProp[vm]);
getSystem(config);
}
});
@@ -134,7 +135,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
// create region in controller...
@@ -304,7 +305,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
Host.getHost(0).getVM(vm).invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, rolesProp[vm]);
+ config.setProperty(ROLES, rolesProp[vm]);
getSystem(config);
}
});
@@ -312,7 +313,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
// connect controller to system...
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
getSystem(config);
// create region in controller...
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
index 51ab9c6..02d89ac 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
@@ -17,13 +17,14 @@
package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Tests the performance of Regions when Roles are assigned.
*
@@ -115,7 +116,7 @@ public class RolePerformanceDUnitTest extends CacheTestCase {
public void run() {
Properties config = new Properties();
if (assignRoles) {
- config.setProperty(DistributionConfig.ROLES_NAME, vmRoles[vm][0]);
+ config.setProperty(ROLES, vmRoles[vm][0]);
}
getSystem(config);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
index de24694..79d90d4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
@@ -35,6 +35,8 @@ import java.util.LinkedList;
import java.util.Properties;
import java.util.Set;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Test to make sure slow receiver queuing is working
*
@@ -250,7 +252,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "1");
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "1");
doCreateOtherVm(p, false);
int repeatCount = 2;
@@ -326,7 +328,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "1");
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "1");
doCreateOtherVm(p, false);
forceQueuing(r);
@@ -396,7 +398,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "2");
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "2");
doCreateOtherVm(p, false);
forceQueuing(r);
@@ -448,7 +450,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "1");
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "1");
doCreateOtherVm(p, false);
{
VM vm = getOtherVm();
@@ -645,8 +647,8 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5");
- p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1"); // 1 meg
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "5");
+ p.setProperty(ASYNC_MAX_QUEUE_SIZE, "1"); // 1 meg
doCreateOtherVm(p, false);
@@ -717,8 +719,8 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5");
- p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "500"); // 500 ms
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "5");
+ p.setProperty(ASYNC_QUEUE_TIMEOUT, "500"); // 500 ms
doCreateOtherVm(p, true);
@@ -946,9 +948,9 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
final Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5");
- p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "86400000"); // max value
- p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1024"); // max value
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "5");
+ p.setProperty(ASYNC_QUEUE_TIMEOUT, "86400000"); // max value
+ p.setProperty(ASYNC_MAX_QUEUE_SIZE, "1024"); // max value
getOtherVm().invoke(new CacheSerializableRunnable("Create other vm") {
public void run2() throws CacheException {
@@ -1153,9 +1155,9 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
final Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5");
- p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "86400000"); // max value
- p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1024"); // max value
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, "5");
+ p.setProperty(ASYNC_QUEUE_TIMEOUT, "86400000"); // max value
+ p.setProperty(ASYNC_MAX_QUEUE_SIZE, "1024"); // max value
getOtherVm().invoke(new CacheSerializableRunnable("Create other vm") {
public void run2() throws CacheException {
@@ -1309,9 +1311,9 @@ public class SlowRecDUnitTest extends CacheTestCase {
// create receiver in vm0 with queuing enabled
final Properties p = new Properties();
- p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, String.valueOf(1000 * 4)); // 4 sec
- p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "86400000"); // max value
- p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1024"); // max value
+ p.setProperty(ASYNC_DISTRIBUTION_TIMEOUT, String.valueOf(1000 * 4)); // 4 sec
+ p.setProperty(ASYNC_QUEUE_TIMEOUT, "86400000"); // max value
+ p.setProperty(ASYNC_MAX_QUEUE_SIZE, "1024"); // max value
getOtherVm().invoke(new CacheSerializableRunnable("Create other vm") {
public void run2() throws CacheException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
index e1aabc0..ba5a04d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
@@ -31,7 +31,6 @@ package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.ResourceEvent;
import com.gemstone.gemfire.distributed.internal.ResourceEventsListener;
import com.gemstone.gemfire.distributed.internal.locks.DLockBatch;
@@ -55,6 +54,8 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
//import com.gemstone.gemfire.internal.cache.locks.TXLockId;
public class TXDistributedDUnitTest extends CacheTestCase {
@@ -493,7 +494,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
@Override
public Properties getDistributedSystemProperties() {
Properties p = super.getDistributedSystemProperties();
- p.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ p.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
return p;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 3537232..09317c6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -34,8 +34,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
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 com.gemstone.gemfire.test.dunit.Assert.*;
/**
@@ -63,7 +62,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
- config.setProperty(DistributionConfig.ROLES_NAME, "");
+ config.setProperty(ROLES, "");
config.setProperty(DistributionConfig.GROUPS_NAME, "");
config.setProperty(SystemConfigurationProperties.NAME, "");
@@ -123,7 +122,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
- config.setProperty(DistributionConfig.ROLES_NAME, rolesProp);
+ config.setProperty(ROLES, rolesProp);
config.setProperty(DistributionConfig.GROUPS_NAME, groupsProp);
InternalDistributedSystem system = getSystem(config);
@@ -195,7 +194,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
public void run() {
//disconnectFromDS();
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, vmRoles[vm]);
+ config.setProperty(ROLES, vmRoles[vm]);
getSystem(config);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
index 455e8ae..6fb1702 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
@@ -16,13 +16,10 @@
*/
package com.gemstone.gemfire.distributed;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-
import java.io.PrintStream;
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 program is used to measure the amount of time it takes to
@@ -102,7 +99,7 @@ public class DistributedSystemConnectPerf {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
+ props.setProperty(LOG_LEVEL, "info");
props.setProperty(LOCATORS,
"localhost[" + port + "]");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
index e267e41..1d8bb7d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
@@ -73,7 +73,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
Properties p = getDistributedSystemProperties();
p.put(LOCATORS, "");
p.put(START_LOCATOR, "localhost[" + locatorPort + "]");
- p.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+ p.put(DISABLE_TCP, "true");
InternalDistributedSystem ds = (InternalDistributedSystem)DistributedSystem.connect(p);
try {
// construct a member ID that will represent a departed member
@@ -142,7 +142,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
// set a flow-control property for the test (bug 37562)
- config.setProperty(DistributionConfig.MCAST_FLOW_CONTROL_NAME, "3000000,0.20,3000");
+ config.setProperty(MCAST_FLOW_CONTROL, "3000000,0.20,3000");
DistributedSystem system1 = DistributedSystem.connect(config);
DistributedSystem system2 = DistributedSystem.connect(config);
@@ -160,7 +160,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
- config.setProperty(DistributionConfig.MCAST_FLOW_CONTROL_NAME, "3000000,0.20,3000");
+ config.setProperty(MCAST_FLOW_CONTROL, "3000000,0.20,3000");
DistributedSystem system1 = DistributedSystem.connect(config);
@@ -192,7 +192,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
DistributedSystem system1 = DistributedSystem.connect(config);
system1.disconnect();
int time = DistributionConfig.DEFAULT_ACK_WAIT_THRESHOLD + 17;
- config.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME,
+ config.put(ACK_WAIT_THRESHOLD,
String.valueOf(time));
DistributedSystem system2 = DistributedSystem.connect(config);
system2.disconnect();
@@ -293,7 +293,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
int unicastPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
config.put(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
// Minimum 3 ports required in range for UDP, FD_SOCK and TcpConduit.
- config.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME,
+ config.setProperty(MEMBERSHIP_PORT_RANGE,
""+unicastPort+"-"+(unicastPort+2));
InternalDistributedSystem system = getSystem(config);
DistributionManager dm = (DistributionManager)system.getDistributionManager();
@@ -338,7 +338,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
int portRange = 3;
int portStartRange = getPortRange(portRange);
int portEndRange = portStartRange + portRange - 1;
- config.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, "" + (portStartRange) + "-" + (portEndRange));
+ config.setProperty(MEMBERSHIP_PORT_RANGE, "" + (portStartRange) + "-" + (portEndRange));
InternalDistributedSystem system = getSystem(config);
Cache cache = CacheFactory.create(system);
cache.addCacheServer();
@@ -363,7 +363,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
final int unicastPort = socketPorts[0];
config.setProperty(MCAST_PORT, String.valueOf(mcastPort));
config.setProperty(START_LOCATOR, "localhost[" + socketPorts[1] + "]");
- config.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME,
+ config.setProperty(MEMBERSHIP_PORT_RANGE,
""+unicastPort+"-"+(unicastPort+2));
InternalDistributedSystem system = (InternalDistributedSystem)DistributedSystem.connect(config);
try {
@@ -407,7 +407,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
- config.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, "");
+ config.setProperty(CACHE_XML_FILE, "");
DistributedSystem sys = DistributedSystem.connect(config);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 8506620..95592f2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -136,18 +136,18 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties properties = new Properties();
properties.put(MCAST_PORT, "0");
properties.put(START_LOCATOR, locators);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- properties.put(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME, "com.gemstone.gemfire.distributed.AuthInitializer.create");
- properties.put(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, "com.gemstone.gemfire.distributed.MyAuthenticator.create");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
- properties.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ properties.put(SECURITY_PEER_AUTH_INIT, "com.gemstone.gemfire.distributed.AuthInitializer.create");
+ properties.put(SECURITY_PEER_AUTHENTICATOR, "com.gemstone.gemfire.distributed.MyAuthenticator.create");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+ properties.put(USE_CLUSTER_CONFIGURATION, "false");
system = (InternalDistributedSystem) DistributedSystem.connect(properties);
InternalDistributedMember mbr = system.getDistributedMember();
assertEquals("expected the VM to have NORMAL vmKind",
DistributionManager.NORMAL_DM_TYPE, system.getDistributedMember().getVmKind());
properties.remove(START_LOCATOR);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
properties.put(LOCATORS, locators);
SerializableRunnable startSystem = new SerializableRunnable("start system") {
public void run() {
@@ -206,7 +206,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
});
properties.put(START_LOCATOR, locators);
- properties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
system = (InternalDistributedSystem) DistributedSystem.connect(properties);
System.out.println("done connecting distributed system. Membership view is " +
MembershipManagerHelper.getMembershipManager(system).getView());
@@ -270,11 +270,11 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties properties = new Properties();
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, locators);
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
SerializableCallable startLocator1 = new SerializableCallable("start locator1") {
@Override
@@ -377,7 +377,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties properties = new Properties();
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, locators);
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
File logFile = new File("");
@@ -493,12 +493,12 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties properties = new Properties();
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, locators);
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
// properties.put("log-level", "fine");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
try {
final String uname = getUniqueName();
@@ -626,10 +626,10 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties properties = new Properties();
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, locators);
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
SerializableRunnable stopLocator = getStopLocatorRunnable();
@@ -771,11 +771,11 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties properties = new Properties();
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, locators);
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
SerializableRunnable stopLocator = getStopLocatorRunnable();
@@ -908,10 +908,10 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties properties = new Properties();
properties.put(MCAST_PORT, "0");
properties.put(LOCATORS, locators);
- properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
- properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
- properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ properties.put(MEMBER_TIMEOUT, "2000");
+ properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
SerializableRunnable disconnect =
new SerializableRunnable("Disconnect from " + locators) {
@@ -1093,8 +1093,8 @@ public class LocatorDUnitTest extends DistributedTestCase {
try {
Properties locProps = new Properties();
locProps.setProperty(MCAST_PORT, "0");
- locProps.setProperty(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
- locProps.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ locProps.setProperty(MEMBER_TIMEOUT, "1000");
+ locProps.put(ENABLE_CLUSTER_CONFIGURATION, "false");
Locator.startLocatorAndDS(port, logFile, locProps);
} catch (IOException ex) {
@@ -1111,7 +1111,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
+ props.setProperty(MEMBER_TIMEOUT, "1000");
DistributedSystem.connect(props);
}
};
@@ -1121,7 +1121,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
+ props.setProperty(MEMBER_TIMEOUT, "1000");
system = (InternalDistributedSystem) DistributedSystem.connect(props);
@@ -1189,8 +1189,8 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties props = new Properties();
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- props.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ props.put(ENABLE_CLUSTER_CONFIGURATION, "false");
SerializableRunnable connect =
new SerializableRunnable("Connect to " + locators) {
@@ -1324,7 +1324,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties dsProps = new Properties();
dsProps.setProperty(LOCATORS, locators);
dsProps.setProperty(MCAST_PORT, "0");
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
vm0.invoke(new SerializableRunnable("Start locator on " + port1) {
public void run() {
@@ -1441,9 +1441,9 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties dsProps = new Properties();
dsProps.setProperty(LOCATORS, locators);
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- dsProps.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
startLocatorSync(vm0, new Object[] { port1, dsProps });
startLocatorSync(vm1, new Object[] { port2, dsProps });
@@ -1651,10 +1651,10 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, String.valueOf(mcastport));
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
props.setProperty(MCAST_TTL, "0");
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
Locator.startLocatorAndDS(port1, logFile, null, props);
} catch (IOException ex) {
@@ -1669,10 +1669,10 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, String.valueOf(mcastport));
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
props.setProperty(MCAST_TTL, "0");
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
Locator.startLocatorAndDS(port2, logFile, null, props);
} catch (IOException ex) {
com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port2, ex);
@@ -1686,9 +1686,9 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, String.valueOf(mcastport));
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
props.setProperty(MCAST_TTL, "0");
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
DistributedSystem.connect(props);
}
};
@@ -1699,9 +1699,9 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, String.valueOf(mcastport));
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
props.setProperty(MCAST_TTL, "0");
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
system = (InternalDistributedSystem) DistributedSystem.connect(props);
WaitCriterion ev = new WaitCriterion() {
@@ -1753,7 +1753,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
system = (InternalDistributedSystem) DistributedSystem.connect(props);
system.disconnect();
} finally {
@@ -1798,7 +1798,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
DistributedSystem.connect(props);
}
};
@@ -1832,7 +1832,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
final Properties p = new Properties();
p.setProperty(LOCATORS, Host.getHost(0).getHostName() + "[" + port1 + "]");
p.setProperty(MCAST_PORT, "0");
- p.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ p.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
if (stateFile.exists()) {
stateFile.delete();
}
@@ -1917,7 +1917,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
System.setProperty("p2p.joinTimeout", "1000");
Properties locProps = new Properties();
locProps.put(MCAST_PORT, "0");
- locProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ locProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
Locator.startLocatorAndDS(port, logFile, locProps);
} catch (IOException ex) {
com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port, ex);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index 46cd55f..63e0514 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -40,7 +40,7 @@ import java.lang.management.ManagementFactory;
import java.net.BindException;
import java.net.InetAddress;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.*;
/**
@@ -73,7 +73,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
.set(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true")
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0")
.build();
@@ -89,7 +89,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
assertNotNull(distributedSystem);
assertEquals("true", distributedSystem.getProperties().getProperty(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME));
assertEquals("0", distributedSystem.getProperties().getProperty(MCAST_PORT));
- assertEquals("config", distributedSystem.getProperties().getProperty(DistributionConfig.LOG_LEVEL_NAME));
+ assertEquals("config", distributedSystem.getProperties().getProperty(LOG_LEVEL));
assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(SystemConfigurationProperties.NAME));
} catch (Throwable e) {
this.errorCollector.addError(e);
@@ -117,7 +117,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.build();
try {
@@ -169,7 +169,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
@@ -222,7 +222,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
@@ -272,7 +272,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setMemberName(getUniqueName())
.setPort(this.locatorPort)
.setRedirectOutput(true)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertTrue(builder.getForce());
this.launcher = builder.build();
@@ -340,7 +340,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.build();
assertEquals(this.locatorPort, this.launcher.getPort().intValue());
@@ -422,7 +422,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setMemberName(getUniqueName())
.setPort(this.locatorPort)
.setRedirectOutput(true)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
@@ -499,7 +499,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.build();
int pid = 0;
@@ -551,7 +551,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.build();
RuntimeException expected = null;
@@ -613,7 +613,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
@@ -676,7 +676,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
@@ -739,7 +739,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
@@ -791,7 +791,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
.setRedirectOutput(true)
.setWorkingDirectory(this.workingDirectory)
.set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config");
+ .set(LOG_LEVEL, "config");
assertFalse(builder.getForce());
this.launcher = builder.build();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
index 8b87539..d222ca5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
@@ -51,6 +51,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
@@ -980,7 +981,7 @@ public class LocatorLauncherRemoteIntegrationTest extends AbstractLocatorLaunche
command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getAbsolutePath());
command.add("-cp");
command.add(System.getProperty("java.class.path"));
- command.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "mcast-port=0");
+ command.add("-D" + DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT+"=0");
command.add(LocatorLauncher.class.getName());
command.add(LocatorLauncher.Command.START.getName());
command.add(LocatorLauncherForkingProcess.class.getSimpleName() + "_Locator");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
index 466b818..0dee924 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
@@ -29,8 +29,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.*;
/**
* Tests the setting of Roles in a DistributedSystem
@@ -62,7 +61,7 @@ public class RoleDUnitTest extends DistributedTestCase {
distributionProperties = new Properties();
distributionProperties.setProperty(MCAST_PORT, "0");
distributionProperties.setProperty(LOCATORS, "");
- distributionProperties.setProperty(DistributionConfig.ROLES_NAME, rolesProp);
+ distributionProperties.setProperty(ROLES, rolesProp);
InternalDistributedSystem system = getSystem(distributionProperties);
try {
@@ -107,8 +106,8 @@ public class RoleDUnitTest extends DistributedTestCase {
public void run() {
disconnectFromDS();
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, vmRoles[vm]);
- config.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ config.setProperty(ROLES, vmRoles[vm]);
+ config.setProperty(LOG_LEVEL, "fine");
distributionProperties = config;
getSystem();
}
@@ -158,7 +157,7 @@ public class RoleDUnitTest extends DistributedTestCase {
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
- config.setProperty(DistributionConfig.ROLES_NAME, rolesProp);
+ config.setProperty(ROLES, rolesProp);
distributionProperties = config;
InternalDistributedSystem system = getSystem();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
index e8c1afb..b48a797 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.distributed;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Scope;
@@ -91,7 +93,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setWorkingDirectory(rootFolder)
.set(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true")
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0")
.build();
@@ -109,7 +111,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
assertNotNull(distributedSystem);
assertEquals("true", distributedSystem.getProperties().getProperty(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME));
- assertEquals("config", distributedSystem.getProperties().getProperty(DistributionConfig.LOG_LEVEL_NAME));
+ assertEquals("config", distributedSystem.getProperties().getProperty(LOG_LEVEL));
assertEquals("0", distributedSystem.getProperties().getProperty(MCAST_PORT));
assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(SystemConfigurationProperties.NAME));
@@ -141,7 +143,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
this.launcher = builder.build();
@@ -197,7 +199,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
assertFalse(builder.getForce());
@@ -252,7 +254,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
assertFalse(builder.getForce());
@@ -301,7 +303,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
this.launcher = builder.build();
@@ -357,7 +359,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
this.launcher = builder.build();
@@ -414,7 +416,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setForce(true)
.setMemberName(getUniqueName())
.setRedirectOutput(true)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
assertTrue(builder.getForce());
@@ -489,7 +491,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
CacheXmlGenerator.generate(creation, pw);
pw.close();
- System.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, cacheXmlFile.getCanonicalPath());
+ System.setProperty(CACHE_XML_FILE, cacheXmlFile.getCanonicalPath());
// start server
final Builder builder = new Builder()
@@ -497,7 +499,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setRedirectOutput(true)
.setServerPort(freeTCPPorts[1])
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
this.launcher = builder.build();
@@ -558,7 +560,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
CacheXmlGenerator.generate(creation, pw);
pw.close();
- System.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, cacheXmlFile.getCanonicalPath());
+ System.setProperty(CACHE_XML_FILE, cacheXmlFile.getCanonicalPath());
// start server
final Builder builder = new Builder()
@@ -566,7 +568,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setRedirectOutput(true)
.setServerPort(this.serverPort)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
this.launcher = builder.build();
@@ -616,7 +618,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
this.launcher = builder.build();
@@ -695,7 +697,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setDisableDefaultServer(true)
.setMemberName(getUniqueName())
.setRedirectOutput(true)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
assertFalse(builder.getForce());
@@ -777,7 +779,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setRedirectOutput(true)
.setServerPort(freeTCPPort)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
this.launcher = builder.build();
@@ -837,7 +839,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
assertFalse(builder.getForce());
@@ -903,7 +905,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
assertFalse(builder.getForce());
@@ -969,7 +971,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
assertFalse(builder.getForce());
@@ -1026,7 +1028,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(MCAST_PORT, "0");
assertFalse(builder.getForce());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
index c2ccf2f..a3508d3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
@@ -47,6 +47,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
@@ -643,7 +644,7 @@ public class ServerLauncherRemoteIntegrationTest extends AbstractServerLauncherR
// launch server and specify a different port
final List<String> jvmArguments = getJvmArguments();
- jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "" + DistributionConfig.CACHE_XML_FILE_NAME + "=" + cacheXmlFile.getCanonicalPath());
+ jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "" + CACHE_XML_FILE + "=" + cacheXmlFile.getCanonicalPath());
final List<String> command = new ArrayList<String>();
command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getCanonicalPath());
@@ -728,7 +729,7 @@ public class ServerLauncherRemoteIntegrationTest extends AbstractServerLauncherR
// launch server and specify a different port
final List<String> jvmArguments = getJvmArguments();
- jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "" + DistributionConfig.CACHE_XML_FILE_NAME + "=" + cacheXmlFile.getCanonicalPath());
+ jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "" + CACHE_XML_FILE + "=" + cacheXmlFile.getCanonicalPath());
final List<String> command = new ArrayList<String>();
command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getCanonicalPath());
@@ -1298,8 +1299,8 @@ public class ServerLauncherRemoteIntegrationTest extends AbstractServerLauncherR
@Override
protected List<String> getJvmArguments() {
final List<String> jvmArguments = new ArrayList<String>();
- jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "log-level=config");
- jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "mcast-port=0");
+ jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.LOG_LEVEL+"=config");
+ jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.MCAST_PORT+"=0");
return jvmArguments;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
index 7eaa5e2..1da0de4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
@@ -26,6 +26,8 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class Bug40751DUnitTest extends CacheTestCase {
@@ -97,7 +99,7 @@ public class Bug40751DUnitTest extends CacheTestCase {
public Properties getDistributedSystemProperties() {
Properties props = new Properties();
System.setProperty("p2p.oldIO", "true");
- props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "true");
+ props.setProperty(CONSERVE_SOCKETS, "true");
// props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "12333");
// props.setProperty(DistributionConfig.DISABLE_TCP_NAME, "true");
return props;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index 99fd245..97c3a63 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.distributed.internal;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache30.CacheTestCase;
@@ -194,7 +196,7 @@ public class ConsoleDistributionManagerDUnitTest
String[] attNames = conf.getAttributeNames();
boolean foundIt = false;
for (int j=0; j<attNames.length; j++) {
- if (attNames[j].equals(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME)) {
+ if (attNames[j].equals(STATISTIC_SAMPLING_ENABLED)) {
foundIt = true;
assertEquals(conf.getAttribute(attNames[j]), "true");
break;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 6a23679..da367d7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.distributed.internal;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.UnmodifiableException;
import com.gemstone.gemfire.internal.ConfigSource;
@@ -138,7 +140,7 @@ public class DistributionConfigJUnitTest {
assertTrue(setter.getName().startsWith("set"));
assertEquals(setter.getParameterCount(), 1);
- if (!(attr.equalsIgnoreCase(DistributionConfig.LOG_LEVEL_NAME) || attr.equalsIgnoreCase(DistributionConfig.SECURITY_LOG_LEVEL_NAME))) {
+ if (!(attr.equalsIgnoreCase(LOG_LEVEL) || attr.equalsIgnoreCase(DistributionConfig.SECURITY_LOG_LEVEL_NAME))) {
Class clazz = attributes.get(attr).type();
try {
setter.invoke(mock(DistributionConfig.class), any(clazz));
@@ -158,7 +160,7 @@ public class DistributionConfigJUnitTest {
assertTrue(getter.getName().startsWith("get"));
assertEquals(getter.getParameterCount(), 0);
- if (!(attr.equalsIgnoreCase(DistributionConfig.LOG_LEVEL_NAME) || attr.equalsIgnoreCase(DistributionConfig.SECURITY_LOG_LEVEL_NAME))) {
+ if (!(attr.equalsIgnoreCase(LOG_LEVEL) || attr.equalsIgnoreCase(DistributionConfig.SECURITY_LOG_LEVEL_NAME))) {
Class clazz = attributes.get(attr).type();
Class returnClass = getter.getReturnType();
if (returnClass.isPrimitive()) {
@@ -205,10 +207,10 @@ public class DistributionConfigJUnitTest {
@Test
public void testGetAttributeObject() {
- assertEquals(config.getAttributeObject(DistributionConfig.LOG_LEVEL_NAME), "config");
+ assertEquals(config.getAttributeObject(LOG_LEVEL), "config");
assertEquals(config.getAttributeObject(DistributionConfig.SECURITY_LOG_LEVEL_NAME), "config");
assertEquals(config.getAttributeObject(DistributionConfig.REDUNDANCY_ZONE_NAME), "");
- assertEquals(config.getAttributeObject(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME).getClass(), Boolean.class);
+ assertEquals(config.getAttributeObject(ENABLE_CLUSTER_CONFIGURATION).getClass(), Boolean.class);
}
@Test
@@ -250,16 +252,16 @@ public class DistributionConfigJUnitTest {
}
assertEquals(modifiables.size(), 10);
- assertEquals(modifiables.get(0), DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME);
- assertEquals(modifiables.get(1), DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME);
+ assertEquals(modifiables.get(0), ARCHIVE_DISK_SPACE_LIMIT);
+ assertEquals(modifiables.get(1), ARCHIVE_FILE_SIZE_LIMIT);
assertEquals(modifiables.get(2), DistributionConfig.HTTP_SERVICE_PORT_NAME);
assertEquals(modifiables.get(3), DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME);
- assertEquals(modifiables.get(4), DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME);
- assertEquals(modifiables.get(5), DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME);
- assertEquals(modifiables.get(6), DistributionConfig.LOG_LEVEL_NAME);
- assertEquals(modifiables.get(7), DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME);
- assertEquals(modifiables.get(8), DistributionConfig.STATISTIC_SAMPLE_RATE_NAME);
- assertEquals(modifiables.get(9), DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME);
+ assertEquals(modifiables.get(4), LOG_DISK_SPACE_LIMIT);
+ assertEquals(modifiables.get(5), LOG_FILE_SIZE_LIMIT);
+ assertEquals(modifiables.get(6), LOG_LEVEL);
+ assertEquals(modifiables.get(7), STATISTIC_ARCHIVE_FILE);
+ assertEquals(modifiables.get(8), STATISTIC_SAMPLE_RATE);
+ assertEquals(modifiables.get(9), STATISTIC_SAMPLING_ENABLED);
}
@Test(expected = IllegalArgumentException.class)
@@ -269,7 +271,7 @@ public class DistributionConfigJUnitTest {
@Test(expected = UnmodifiableException.class)
public void testSetUnmodifiableAttributeObject() {
- config.setAttributeObject(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, 0, ConfigSource.api());
+ config.setAttributeObject(ARCHIVE_DISK_SPACE_LIMIT, 0, ConfigSource.api());
}
@Test
@@ -286,7 +288,7 @@ public class DistributionConfigJUnitTest {
@Test
public void testLogLevel() {
config.modifiable = true;
- config.setAttribute(DistributionConfig.LOG_LEVEL_NAME, "config", ConfigSource.api());
+ config.setAttribute(LOG_LEVEL, "config", ConfigSource.api());
assertEquals(config.getLogLevel(), 700);
config.setAttributeObject(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "debug", ConfigSource.api());
@@ -327,7 +329,7 @@ public class DistributionConfigJUnitTest {
props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
props.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "config");
// add another non-security property to verify it won't get put in the security properties
- props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, 2);
+ props.put(ACK_WAIT_THRESHOLD, 2);
DistributionConfig config = new DistributionConfigImpl(props);
assertEquals(config.getSecurityProps().size(), 3);
@@ -340,7 +342,7 @@ public class DistributionConfigJUnitTest {
props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
props.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "config");
// add another non-security property to verify it won't get put in the security properties
- props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, 2);
+ props.put(ACK_WAIT_THRESHOLD, 2);
props.put("security-username", "testName");
DistributionConfig config = new DistributionConfigImpl(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
index 325b3a2..c78c077 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
@@ -36,8 +36,7 @@ import org.junit.Assert;
import java.net.InetAddress;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.BIND_ADDRESS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* This class tests the functionality of the {@link
@@ -248,13 +247,13 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
// in order to set a small ack-wait-threshold, we have to remove the
// system property established by the dunit harness
String oldAckWait = (String)System.getProperties()
- .remove(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.ACK_WAIT_THRESHOLD_NAME);
+ .remove(DistributionConfig.GEMFIRE_PREFIX + ACK_WAIT_THRESHOLD);
try {
final Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "3");
- props.setProperty(DistributionConfig.ACK_SEVERE_ALERT_THRESHOLD_NAME, "3");
+ props.setProperty(ACK_WAIT_THRESHOLD, "3");
+ props.setProperty(ACK_SEVERE_ALERT_THRESHOLD, "3");
props.setProperty(SystemConfigurationProperties.NAME, "putter");
getSystem(props);
@@ -313,7 +312,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
}
finally {
if (oldAckWait != null) {
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.ACK_WAIT_THRESHOLD_NAME, oldAckWait);
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + ACK_WAIT_THRESHOLD, oldAckWait);
}
}
}
@@ -390,13 +389,13 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
// in order to set a small ack-wait-threshold, we have to remove the
// system property established by the dunit harness
String oldAckWait = (String)System.getProperties()
- .remove(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.ACK_WAIT_THRESHOLD_NAME);
+ .remove(DistributionConfig.GEMFIRE_PREFIX + ACK_WAIT_THRESHOLD);
try {
final Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0"); // loner
- props.setProperty(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "5");
- props.setProperty(DistributionConfig.ACK_SEVERE_ALERT_THRESHOLD_NAME, "5");
+ props.setProperty(ACK_WAIT_THRESHOLD, "5");
+ props.setProperty(ACK_SEVERE_ALERT_THRESHOLD, "5");
props.setProperty(SystemConfigurationProperties.NAME, "putter");
getSystem(props);
@@ -485,7 +484,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
}
finally {
if (oldAckWait != null) {
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.ACK_WAIT_THRESHOLD_NAME, oldAckWait);
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + ACK_WAIT_THRESHOLD, oldAckWait);
}
}
}
@@ -501,8 +500,8 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
props.setProperty(MCAST_PORT, "0"); // loner
// use a valid address that's not proper for this machine
props.setProperty(BIND_ADDRESS, "www.yahoo.com");
- props.setProperty(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "5");
- props.setProperty(DistributionConfig.ACK_SEVERE_ALERT_THRESHOLD_NAME, "5");
+ props.setProperty(ACK_WAIT_THRESHOLD, "5");
+ props.setProperty(ACK_SEVERE_ALERT_THRESHOLD, "5");
try {
getSystem(props);
} catch (IllegalArgumentException e) {
[03/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
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");
[32/55] [abbrv] incubator-geode git commit: GEODE-1185: typo in gfsh
help on alter disk-store
Posted by hi...@apache.org.
GEODE-1185: typo in gfsh help on alter disk-store
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/557fae15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/557fae15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/557fae15
Branch: refs/heads/feature/GEODE-1372
Commit: 557fae159707d00d7e7ea2cab9c629dca6d26baf
Parents: b42d6e9
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Jun 1 12:04:33 2016 -0700
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Thu Jun 2 07:24:06 2016 -0700
----------------------------------------------------------------------
.../gemfire/management/internal/cli/i18n/CliStrings.java | 2 +-
.../internal/cli/commands/golden-help-offline.properties | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/557fae15/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index 4228373..cc80de8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -194,7 +194,7 @@ public class CliStrings {
public static final String ALTER_DISK_STORE__REGIONNAME__HELP = "Name/Path of the region in the disk store to alter.";
public static final String ALTER_DISK_STORE__DISKDIRS = "disk-dirs";
public static final String ALTER_DISK_STORE__DISKDIRS__HELP = "Directories where data for the disk store was previously written.";
- public static final String ALTER_DISK_STORE__LRU__EVICTION__ALGORITHM = "lru-algorthm";
+ public static final String ALTER_DISK_STORE__LRU__EVICTION__ALGORITHM = "lru-algorithm";
public static final String ALTER_DISK_STORE__LRU__EVICTION__ALGORITHM__HELP = "Least recently used eviction algorithm. Valid values are: none, lru-entry-count, lru-heap-percentage and lru-memory-size.";
public static final String ALTER_DISK_STORE__LRU__EVICTION__ACTION = "lru-action";
public static final String ALTER_DISK_STORE__LRU__EVICTION__ACTION__HELP = "Action to take when evicting entries from the region. Valid values are: none, overflow-to-disk and local-destroy.";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/557fae15/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
index 74db393..3c0d388 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
@@ -48,7 +48,7 @@ SYNOPSIS\n\
SYNTAX\n\
\ \ \ \ alter disk-store --name=value --region=value --disk-dirs=value(,value)* [--compressor(=value)?]\n\
\ \ \ \ [--concurrency-level=value] [--enable-statistics=value] [--initial-capacity=value]\n\
-\ \ \ \ [--load-factor=value] [--lru-action=value] [--lru-algorthm=value] [--lru-limit=value]\n\
+\ \ \ \ [--load-factor=value] [--lru-action=value] [--lru-algorithm=value] [--lru-limit=value]\n\
\ \ \ \ [--off-heap=value] [--remove(=value)?]\n\
PARAMETERS\n\
\ \ \ \ name\n\
@@ -85,7 +85,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Action to take when evicting entries from the region. Valid values are: none,\n\
\ \ \ \ \ \ \ \ overflow-to-disk and local-destroy.\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ lru-algorthm\n\
+\ \ \ \ lru-algorithm\n\
\ \ \ \ \ \ \ \ Least recently used eviction algorithm. Valid values are: none, lru-entry-count,\n\
\ \ \ \ \ \ \ \ lru-heap-percentage and lru-memory-size.\n\
\ \ \ \ \ \ \ \ Required: false\n\
[44/55] [abbrv] incubator-geode git commit: GEODE-11: Added support
for lucene index profile exchange
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
index 33cb3d3..98233b0 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -84,11 +84,10 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
@Override
public void beforeCreate(Extensible<Region<?, ?>> source, Cache cache) {
LuceneServiceImpl service = (LuceneServiceImpl) LuceneServiceProvider.get(cache);
- if (this.fieldAnalyzers == null) {
- service.createIndex(getName(), getRegionPath(), getFieldNames());
- } else {
- service.createIndex(getName(), getRegionPath(), this.fieldAnalyzers);
- }
+ Analyzer analyzer = this.fieldAnalyzers == null
+ ? new StandardAnalyzer()
+ : new PerFieldAnalyzerWrapper(new StandardAnalyzer(), this.fieldAnalyzers);
+ service.createIndex(getName(), getRegionPath(), analyzer, this.fieldAnalyzers, getFieldNames());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneDUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneDUnitTest.java
new file mode 100644
index 0000000..565ec4f
--- /dev/null
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneDUnitTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.gemstone.gemfire.cache.lucene;
+
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+
+public abstract class LuceneDUnitTest extends JUnit4CacheTestCase {
+ protected VM dataStore1;
+ protected VM dataStore2;
+
+ @Override
+ public void postSetUp() throws Exception {
+ Host host = Host.getHost(0);
+ dataStore1 = host.getVM(0);
+ dataStore2 = host.getVM(1);
+ }
+
+ protected abstract void initDataStore(SerializableRunnableIF createIndex) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.java
new file mode 100644
index 0000000..f51c848
--- /dev/null
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.java
@@ -0,0 +1,281 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.gemstone.gemfire.cache.lucene;
+
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.*;
+import static junitparams.JUnitParamsRunner.$;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+@Category(DistributedTest.class)
+@RunWith(JUnitParamsRunner.class)
+public class LuceneIndexCreationDUnitTest extends LuceneDUnitTest {
+
+ @Override
+ protected void initDataStore(SerializableRunnableIF createIndex) throws Exception {
+ createIndex.run();
+ getCache().createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
+ }
+
+ @Test
+ public void verifyDifferentFieldsFails() {
+ SerializableRunnableIF createIndex1 = getFieldsIndexWithOneField();
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = getFieldsIndexWithTwoFields();
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS));
+ }
+
+ @Test
+ public void verifyDifferentFieldAnalyzerSizesFails1() {
+ SerializableRunnableIF createIndex1 = getAnalyzersIndexWithTwoFields();
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = getAnalyzersIndexWithOneField();
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD2));
+ }
+
+ @Test
+ public void verifyDifferentFieldAnalyzerSizesFails2() {
+ SerializableRunnableIF createIndex1 = getAnalyzersIndexWithOneField();
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = getAnalyzersIndexWithTwoFields();
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZER_SIZES_1));
+ }
+
+ @Test
+ public void verifyDifferentFieldAnalyzersFails1() {
+ SerializableRunnableIF createIndex1 = getAnalyzersIndexWithOneField(StandardAnalyzer.class);
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = getAnalyzersIndexWithOneField(KeywordAnalyzer.class);
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZERS));
+ }
+
+ @Test
+ public void verifyDifferentFieldAnalyzersFails2() {
+ SerializableRunnableIF createIndex1 = getAnalyzersIndexWithNullField2();
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = getAnalyzersIndexWithNullField1();
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD1));
+ }
+
+ @Test
+ public void verifyDifferentFieldAnalyzersFails3() {
+ SerializableRunnableIF createIndex1 = getAnalyzersIndexWithNullField1();
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = getAnalyzersIndexWithNullField2();
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_EXISTING_MEMBER));
+ }
+
+ @Test
+ public void verifyDifferentIndexNamesFails() {
+ SerializableRunnableIF createIndex1 = () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndex(INDEX_NAME+"1", REGION_NAME, "field1");
+ };
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndex(INDEX_NAME+"2", REGION_NAME, "field1");
+ };
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_NAMES));
+ }
+
+ @Test
+ public void verifyDifferentIndexesFails1() {
+ SerializableRunnableIF createIndex1 = getFieldsIndexWithOneField();
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = () -> {/*Do nothing*/};
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_1));
+ }
+
+ @Test
+ public void verifyDifferentIndexesFails2() {
+ SerializableRunnableIF createIndex1 = getFieldsIndexWithOneField();
+ dataStore1.invoke(() -> initDataStore(createIndex1));
+
+ SerializableRunnableIF createIndex2 = () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, "field1");
+ luceneService.createIndex(INDEX_NAME+"2", REGION_NAME, "field2");
+ };
+ dataStore2.invoke(() -> initDataStore(createIndex2, CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_2));
+ }
+
+ @Test
+ @Parameters(method = "getIndexes")
+ public void verifySameIndexesSucceeds(SerializableRunnableIF createIndex) {
+ dataStore1.invoke(() -> initDataStore(createIndex));
+ dataStore2.invoke(() -> initDataStore(createIndex));
+ }
+
+ private final Object[] getIndexes() {
+ return $(
+ new Object[] { getFieldsIndexWithOneField() },
+ new Object[] { getFieldsIndexWithTwoFields() },
+ new Object[] { get2FieldsIndexes() },
+ new Object[] { getAnalyzersIndexWithOneField() },
+ new Object[] { getAnalyzersIndexWithTwoFields() },
+ new Object[] { getAnalyzersIndexWithNullField1() }
+ );
+ }
+
+ @Test
+ @Parameters(method = "getXmlAndExceptionMessages")
+ public void verifyXml(String cacheXmlFileBaseName, String exceptionMessage) {
+ dataStore1.invoke(() -> initCache(getXmlFileForTest(cacheXmlFileBaseName + ".1")));
+ dataStore2.invoke(() -> initCache(getXmlFileForTest(cacheXmlFileBaseName + ".2"), exceptionMessage));
+ }
+
+ private final Object[] getXmlAndExceptionMessages() {
+ return $(
+ new Object[] { "verifyDifferentFieldsFails", CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS },
+ new Object[] { "verifyDifferentFieldAnalyzerSizesFails1", CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD2 },
+ new Object[] { "verifyDifferentFieldAnalyzerSizesFails2", CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZER_SIZES_1 },
+ new Object[] { "verifyDifferentFieldAnalyzersFails1", CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZERS },
+ // Currently setting a null analyzer is not a valid xml configuration: <lucene:field name="field2" analyzer="null"/>
+ //new Object[] { "verifyDifferentFieldAnalyzersFails2", CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD1 },
+ //new Object[] { "verifyDifferentFieldAnalyzersFails3", CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_EXISTING_MEMBER },
+ new Object[] { "verifyDifferentIndexNamesFails", CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_NAMES },
+ new Object[] { "verifyDifferentIndexesFails1", CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_1 },
+ new Object[] { "verifyDifferentIndexesFails2", CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_2 }
+ );
+ }
+
+ private String getXmlFileForTest(String testName) {
+ return TestUtil.getResourcePath(getClass(), getClass().getSimpleName() + "." + testName + ".cache.xml");
+ }
+
+ private void initDataStore(SerializableRunnableIF createIndex, String message) throws Exception {
+ createIndex.run();
+ try {
+ getCache().createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
+ fail("Should not have been able to create index");
+ } catch (IllegalStateException e) {
+ assertEquals(message, e.getMessage());
+ }
+ }
+
+ private void initCache(String cacheXmlFileName) throws FileNotFoundException {
+ getCache().loadCacheXml(new FileInputStream(cacheXmlFileName));
+ }
+
+ private void initCache(String cacheXmlFileName, String message) throws FileNotFoundException {
+ try {
+ getCache().loadCacheXml(new FileInputStream(cacheXmlFileName));
+ fail("Should not have been able to create cache");
+ } catch (IllegalStateException e) {
+ assertEquals(message, e.getMessage());
+ }
+ }
+
+ private SerializableRunnableIF getFieldsIndexWithOneField() {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, "field1");
+ };
+ }
+
+ private SerializableRunnableIF getFieldsIndexWithTwoFields() {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, "field1", "field2");
+ };
+ }
+
+ private SerializableRunnableIF get2FieldsIndexes() {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndex(INDEX_NAME+"_1", REGION_NAME, "field1");
+ luceneService.createIndex(INDEX_NAME+"_2", REGION_NAME, "field2");
+ };
+ }
+
+ private SerializableRunnableIF getAnalyzersIndexWithNullField1() {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ Map<String, Analyzer> analyzers = new HashMap<>();
+ analyzers.put("field1", null);
+ analyzers.put("field2", new KeywordAnalyzer());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, analyzers);
+ };
+ }
+
+ private SerializableRunnableIF getAnalyzersIndexWithNullField2() {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ Map<String, Analyzer> analyzers = new HashMap<>();
+ analyzers.put("field1", new KeywordAnalyzer());
+ analyzers.put("field2", null);
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, analyzers);
+ };
+ }
+
+ private SerializableRunnableIF getAnalyzersIndexWithOneField(Class<? extends Analyzer> analyzerClass) {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ Map<String, Analyzer> analyzers = new HashMap<>();
+ analyzers.put("field1", analyzerClass.newInstance());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, analyzers);
+ };
+ }
+
+ private SerializableRunnableIF getAnalyzersIndexWithOneField() {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ Map<String, Analyzer> analyzers = new HashMap<>();
+ analyzers.put("field1", new KeywordAnalyzer());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, analyzers);
+ };
+ }
+
+ private SerializableRunnableIF getAnalyzersIndexWithTwoFields() {
+ return () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ Map<String, Analyzer> analyzers = new HashMap<>();
+ analyzers.put("field1", new KeywordAnalyzer());
+ analyzers.put("field2", new KeywordAnalyzer());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, analyzers);
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
index 821be17..92d8e8b 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
@@ -28,16 +28,10 @@ import java.util.Map;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
-import com.gemstone.gemfire.cache.lucene.internal.LuceneEventListener;
import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexImpl;
-import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
-import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.junit.Test;
@@ -47,23 +41,17 @@ import org.junit.Test;
* of different regions types and topologies.
*
*/
-public abstract class LuceneQueriesBase extends JUnit4CacheTestCase {
+public abstract class LuceneQueriesBase extends LuceneDUnitTest {
private static final long serialVersionUID = 1L;
- protected VM dataStore1;
- protected VM dataStore2;
protected VM accessor;
@Override
public final void postSetUp() throws Exception {
- Host host = Host.getHost(0);
- dataStore1 = host.getVM(0);
- dataStore2 = host.getVM(1);
- accessor = host.getVM(3);
+ super.postSetUp();
+ accessor = Host.getHost(0).getVM(3);
}
- protected abstract void initDataStore(SerializableRunnableIF createIndex) throws Exception;
-
protected abstract void initAccessor(SerializableRunnableIF createIndex) throws Exception;
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
new file mode 100644
index 0000000..ecb48af
--- /dev/null
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import com.gemstone.gemfire.CopyHelper;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.*;
+import static junitparams.JUnitParamsRunner.$;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+@Category(UnitTest.class)
+@RunWith(JUnitParamsRunner.class)
+public class LuceneIndexCreationProfileJUnitTest {
+
+ @Test
+ @Parameters(method = "getSerializationProfiles")
+ public void testSerialization(LuceneIndexCreationProfile profile) {
+ LuceneServiceImpl.registerDataSerializables();
+ LuceneIndexCreationProfile copy = CopyHelper.deepCopy(profile);
+ assertEquals(profile.getIndexName(), copy.getIndexName());
+ assertEquals(profile.getAnalyzerClass(), copy.getAnalyzerClass());
+ assertArrayEquals(profile.getFieldNames(), copy.getFieldNames());
+ assertEquals(profile.getFieldAnalyzers(), copy.getFieldAnalyzers());
+ }
+
+ private final Object[] getSerializationProfiles() {
+ return $(
+ new Object[] { getOneFieldLuceneIndexCreationProfile() },
+ new Object[] { getTwoFieldLuceneIndexCreationProfile() },
+ new Object[] { getTwoAnalyzersLuceneIndexCreationProfile() },
+ new Object[] { getNullField1AnalyzerLuceneIndexCreationProfile() }
+ );
+ }
+
+ @Test
+ @Parameters(method = "getCheckCompatibilityProfiles")
+ public void testCheckCompatibility(LuceneIndexCreationProfile myProfile, LuceneIndexCreationProfile otherProfile, String expectedResult) {
+ assertEquals(expectedResult, otherProfile.checkCompatibility("/"+REGION_NAME, myProfile));
+ }
+
+ private final Object[] getCheckCompatibilityProfiles() {
+ return $(
+ new Object[] {
+ getOneFieldLuceneIndexCreationProfile(),
+ getTwoFieldLuceneIndexCreationProfile(),
+ CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS
+ },
+ new Object[] {
+ getTwoAnalyzersLuceneIndexCreationProfile(),
+ getOneAnalyzerLuceneIndexCreationProfile(new KeywordAnalyzer()),
+ CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD2
+ },
+ new Object[] {
+ getOneAnalyzerLuceneIndexCreationProfile(new KeywordAnalyzer()),
+ getTwoAnalyzersLuceneIndexCreationProfile(),
+ CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZER_SIZES_2
+ },
+ new Object[] {
+ getOneAnalyzerLuceneIndexCreationProfile(new StandardAnalyzer()),
+ getOneAnalyzerLuceneIndexCreationProfile(new KeywordAnalyzer()),
+ CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZERS
+ },
+ new Object[] {
+ getNullField2AnalyzerLuceneIndexCreationProfile(),
+ getNullField1AnalyzerLuceneIndexCreationProfile(),
+ CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD1
+ },
+ new Object[] {
+ getNullField1AnalyzerLuceneIndexCreationProfile(),
+ getNullField2AnalyzerLuceneIndexCreationProfile(),
+ CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_EXISTING_MEMBER
+ }
+ );
+ }
+
+ private LuceneIndexCreationProfile getOneFieldLuceneIndexCreationProfile() {
+ return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1" }, new StandardAnalyzer(), null);
+ }
+
+ private LuceneIndexCreationProfile getTwoFieldLuceneIndexCreationProfile() {
+ return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, new StandardAnalyzer(), null);
+ }
+
+ private LuceneIndexCreationProfile getOneAnalyzerLuceneIndexCreationProfile(Analyzer analyzer) {
+ Map<String, Analyzer> fieldAnalyzers = new HashMap<>();
+ fieldAnalyzers.put("field1", analyzer);
+ return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers);
+ }
+
+ private LuceneIndexCreationProfile getTwoAnalyzersLuceneIndexCreationProfile() {
+ Map<String, Analyzer> fieldAnalyzers = new HashMap<>();
+ fieldAnalyzers.put("field1", new KeywordAnalyzer());
+ fieldAnalyzers.put("field2", new KeywordAnalyzer());
+ return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers);
+ }
+
+ private LuceneIndexCreationProfile getNullField1AnalyzerLuceneIndexCreationProfile() {
+ Map<String, Analyzer> fieldAnalyzers = new HashMap<>();
+ fieldAnalyzers.put("field1", null);
+ fieldAnalyzers.put("field2", new KeywordAnalyzer());
+ return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers);
+ }
+
+ private LuceneIndexCreationProfile getNullField2AnalyzerLuceneIndexCreationProfile() {
+ Map<String, Analyzer> fieldAnalyzers = new HashMap<>();
+ fieldAnalyzers.put("field1", new KeywordAnalyzer());
+ fieldAnalyzers.put("field2", null);
+ return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers);
+ }
+
+ private Analyzer getPerFieldAnalyzerWrapper(Map<String, Analyzer> fieldAnalyzers) {
+ return new PerFieldAnalyzerWrapper(new StandardAnalyzer(), fieldAnalyzers);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
index 860dacf..0cf8953 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
@@ -43,6 +43,17 @@ public class LuceneTestUtilities {
public static final String INDEX_NAME = "index";
public static final String REGION_NAME = "region";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS = "Cannot create Lucene index index on region /region with fields [field1, field2] because another member defines the same index with fields [field1].";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD2 = "Cannot create Lucene index index on region /region with no analyzer on field field2 because another member defines the same index with analyzer org.apache.lucene.analysis.core.KeywordAnalyzer on that field.";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZER_SIZES_1 = "Cannot create Lucene index index on region /region with field analyzers {field2=class org.apache.lucene.analysis.core.KeywordAnalyzer, field1=class org.apache.lucene.analysis.core.KeywordAnalyzer} because another member defines the same index with field analyzers {field1=class org.apache.lucene.analysis.core.KeywordAnalyzer}.";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZER_SIZES_2 = "Cannot create Lucene index index on region /region with field analyzers {field1=class org.apache.lucene.analysis.core.KeywordAnalyzer, field2=class org.apache.lucene.analysis.core.KeywordAnalyzer} because another member defines the same index with field analyzers {field1=class org.apache.lucene.analysis.core.KeywordAnalyzer}.";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZERS = "Cannot create Lucene index index on region /region with analyzer org.apache.lucene.analysis.core.KeywordAnalyzer on field field1 because another member defines the same index with analyzer org.apache.lucene.analysis.standard.StandardAnalyzer on that field.";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD1 = "Cannot create Lucene index index on region /region with no analyzer on field field1 because another member defines the same index with analyzer org.apache.lucene.analysis.core.KeywordAnalyzer on that field.";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_EXISTING_MEMBER = "Cannot create Lucene index index on region /region with analyzer org.apache.lucene.analysis.core.KeywordAnalyzer on field field1 because another member defines the same index with no analyzer on that field.";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_NAMES = "Cannot create Region /region with [index2#_region] async event ids because another cache has the same region defined with [index1#_region] async event ids";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_1 = "Cannot create Region /region with [] async event ids because another cache has the same region defined with [index#_region] async event ids";
+ public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_2 = "Cannot create Region /region with [index#_region, index2#_region] async event ids because another cache has the same region defined with [index#_region] async event ids";
+
public static void verifyInternalRegions(LuceneService luceneService, Cache cache, Consumer<LocalRegion> verify) {
// Get index
LuceneIndexForPartitionedRegion index = (LuceneIndexForPartitionedRegion) luceneService.getIndex(INDEX_NAME, REGION_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.1.cache.xml
new file mode 100755
index 0000000..40fc80e
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.1.cache.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ <lucene:field name="field2" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.2.cache.xml
new file mode 100755
index 0000000..ec278b1
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails1.2.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.1.cache.xml
new file mode 100755
index 0000000..ec278b1
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.1.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.2.cache.xml
new file mode 100755
index 0000000..40fc80e
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzerSizesFails2.2.cache.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ <lucene:field name="field2" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.1.cache.xml
new file mode 100755
index 0000000..12ef799
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.1.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.2.cache.xml
new file mode 100755
index 0000000..ec278b1
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails1.2.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.1.cache.xml
new file mode 100755
index 0000000..5550ad6
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.1.cache.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ <lucene:field name="field2" analyzer="null"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.2.cache.xml
new file mode 100755
index 0000000..ceed0ec
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails2.2.cache.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="null"/>
+ <lucene:field name="field2" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.1.cache.xml
new file mode 100755
index 0000000..ceed0ec
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.1.cache.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="null"/>
+ <lucene:field name="field2" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.2.cache.xml
new file mode 100755
index 0000000..5550ad6
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldAnalyzersFails3.2.cache.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ <lucene:field name="field2" analyzer="null"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.1.cache.xml
new file mode 100755
index 0000000..b0870ee
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.1.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.2.cache.xml
new file mode 100755
index 0000000..77936e2
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentFieldsFails.2.cache.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1"/>
+ <lucene:field name="field2"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.1.cache.xml
new file mode 100755
index 0000000..38afdbd
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.1.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index1">
+ <lucene:field name="field1"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.2.cache.xml
new file mode 100755
index 0000000..83e532d
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexNamesFails.2.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index2">
+ <lucene:field name="field1"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.1.cache.xml
new file mode 100755
index 0000000..b0870ee
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.1.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.2.cache.xml
new file mode 100755
index 0000000..3666c4f
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails1.2.cache.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT"/>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.1.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.1.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.1.cache.xml
new file mode 100755
index 0000000..b0870ee
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.1.cache.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1"/>
+ </lucene:index>
+ </region>
+
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.2.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.2.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.2.cache.xml
new file mode 100755
index 0000000..7aca855
--- /dev/null
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationDUnitTest.verifyDifferentIndexesFails2.2.cache.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION_REDUNDANT">
+ <lucene:index name="index">
+ <lucene:field name="field1"/>
+ </lucene:index>
+ <lucene:index name="index2">
+ <lucene:field name="field2"/>
+ </lucene:index>
+ </region>
+
+</cache>
[51/55] [abbrv] incubator-geode git commit: GEODE-1464: remove sqlf
code
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
index f0836d4..55bdde4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.Operation;
import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.cache.query.internal.cq.CqService;
import com.gemstone.gemfire.cache.query.internal.cq.ServerCQ;
import com.gemstone.gemfire.distributed.DistributedMember;
@@ -764,10 +763,6 @@ public class InitialImageOperation {
if (entryCount <= 1000 && isDebugEnabled) {
keys = new HashSet();
}
- final boolean keyRequiresRegionContext = this.region
- .keyRequiresRegionContext();
- // get SQLF index manager for the case of recovery from disk
- final IndexUpdater indexUpdater = this.region.getIndexUpdater();
final ByteArrayDataInput in = new ByteArrayDataInput();
for (int i = 0; i < entryCount; i++) {
// stream is null-terminated
@@ -816,33 +811,7 @@ public class InitialImageOperation {
Object tmpValue = entry.value;
byte[] tmpBytes = null;
- if (keyRequiresRegionContext) {
- final KeyWithRegionContext key = (KeyWithRegionContext)entry.key;
- Object keyObject = tmpValue;
- if (tmpValue != null) {
- if (entry.isEagerDeserialize()) {
- tmpValue = CachedDeserializableFactory.create(tmpValue,
- CachedDeserializableFactory.getArrayOfBytesSize(
- (byte[][])tmpValue, true));
- entry.setSerialized(false);
- }
- else if (entry.isSerialized()) {
- tmpBytes = (byte[])tmpValue;
- // force deserialization for passing to key
- keyObject = EntryEventImpl.deserialize(tmpBytes,
- remoteVersion, in);
- tmpValue = CachedDeserializableFactory.create(keyObject,
- CachedDeserializableFactory.getByteSize(tmpBytes));
- entry.setSerialized(false);
- }
- else {
- tmpBytes = (byte[])tmpValue;
- }
- }
- key.setRegionContext(this.region);
- entry.key = key.afterDeserializationWithValue(keyObject);
- }
- else {
+ {
if (tmpValue instanceof byte[]) {
tmpBytes = (byte[])tmpValue;
}
@@ -879,32 +848,6 @@ public class InitialImageOperation {
//actually are equal, keep don't put the received
//entry into the cache (this avoids writing a record to disk)
if(entriesEqual) {
- // explicit SQLF index maintenance here since
- // it was not done during recovery from disk
- if (indexUpdater != null && !Token.isInvalidOrRemoved(tmpValue)) {
- boolean success = false;
- if (entry.isSerialized()) {
- tmpValue = CachedDeserializableFactory
- .create((byte[])tmpValue);
- }
- // dummy EntryEvent to pass for SQLF index maintenance
- @Released final EntryEventImpl ev = EntryEventImpl.create(this.region,
- Operation.CREATE, null, null, null, true, null, false, false);
- try {
- ev.setKeyInfo(this.region.getKeyInfo(entry.key,
- tmpValue, null));
- ev.setNewValue(tmpValue);
- try {
- indexUpdater.onEvent(this.region, ev, re);
- success = true;
- } finally {
- indexUpdater.postEvent(this.region, ev, re,
- success);
- }
- } finally {
- ev.release();
- }
- }
continue;
}
if (entry.isSerialized() && !Token.isInvalidOrRemoved(tmpValue)) {
@@ -1864,7 +1807,6 @@ public class InitialImageOperation {
List chunkEntries = null;
chunkEntries = new InitialImageVersionedEntryList(rgn.concurrencyChecksEnabled, MAX_ENTRIES_PER_CHUNK);
- final boolean keyRequiresRegionContext = rgn.keyRequiresRegionContext();
DiskRegion dr = rgn.getDiskRegion();
if( dr!=null ){
dr.setClearCountReference();
@@ -1926,9 +1868,6 @@ public class InitialImageOperation {
entry = new InitialImageOperation.Entry();
entry.key = key;
entry.setVersionTag(stamp.asVersionTag());
- if (keyRequiresRegionContext) {
- entry.setEagerDeserialize();
- }
fillRes = mapEntry.fillInValue(rgn, entry, in, rgn.getDistributionManager());
if (versionVector != null) {
if (logger.isTraceEnabled(LogMarker.GII)) {
@@ -1939,9 +1878,6 @@ public class InitialImageOperation {
} else {
entry = new InitialImageOperation.Entry();
entry.key = key;
- if (keyRequiresRegionContext) {
- entry.setEagerDeserialize();
- }
fillRes = mapEntry.fillInValue(rgn, entry, in, rgn.getDistributionManager());
}
}
@@ -1961,11 +1897,6 @@ public class InitialImageOperation {
entry.setLastModified(rgn.getDistributionManager(), mapEntry
.getLastModified());
}
- if (keyRequiresRegionContext) {
- entry.key = ((KeyWithRegionContext)key)
- .beforeSerializationWithValue(entry.isInvalid()
- || entry.isLocalInvalid());
- }
chunkEntries.add(entry);
currentChunkSize += entry.calcSerializedSize();
@@ -2952,18 +2883,6 @@ public class InitialImageOperation {
this.entryBits = EntryBits.setSerialized(this.entryBits, isSerialized);
}
- public boolean isEagerDeserialize() {
- return EntryBits.isEagerDeserialize(this.entryBits);
- }
-
- void setEagerDeserialize() {
- this.entryBits = EntryBits.setEagerDeserialize(this.entryBits);
- }
-
- void clearEagerDeserialize() {
- this.entryBits = EntryBits.clearEagerDeserialize(this.entryBits);
- }
-
public boolean isInvalid() {
return (this.value == null) && !EntryBits.isLocalInvalid(this.entryBits);
}
@@ -3005,12 +2924,7 @@ public class InitialImageOperation {
out.writeByte(flags);
DataSerializer.writeObject(this.key, out);
if (!EntryBits.isTombstone(this.entryBits)) {
- if (!isEagerDeserialize()) {
- DataSerializer.writeObjectAsByteArray(this.value, out);
- }
- else {
- DataSerializer.writeArrayOfByteArrays((byte[][])this.value, out);
- }
+ DataSerializer.writeObjectAsByteArray(this.value, out);
}
out.writeLong(this.lastModified);
if (this.versionTag != null) {
@@ -3030,11 +2944,7 @@ public class InitialImageOperation {
if (EntryBits.isTombstone(this.entryBits)) {
this.value = Token.TOMBSTONE;
} else {
- if (!isEagerDeserialize()) {
- this.value = DataSerializer.readByteArray(in);
- } else {
- this.value = DataSerializer.readArrayOfByteArrays(in);
- }
+ this.value = DataSerializer.readByteArray(in);
}
this.lastModified = in.readLong();
if ((flags & HAS_VERSION) != 0) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
index 3a254d5..c403231 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.cache.LocalRegion.TestCallable;
import com.gemstone.gemfire.internal.cache.partitioned.RegionAdvisor;
@@ -58,8 +57,6 @@ public final class InternalRegionArguments
private DiskRegion diskRegion;
private PartitionedRegion partitionedRegion;
private TestCallable testCallable;
- private IndexUpdater indexUpdater;
- private boolean keyRequiresRegionContext;
private AbstractGatewaySender parallelGatewaySender;
private AbstractGatewaySender serialGatewaySender;
@@ -233,25 +230,6 @@ public final class InternalRegionArguments
return this.testCallable;
}
- // SQLFabric index manager
- public IndexUpdater getIndexUpdater() {
- return this.indexUpdater;
- }
-
- public InternalRegionArguments setIndexUpdater(IndexUpdater indexUpdater) {
- this.indexUpdater = indexUpdater;
- return this;
- }
-
- public boolean keyRequiresRegionContext() {
- return this.keyRequiresRegionContext;
- }
-
- public InternalRegionArguments setKeyRequiresRegionContext(boolean v) {
- this.keyRequiresRegionContext = v;
- return this;
- }
-
public InternalRegionArguments setUserAttribute(Object userAttr) {
this.userAttribute = userAttr;
return this;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InvalidateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InvalidateOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InvalidateOperation.java
index 6e1d91e..1742ad3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InvalidateOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InvalidateOperation.java
@@ -112,9 +112,6 @@ public class InvalidateOperation extends DistributedCacheOperation
@Retained
protected InternalCacheEvent createEvent(DistributedRegion rgn)
throws EntryNotFoundException {
- if (rgn.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(rgn);
- }
@Retained EntryEventImpl ev = EntryEventImpl.create(
rgn, getOperation(), this.key,
null, this.callbackArg, true, getSender());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyInfo.java
index 30f30fc..3065b47 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyInfo.java
@@ -40,9 +40,8 @@ public class KeyInfo {
private Object callbackArg;
private int bucketId;
- // Rahul: The value field is add since Sqlf Partition resolver also relies on the value
- // part to calculate the routing object if the table is not partitioned on
- // primary key.
+ // The value field is added since a Partition resolver could also rely on the value
+ // part to calculate the routing object
@Retained(ENTRY_EVENT_NEW_VALUE)
private final Object value;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyWithRegionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyWithRegionContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyWithRegionContext.java
deleted file mode 100644
index b28a551..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/KeyWithRegionContext.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.gemstone.gemfire.internal.cache;
-
-import com.gemstone.gemfire.internal.DataSerializableFixedID;
-
-/**
- * Interface that can be implemented by region keys to allow passing the region
- * after deserialization for any region specific initialization. Note that the
- * {@link LocalRegion#setKeyRequiresRegionContext(boolean)} should also be set
- * for {@link #setRegionContext(LocalRegion)} to be invoked by the GemFire
- * layer. It is required that either all keys of the region implement this
- * interface (and the flag
- * {@link LocalRegion#setKeyRequiresRegionContext(boolean)} is set) or none do.
- *
- * Currently used by SQLFabric for the optimized
- * <code>CompactCompositeRegionKey</code> key implementations that keeps the key
- * as a reference to the raw row bytes and requires a handle of the table schema
- * to interpret those in hashCode/equals/compareTo methods that have no region
- * context information.
- *
- */
-public interface KeyWithRegionContext extends DataSerializableFixedID {
-
- /**
- * Pass the region of the key for setting up of any region specific context
- * for the key. In case of recovery from disk the region may not have been
- * fully initialized yet, so the implementation needs to take that into
- * consideration.
- *
- * @param region
- * the region of this key
- */
- public void setRegionContext(LocalRegion region);
-
- /**
- * Changes required to be done to the key, if any, to optimize serialization
- * for sending across when value is also available.
- *
- * SQLFabric will make the value bytes as null in the key so as to avoid
- * serializing the row twice.
- */
- public KeyWithRegionContext beforeSerializationWithValue(boolean valueIsToken);
-
- /**
- * Changes required to be done to the key, if any, to after deserializing the
- * key in reply with value available. The value is required to be provided in
- * deserialized format (e.g. for {@link CachedDeserializable}s the
- * deserialized value being wrapped must be passed).
- *
- * SQLFabric will restore the value bytes that were set as null in
- * {@link #beforeSerializationWithValue}.
- */
- public KeyWithRegionContext afterDeserializationWithValue(Object val);
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ListOfDeltas.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ListOfDeltas.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ListOfDeltas.java
deleted file mode 100644
index 6592863..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ListOfDeltas.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.internal.cache;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.gemstone.gemfire.InternalGemFireException;
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.internal.cache.delta.Delta;
-
-
-/**
- *
- *
- */
-public final class ListOfDeltas implements Delta {
-
- private List<Delta> listOfDeltas;
- transient private int deltaAppliedIndex = 0;
- public ListOfDeltas(final int size) {
- this.listOfDeltas = new ArrayList<Delta>(size);
- }
-
- public ListOfDeltas(Delta deltaObj) {
- this.listOfDeltas = new ArrayList<Delta>();
- this.listOfDeltas.add(deltaObj);
- }
-
- public ListOfDeltas() {
- }
-
-
-
- public Object apply(EntryEvent ev) {
- if (ev != null && ev instanceof EntryEventImpl) {
- EntryEventImpl putEvent = (EntryEventImpl)ev;
- int last = this.listOfDeltas.size() -1;
- for (int i = this.deltaAppliedIndex; i < listOfDeltas.size(); i++) {
- Object o = listOfDeltas.get(i).apply(putEvent);
- if(i < last) {
- putEvent.setOldValue(o);
- }else {
- putEvent.setNewValue(o);
- }
- }
- return putEvent.getNewValue();
- }
- else {
- throw new InternalGemFireException(
- "ListOfDeltas.apply: putEvent is either null "
- + "or is not of type EntryEventImpl");
- }
- }
-
-
- public Object merge(Object toMerge, boolean isCreate)
- {
- throw new UnsupportedOperationException("Invocation not expected");
- }
-
- public Object merge(Object toMerge)
- {
- this.listOfDeltas.add((Delta)toMerge);
- return this;
- }
-
- public Object getResultantValue()
- {
- return this;
- }
-
- public int getNumDeltas() {
- return this.listOfDeltas.size();
- }
-
- public void setDeltaAppliedIndex(int deltaApplied) {
- this.deltaAppliedIndex = deltaApplied;
- }
-
- public List<Delta> getListOfDeltas() {
- return Collections.unmodifiableList(this.listOfDeltas);
- }
-}
-//SqlFabric changes END
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 6b664fe..8b9664f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -36,7 +36,6 @@ import com.gemstone.gemfire.cache.query.*;
import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
import com.gemstone.gemfire.cache.query.internal.ExecutionContext;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.cache.query.internal.cq.CqService;
import com.gemstone.gemfire.cache.query.internal.index.IndexCreationData;
import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
@@ -428,26 +427,6 @@ public class LocalRegion extends AbstractRegion
return initializingRegion.get();
}
- /**
- * Return true if the keys of this region implement
- * {@link KeyWithRegionContext} that require region specific context
- * initialization after deserialization or recovery from disk.
- *
- * Currently used by SQLFabric for the optimized
- * <code>CompactCompositeRegionKey</code> that points to the raw row bytes and
- * so requires a handle to table schema for interpretation of those bytes.
- */
- public boolean keyRequiresRegionContext() {
- return this.keyRequiresRegionContext;
- }
-
- /**
- * Set the {@link #keyRequiresRegionContext} flag to given value.
- */
- public final void setKeyRequiresRegionContext(boolean v) {
- this.keyRequiresRegionContext = v;
- }
-
public CancelCriterion getCancelCriterion() {
return this.stopper;
}
@@ -502,11 +481,9 @@ public class LocalRegion extends AbstractRegion
this.initializationLatchAfterGetInitialImage = new StoppableCountDownLatch(this.stopper, 1);
this.afterRegionCreateEventLatch = new StoppableCountDownLatch(this.stopper, 1);
- // set the user-attribute object upfront for SQLFabric
if (internalRegionArgs.getUserAttribute() != null) {
setUserAttribute(internalRegionArgs.getUserAttribute());
}
- setKeyRequiresRegionContext(internalRegionArgs.keyRequiresRegionContext());
initializingRegion.set(this);
if (internalRegionArgs.getCachePerfStatsHolder() != null) {
@@ -674,10 +651,6 @@ public class LocalRegion extends AbstractRegion
}
}
- public IndexUpdater getIndexUpdater() {
- return this.entries.getIndexUpdater();
- }
-
boolean isCacheClosing()
{
return this.cache.isClosed();
@@ -854,10 +827,7 @@ public class LocalRegion extends AbstractRegion
&& internalRegionArgs.isUsedForPartitionedRegionBucket()) {
final PartitionedRegion pr = internalRegionArgs
.getPartitionedRegion();
- internalRegionArgs.setIndexUpdater(pr.getIndexUpdater());
internalRegionArgs.setUserAttribute(pr.getUserAttribute());
- internalRegionArgs.setKeyRequiresRegionContext(pr
- .keyRequiresRegionContext());
if (pr.isShadowPR()) {
newRegion = new BucketRegionQueue(subregionName, regionAttributes,
this, this.cache, internalRegionArgs);
@@ -1016,8 +986,6 @@ public class LocalRegion extends AbstractRegion
}
}
- // split into a separate newCreateEntryEvent since SQLFabric may need to
- // manipulate event before doing the put (e.g. posDup flag)
@Retained
public final EntryEventImpl newCreateEntryEvent(Object key, Object value,
Object aCallbackArgument) {
@@ -1076,8 +1044,6 @@ public class LocalRegion extends AbstractRegion
}
}
- // split into a separate newDestroyEntryEvent since SQLFabric may need to
- // manipulate event before doing the put (e.g. posDup flag)
@Retained
public final EntryEventImpl newDestroyEntryEvent(Object key,
Object aCallbackArgument) {
@@ -1588,15 +1554,8 @@ public class LocalRegion extends AbstractRegion
event.setNewEventId(cache.getDistributedSystem());
}
Object oldValue = null;
- // Sqlf changes begin
- // see #40294.
-
- // Rahul: this has to be an update.
- // so executing it as an update.
- boolean forceUpdateForDelta = event.hasDelta();
- // Sqlf Changes end.
if (basicPut(event, false, // ifNew
- forceUpdateForDelta, // ifOld
+ false, // ifOld
null, // expectedOldValue
false // requireOldValue
)) {
@@ -1612,8 +1571,6 @@ public class LocalRegion extends AbstractRegion
return handleNotAvailable(oldValue);
}
- // split into a separate newUpdateEntryEvent since SQLFabric may need to
- // manipulate event before doing the put (e.g. posDup flag)
@Retained
public final EntryEventImpl newUpdateEntryEvent(Object key, Object value,
Object aCallbackArgument) {
@@ -1643,17 +1600,6 @@ public class LocalRegion extends AbstractRegion
if (!eventReturned) event.release();
}
}
- /**
- * Creates an EntryEventImpl that is optimized to not fetch data from HDFS.
- * This is meant to be used by PUT dml from GemFireXD.
- */
- @Retained
- public final EntryEventImpl newPutEntryEvent(Object key, Object value,
- Object aCallbackArgument) {
- EntryEventImpl ev = newUpdateEntryEvent(key, value, aCallbackArgument);
- ev.setPutDML(true);
- return ev;
- }
private void extractDeltaIntoEvent(Object value, EntryEventImpl event) {
// 1. Check for DS-level delta property.
// 2. Default value for operation type is UPDATE, so no need to check that here.
@@ -3579,8 +3525,6 @@ public class LocalRegion extends AbstractRegion
* Returns the value of the entry with the given key as it is stored on disk.
* While the value may be read from disk, it is <b>not </b> stored into the
* entry in the VM. This method is intended for testing purposes only.
- * DO NOT use in product code else it will break SQLFabric that has cases
- * where routing object is not part of only the key.
*
* @throws EntryNotFoundException
* No entry with <code>key</code> exists
@@ -3619,8 +3563,7 @@ public class LocalRegion extends AbstractRegion
/**
* Get the serialized bytes from disk. This method only looks for the value on
* the disk, ignoring heap data. This method is intended for testing purposes
- * only. DO NOT use in product code else it will break SQLFabric that has
- * cases where routing object is not part of only the key.
+ * only.
*
* @param key the object whose hashCode is used to find the value
* @return either a byte array, a CacheDeserializable with the serialized value,
@@ -3675,9 +3618,6 @@ public class LocalRegion extends AbstractRegion
/**
* Does a get that attempts to not fault values in from disk or make the entry
* the most recent in the LRU.
- *
- * Originally implemented in WAN gateway code and moved here in the sqlfire
- * "cheetah" branch.
* @param adamant fault in and affect LRU as a last resort
* @param allowTombstone also return Token.TOMBSTONE if the entry is deleted
* @param serializedFormOkay if the serialized form can be returned
@@ -5069,9 +5009,6 @@ public class LocalRegion extends AbstractRegion
/**
* Get the best iterator for the region entries.
- *
- * TODO there has been some work on this on the sqlfire branch that should
- * be picked up here.
*/
public Iterator<RegionEntry> getBestIterator(boolean includeValues) {
if(this instanceof DistributedRegion) {
@@ -5395,12 +5332,6 @@ public class LocalRegion extends AbstractRegion
callbackArg = new GatewaySenderEventCallbackArgument(callbackArg);
}
}
- //Asif: Modified the call to this constructor by passing the new value obtained from remote site
- //instead of null .
- //The need for this arose, because creation of EntryEvent, makes call to PartitionResolver,
- //to get Hash. If the partitioning column is different from primary key,
- //the resolver for Sqlfabric is not able to obtain the hash object used for creation of KeyInfo
-
@Released final EntryEventImpl event = EntryEventImpl.create(this, Operation.CREATE, key,
value, callbackArg, false /* origin remote */, client.getDistributedMember(),
true /* generateCallbacks */,
@@ -5420,9 +5351,6 @@ public class LocalRegion extends AbstractRegion
}
// Set the new value to the input byte[] if it isn't null
- /// For SqlFabric, if the new value happens to be an serialized object, then
- //it needs to be converted into VMCachedDeserializable , or serializable delta
- // as the case may be
if (value != null) {
// If the byte[] represents an object, then store it serialized
// in a CachedDeserializable; otherwise store it directly as a byte[]
@@ -6064,12 +5992,6 @@ public class LocalRegion extends AbstractRegion
long lastModifiedTime = event.getEventTime(lastModified);
updateStatsForPut(entry, lastModifiedTime, lruRecentUse);
if (!isProxy()) {
- //if (this.isUsedForPartitionedRegionBucket) {
- // if (this.sqlfIndexManager != null) {
- // this.sqlfIndexManager.onEvent(this, event, entry);
- // }
- //}
-
if (!clearConflict && this.indexManager != null) {
try {
if (!entry.isInvalid()) {
@@ -6340,7 +6262,6 @@ public class LocalRegion extends AbstractRegion
}
}
isDup = this.eventTracker.hasSeenEvent(event);
- // don't clobber existing posDup flag e.g. set from SQLFabric client
if (isDup) {
event.setPossibleDuplicate(true);
if (this.concurrencyChecksEnabled && event.getVersionTag() == null) {
@@ -7844,25 +7765,9 @@ public class LocalRegion extends AbstractRegion
}
}
}
- void cleanUpOnIncompleteOp(EntryEventImpl event, RegionEntry re,
- boolean eventRecorded, boolean updateStats, boolean isReplace) {
- //TODO:Asif: This is incorrect implementation for replicated region in case of
- //sql fabric, as sqlf index would already be updated, if eventRecorded
- //flag is true.So if entry is being removed ,
- //then the sqlfindex also needs to be corrected
- IndexUpdater iu = this.getIndexUpdater(); // sqlf system
- if(!eventRecorded || iu ==null || isReplace) {
- //Ok to remove entry whether sqlfabric or gfe as index has not been modified yet by the operation
- this.entries.removeEntry(event.getKey(), re, updateStats) ;
- }else {
- // a sqlf system, with event recorded as true. we need to update index.
- //Use the current event to indicate destroy.should be ok
- Operation oldOp = event.getOperation();
- event.setOperation(Operation.DESTROY);
- this.entries.removeEntry(event.getKey(), re, updateStats, event, this, iu);
- event.setOperation(oldOp);
- }
-
+ void cleanUpOnIncompleteOp(EntryEventImpl event, RegionEntry re) {
+ //Ok to remove entry as index has not been modified yet by the operation
+ this.entries.removeEntry(event.getKey(), re, false) ;
}
static void validateRegionName(String name)
@@ -10531,8 +10436,6 @@ public class LocalRegion extends AbstractRegion
}
- // split into a separate newPutAllOperation since SQLFabric may need to
- // manipulate event before doing the put (e.g. posDup flag)
public final DistributedPutAllOperation newPutAllOperation(Map<?, ?> map, Object callbackArg) {
if (map == null) {
throw new NullPointerException(LocalizedStrings
@@ -10556,12 +10459,6 @@ public class LocalRegion extends AbstractRegion
DistributedPutAllOperation dpao = new DistributedPutAllOperation(event, map.size(), false);
return dpao;
}
- public final DistributedPutAllOperation newPutAllForPUTDmlOperation(Map<?, ?> map, Object callbackArg) {
- DistributedPutAllOperation dpao = newPutAllOperation(map, callbackArg);
- dpao.getEvent().setPutDML(true);
- return dpao;
- }
-
public final DistributedRemoveAllOperation newRemoveAllOperation(Collection<?> keys, Object callbackArg) {
if (keys == null) {
@@ -10613,8 +10510,6 @@ public class LocalRegion extends AbstractRegion
putallOp, this, Operation.PUTALL_CREATE, key, value);
try {
- event.setPutDML(putallOp.getEvent().isPutDML());
-
if (tagHolder != null) {
event.setVersionTag(tagHolder.getVersionTag());
event.setFromServer(tagHolder.isFromServer());
@@ -11015,8 +10910,7 @@ public class LocalRegion extends AbstractRegion
final CacheProfile prof = (CacheProfile)profile;
// if region in cache is not yet initialized, exclude
- if (prof.regionInitialized // fix for bug 41102
- && !prof.memberUnInitialized) {
+ if (prof.regionInitialized) { // fix for bug 41102
// cut the visit short if we find a CacheLoader
return !prof.hasCacheLoader;
}
@@ -11033,8 +10927,8 @@ public class LocalRegion extends AbstractRegion
assert profile instanceof CacheProfile;
final CacheProfile prof = (CacheProfile)profile;
- // if region in cache is in recovery, or member not initialized exclude
- if (!prof.inRecovery && !prof.memberUnInitialized) {
+ // if region in cache is in recovery
+ if (!prof.inRecovery) {
// cut the visit short if we find a CacheWriter
return !prof.hasCacheWriter;
}
@@ -11486,15 +11380,6 @@ public class LocalRegion extends AbstractRegion
distributeUpdatedProfileOnSenderCreation();
}
- /**
- * @since GemFire SqlFabric
- *
- */
- void distributeUpdatedProfileOnHubCreation()
- {
- // No op
- }
-
void distributeUpdatedProfileOnSenderCreation()
{
// No op
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
index 4c04054..59b0893 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
@@ -1867,7 +1867,6 @@ public final class Oplog implements CompactableOplog, Flushable {
CountingDataInputStream dis = null;
try {
final LocalRegion currentRegion = LocalRegion.getInitializingRegion();
- final boolean keyRequiresRegionContext = currentRegion != null ? currentRegion.keyRequiresRegionContext() : false;
final Version version = getProductVersionIfOld();
final ByteArrayDataInput in = new ByteArrayDataInput();
final HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
@@ -1909,7 +1908,7 @@ public final class Oplog implements CompactableOplog, Flushable {
}
break;
case OPLOG_NEW_ENTRY_0ID:
- readNewEntry(dis, opCode, deletedIds, recoverValues, currentRegion, keyRequiresRegionContext, version, in, hdos);
+ readNewEntry(dis, opCode, deletedIds, recoverValues, currentRegion, version, in, hdos);
recordCount++;
break;
case OPLOG_MOD_ENTRY_1ID:
@@ -1920,7 +1919,7 @@ public final class Oplog implements CompactableOplog, Flushable {
case OPLOG_MOD_ENTRY_6ID:
case OPLOG_MOD_ENTRY_7ID:
case OPLOG_MOD_ENTRY_8ID:
- readModifyEntry(dis, opCode, deletedIds, recoverValues, currentRegion, keyRequiresRegionContext, version, in, hdos);
+ readModifyEntry(dis, opCode, deletedIds, recoverValues, currentRegion, version, in, hdos);
recordCount++;
break;
case OPLOG_MOD_ENTRY_WITH_KEY_1ID:
@@ -1931,7 +1930,7 @@ public final class Oplog implements CompactableOplog, Flushable {
case OPLOG_MOD_ENTRY_WITH_KEY_6ID:
case OPLOG_MOD_ENTRY_WITH_KEY_7ID:
case OPLOG_MOD_ENTRY_WITH_KEY_8ID:
- readModifyEntryWithKey(dis, opCode, deletedIds, recoverValues, currentRegion, keyRequiresRegionContext, version, in,
+ readModifyEntryWithKey(dis, opCode, deletedIds, recoverValues, currentRegion, version, in,
hdos);
recordCount++;
break;
@@ -2414,7 +2413,7 @@ public final class Oplog implements CompactableOplog, Flushable {
* @throws IOException
*/
private void readNewEntry(CountingDataInputStream dis, byte opcode, OplogEntryIdSet deletedIds, boolean recoverValue,
- final LocalRegion currentRegion, boolean keyRequiresRegionContext, Version version, ByteArrayDataInput in,
+ final LocalRegion currentRegion, Version version, ByteArrayDataInput in,
HeapDataOutputStream hdos) throws IOException {
final boolean isPersistRecoveryDebugEnabled = logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY);
@@ -2553,9 +2552,6 @@ public final class Oplog implements CompactableOplog, Flushable {
}
} else {
Object key = deserializeKey(keyBytes, version, in);
- if (keyRequiresRegionContext) {
- ((KeyWithRegionContext) key).setRegionContext(currentRegion);
- }
{
Object oldValue = getRecoveryMap().put(oplogKeyId, key);
if (oldValue != null) {
@@ -2605,7 +2601,7 @@ public final class Oplog implements CompactableOplog, Flushable {
* @throws IOException
*/
private void readModifyEntry(CountingDataInputStream dis, byte opcode, OplogEntryIdSet deletedIds, boolean recoverValue,
- LocalRegion currentRegion, boolean keyRequiresRegionContext, Version version, ByteArrayDataInput in, HeapDataOutputStream hdos)
+ LocalRegion currentRegion, Version version, ByteArrayDataInput in, HeapDataOutputStream hdos)
throws IOException {
final boolean isPersistRecoveryDebugEnabled = logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY);
@@ -2711,9 +2707,6 @@ public final class Oplog implements CompactableOplog, Flushable {
byte[] keyBytes = (byte[]) skippedKeyBytes.get(oplogKeyId);
if (keyBytes != null) {
key = deserializeKey(keyBytes, version, in);
- if (keyRequiresRegionContext) {
- ((KeyWithRegionContext) key).setRegionContext(currentRegion);
- }
}
}
if (isPersistRecoveryDebugEnabled) {
@@ -2829,7 +2822,7 @@ public final class Oplog implements CompactableOplog, Flushable {
* @throws IOException
*/
private void readModifyEntryWithKey(CountingDataInputStream dis, byte opcode, OplogEntryIdSet deletedIds, boolean recoverValue,
- final LocalRegion currentRegion, final boolean keyRequiresRegionContext, Version version, ByteArrayDataInput in,
+ final LocalRegion currentRegion, Version version, ByteArrayDataInput in,
HeapDataOutputStream hdos) throws IOException {
long oplogOffset = -1;
@@ -2966,9 +2959,6 @@ public final class Oplog implements CompactableOplog, Flushable {
}
} else {
Object key = deserializeKey(keyBytes, version, in);
- if (keyRequiresRegionContext) {
- ((KeyWithRegionContext) key).setRegionContext(currentRegion);
- }
Object oldValue = getRecoveryMap().put(oplogKeyId, key);
if (oldValue != null) {
throw new AssertionError(LocalizedStrings.Oplog_DUPLICATE_CREATE.toLocalizedString(oplogKeyId));
@@ -7039,8 +7029,6 @@ public final class Oplog implements CompactableOplog, Flushable {
public void handleValueOverflow(RegionEntryContext context) {throw new IllegalStateException();}
@Override
- public void afterValueOverflow(RegionEntryContext context) {throw new IllegalStateException();}
- @Override
public Object prepareValueForCache(RegionEntryContext r, Object val, boolean isEntryUpdate) { throw new IllegalStateException("Should never be called"); }
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
index f933024..c33efb7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
@@ -432,8 +432,6 @@ public class PRHARedundancyProvider
this.prRegion.checkReadiness();
Set<InternalDistributedMember> available = this.prRegion
.getRegionAdvisor().adviseInitializedDataStore();
- // remove uninitialized members for bucket creation
- this.prRegion.getCache().removeUnInitializedMembers(available);
InternalDistributedMember target = null;
available.removeAll(attempted);
for (InternalDistributedMember member : available) {
@@ -575,8 +573,6 @@ public class PRHARedundancyProvider
// Always go back to the advisor, see if any fresh data stores are
// present.
Set<InternalDistributedMember> allStores = getAllStores(partitionName);
- // remove nodes that are not fully initialized
- this.prRegion.getCache().removeUnInitializedMembers(allStores);
loggedInsufficentStores = checkSufficientStores(allStores,
loggedInsufficentStores);
@@ -776,7 +772,6 @@ public class PRHARedundancyProvider
// the parent's in case of colocation) so it is now passed
//InternalDistributedMember targetPrimary = getPreferredDataStore(
// acceptedMembers, Collections.<InternalDistributedMember> emptySet());
- this.prRegion.getCache().removeUnInitializedMembers(acceptedMembers);
targetPrimary = getPreferredDataStore(acceptedMembers, Collections
.<InternalDistributedMember> emptySet());
}
@@ -1580,9 +1575,6 @@ public class PRHARedundancyProvider
if (!PRHARedundancyProvider.this.prRegion.isDataStore()) {
return;
}
- if (cache.isUnInitializedMember(cache.getMyId())) {
- return;
- }
Runnable task = new RecoveryRunnable(this) {
@Override
public void run2()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
index 47548f3..dd90a62 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
@@ -384,16 +384,6 @@ public class PartitionAttributesImpl implements PartitionAttributes,
.append("]") .toString();
}
- public String getStringForSQLF() {
- final StringBuilder sb = new StringBuilder();
- return sb.append("redundantCopies=").append(getRedundantCopies()).append(
- ",totalMaxMemory=").append(this.totalMaxMemory).append(
- ",totalNumBuckets=").append(this.totalNumBuckets).append(
- ",colocatedWith=").append(this.colocatedRegionName).append(
- ",recoveryDelay=").append(this.recoveryDelay).append(
- ",startupRecoveryDelay=").append(this.startupRecoveryDelay).toString();
- }
-
/**
* @throws IllegalStateException if off-heap and the actual value is not yet known (because the DistributedSystem has not yet been created)
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
index 9375d04..26c91e0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
@@ -1035,16 +1035,6 @@ public class PartitionedRegion extends LocalRegion implements
}
@Override
- void distributeUpdatedProfileOnHubCreation()
- {
- if (!(this.isClosed || this.isLocallyDestroyed)) {
- // tell others of the change in status
- this.requiresNotification = true;
- new UpdateAttributesProcessor(this).distribute(false);
- }
- }
-
- @Override
void distributeUpdatedProfileOnSenderCreation()
{
if (!(this.isClosed || this.isLocallyDestroyed)) {
@@ -1376,11 +1366,7 @@ public class PartitionedRegion extends LocalRegion implements
boolean colocatedLockAcquired = false;
try {
boolean colocationComplete = false;
- if (colocatedRegion != null && !prConfig.isColocationComplete() &&
- // if the current node is marked uninitialized (SQLF DDL replay in
- // progress) then colocation will definitely not be marked complete so
- // avoid taking the expensive region lock
- !getCache().isUnInitializedMember(getDistributionManager().getId())) {
+ if (colocatedRegion != null && !prConfig.isColocationComplete()) {
colocatedLock = colocatedRegion.getRegionLock();
colocatedLock.lock();
colocatedLockAcquired = true;
@@ -1389,16 +1375,7 @@ public class PartitionedRegion extends LocalRegion implements
if (parentConf.isColocationComplete()
&& parentConf.hasSameDataStoreMembers(prConfig)) {
colocationComplete = true;
- // check if all the nodes have been initialized (SQLF bug #42089)
- for (Node node : nodes) {
- if (getCache().isUnInitializedMember(node.getMemberId())) {
- colocationComplete = false;
- break;
- }
- }
- if (colocationComplete) {
- prConfig.setColocationComplete();
- }
+ prConfig.setColocationComplete();
}
}
@@ -1935,13 +1912,6 @@ public class PartitionedRegion extends LocalRegion implements
if (targetNode == null) {
try {
bucketStorageAssigned=false;
- // if this is a Delta update, then throw exception since the key doesn't
- // exist if there is no bucket for it yet
- if (event.hasDelta()) {
- throw new EntryNotFoundException(LocalizedStrings.
- PartitionedRegion_CANNOT_APPLY_A_DELTA_WITHOUT_EXISTING_ENTRY
- .toLocalizedString());
- }
targetNode = createBucket(bucketId.intValue(), event.getNewValSizeForPR(),
null);
}
@@ -3462,10 +3432,8 @@ public class PartitionedRegion extends LocalRegion implements
boolean isBucketSetAsFilter) {
final Set routingKeys = execution.getFilter();
final boolean primaryMembersNeeded = function.optimizeForWrite();
- final boolean hasRoutingObjects = execution.hasRoutingObjects();
HashMap<Integer, HashSet> bucketToKeysMap = FunctionExecutionNodePruner
- .groupByBucket(this, routingKeys, primaryMembersNeeded,
- hasRoutingObjects, isBucketSetAsFilter);
+ .groupByBucket(this, routingKeys, primaryMembersNeeded, false, isBucketSetAsFilter);
HashMap<InternalDistributedMember, HashSet> memberToKeysMap = new HashMap<InternalDistributedMember, HashSet>();
HashMap<InternalDistributedMember, HashSet<Integer>> memberToBuckets = FunctionExecutionNodePruner
.groupByMemberToBuckets(this, bucketToKeysMap.keySet(), primaryMembersNeeded);
@@ -3555,7 +3523,7 @@ public class PartitionedRegion extends LocalRegion implements
else {
localBucketSet = FunctionExecutionNodePruner
.getBucketSet(PartitionedRegion.this, localKeys,
- hasRoutingObjects, isBucketSetAsFilter);
+ false, isBucketSetAsFilter);
remoteOnly = false;
}
@@ -3591,7 +3559,7 @@ public class PartitionedRegion extends LocalRegion implements
FunctionRemoteContext context = new FunctionRemoteContext(function,
execution.getArgumentsForMember(recip.getId()), memKeys,
FunctionExecutionNodePruner.getBucketSet(this, memKeys,
- hasRoutingObjects, isBucketSetAsFilter), execution.isReExecute(),
+ false, isBucketSetAsFilter), execution.isReExecute(),
execution.isFnSerializationReqd());
recipMap.put(recip, context);
}
@@ -3621,15 +3589,8 @@ public class PartitionedRegion extends LocalRegion implements
if (isBucketSetAsFilter) {
bucketId = ((Integer) key).intValue();
} else {
- if (execution.hasRoutingObjects()) {
- bucketId = Integer.valueOf(PartitionedRegionHelper
- .getHashKey(this, key));
- } else {
- // bucketId = Integer.valueOf(PartitionedRegionHelper.getHashKey(this,
- // Operation.FUNCTION_EXECUTION, key, null));
- bucketId = Integer.valueOf(PartitionedRegionHelper.getHashKey(this,
+ bucketId = Integer.valueOf(PartitionedRegionHelper.getHashKey(this,
Operation.FUNCTION_EXECUTION, key, null, null));
- }
}
InternalDistributedMember targetNode = null;
if (function.optimizeForWrite()) {
@@ -5066,21 +5027,6 @@ public class PartitionedRegion extends LocalRegion implements
/**
* generates new partitioned region ID globally.
*/
- // !!!:ezoerner:20080321 made this function public and static.
- // @todo should be moved to the Distributed System level as a general service
- // for getting a unique id, with different "domains" for different
- // contexts
- // :soubhik:pr_func merge20914:21056: overloaded static and non-static version of generatePRId.
- // static version is used mainly with sqlf & non-static in gfe.
- public static int generatePRId(InternalDistributedSystem sys, Cache cache) {
-
- GemFireCacheImpl gfcache = (GemFireCacheImpl) cache;
-
- if(gfcache == null) return 0;
-
- return _generatePRId(sys, gfcache.getPartitionedRegionLockService());
- }
-
public int generatePRId(InternalDistributedSystem sys) {
final DistributedLockService lockService = getPartitionedRegionLockService();
return _generatePRId(sys, lockService);
@@ -6257,15 +6203,6 @@ public class PartitionedRegion extends LocalRegion implements
}
/**
- * Currently used by SQLFabric to get a non-wrapped iterator for all entries
- * for index consistency check.
- */
- public Set allEntries() {
- return new PREntriesSet();
- }
-
-
- /**
* Set view of entries. This currently extends the keySet iterator and
* performs individual getEntry() operations using the keys
*
@@ -7678,20 +7615,7 @@ public class PartitionedRegion extends LocalRegion implements
}
@Override
- public void localDestroyRegion(Object aCallbackArgument) {
- localDestroyRegion(aCallbackArgument, false);
- }
-
- /**
- * Locally destroy a region.
- *
- * SQLFabric change: The parameter "ignoreParent" has been added to allow
- * skipping the check for parent colocated region. This is because SQLFabric
- * DDLs are distributed in any case and are guaranteed to be atomic (i.e. no
- * concurrent DMLs on that table). Without this it is quite ugly to implement
- * "TRUNCATE TABLE" which first drops the table and recreates it.
- */
- public void localDestroyRegion(Object aCallbackArgument, boolean ignoreParent)
+ public void localDestroyRegion(Object aCallbackArgument)
{
getDataView().checkSupportsRegionDestroy();
String prName = this.getColocatedWith();
@@ -7707,7 +7631,7 @@ public class PartitionedRegion extends LocalRegion implements
}
}
- if ((!ignoreParent && prName != null)
+ if ((prName != null)
|| (!childRegionsWithoutSendersList.isEmpty())) {
throw new UnsupportedOperationException(
"Any Region in colocation chain cannot be destroyed locally.");
@@ -9430,8 +9354,6 @@ public class PartitionedRegion extends LocalRegion implements
/**
* This method is intended for testing purposes only.
- * DO NOT use in product code else it will break SQLFabric that has cases
- * where routing object is not part of only the key.
*/
@Override
public Object getValueOnDisk(Object key) throws EntryNotFoundException {
@@ -9444,8 +9366,6 @@ public class PartitionedRegion extends LocalRegion implements
/**
* This method is intended for testing purposes only.
- * DO NOT use in product code else it will break SQLFabric that has cases
- * where routing object is not part of only the key.
*/
@Override
public Object getValueOnDiskOrBuffer(Object key) throws EntryNotFoundException {
@@ -9565,33 +9485,13 @@ public class PartitionedRegion extends LocalRegion implements
}
public PartitionResolver getPartitionResolver() {
- // [SQLFabric] use PartitionAttributes to get the the resolver
- // since it may change after ALTER TABLE
return this.partitionAttributes.getPartitionResolver();
}
public String getColocatedWith() {
- // [SQLFabric] use PartitionAttributes to get colocated region
- // since it may change after ALTER TABLE
return this.partitionAttributes.getColocatedWith();
}
- // For SQLFabric ALTER TABLE. Need to set the colocated region using
- // PartitionAttributesImpl and also reset the parentAdvisor for
- // BucketAdvisors.
- /**
- * Set the colocated with region path and adjust the BucketAdvisor's. This
- * should *only* be invoked when region is just newly created and has no data
- * or existing buckets else will have undefined behaviour.
- *
- * @since GemFire 6.5
- */
- public void setColocatedWith(String colocatedRegionFullPath) {
- ((PartitionAttributesImpl)this.partitionAttributes)
- .setColocatedWith(colocatedRegionFullPath);
- this.getRegionAdvisor().resetBucketAdvisorParents();
- }
-
/**
* Used to get membership events from our advisor to implement
* RegionMembershipListener invocations. This is copied almost in whole from
@@ -9649,98 +9549,6 @@ public class PartitionedRegion extends LocalRegion implements
}
}
- /*
- * This is an internal API for sqlFabric only <br>
- * This is usefull to execute a function on set of nodes irrelevant of the
- * routinKeys <br>
- * notes : This API uses DefaultResultCollector. If you want your Custome
- * Result collector, let me know
- *
- * @param functionName
- * @param args
- * @param nodes
- * Set of DistributedMembers on which this function will be
- * executed
- * @throws Exception
- *//*
- public ResultCollector executeFunctionOnNodes(String functionName,
- Serializable args, Set nodes) throws Exception {
- Assert.assertTrue(functionName != null, "Error: functionName is null");
- Assert.assertTrue(nodes != null, "Error: nodes set is null");
- Assert.assertTrue(nodes.size() != 0, "Error: empty nodes Set");
- ResultCollector rc = new DefaultResultCollector();
- boolean isSelf = nodes.remove(getMyId());
- PartitionedRegionFunctionResponse response = null;
- //TODO Yogesh: this API is broken after Resultsender implementation
- //response = new PartitionedRegionFunctionResponse(this.getSystem(), nodes,
- // rc);
- Iterator i = nodes.iterator();
- while (i.hasNext()) {
- InternalDistributedMember recip = (InternalDistributedMember)i.next();
- PartitionedRegionFunctionMessage.send(recip, this, functionName, args,
- null routingKeys , response, null);
- }
- if (isSelf) {
- // execute locally and collect the result
- if (this.dataStore != null) {
- this.dataStore.executeOnDataStore(
- null routingKeys , functionName, args, 0,null,rc,null);
- }
- }
- return response;
- }*/
-
-
- /*
- * This is an internal API for sqlFabric only <br>
- * API for invoking a function using primitive ints as the routing objects
- * (i.e. passing the hashcodes of the routing objects directly). <br>
- * notes : This API uses DefaultResultCollector. If you want to pass your
- * Custom Result collector, let me know
- *
- * @param functionName
- * @param args
- * @param hashcodes
- * hashcodes of the routing objects
- * @throws Exception
- *//*
- public ResultCollector executeFunctionUsingHashCodes(String functionName,
- Serializable args, int hashcodes[]) throws Exception {
- Assert.assertTrue(functionName != null, "Error: functionName is null");
- Assert.assertTrue(hashcodes != null, "Error: hashcodes array is null");
- Assert.assertTrue(hashcodes.length != 0, "Error: empty hashcodes array");
- Set nodes = new HashSet();
- for (int i = 0; i < hashcodes.length; i++) {
- int bucketId = hashcodes[i] % getTotalNumberOfBuckets();
- InternalDistributedMember n = getNodeForBucketRead(bucketId);
- nodes.add(n);
- }
- return executeFunctionOnNodes(functionName, args, nodes);
- }*/
-
- /**
- * This is an internal API for sqlFabric only <br>
- * Given a array of routing objects, returns a set of members on which the (owner of each
- * buckets)
- *
- * @param routingObjects array of routing objects passed
- * @return Set of InternalDistributedMembers
- */
- public Set getMembersFromRoutingObjects(Object[] routingObjects) {
- Assert.assertTrue(routingObjects != null, "Error: null routingObjects ");
- Assert.assertTrue(routingObjects.length != 0, "Error: empty routingObjects ");
- Set nodeSet = new HashSet();
- int bucketId;
- for (int i = 0; i < routingObjects.length; i++) {
- bucketId = PartitionedRegionHelper.getHashKey(routingObjects[i],
- getTotalNumberOfBuckets());
- InternalDistributedMember lnode = getOrCreateNodeForBucketRead(bucketId);
- if (lnode != null) {
- nodeSet.add(lnode);
- }
- }
- return nodeSet;
- }
@Override
protected RegionEntry basicGetTXEntry(KeyInfo keyInfo) {
int bucketId = keyInfo.getBucketId();
@@ -10525,9 +10333,7 @@ public class PartitionedRegion extends LocalRegion implements
}
/**
- * Returns the local BucketRegion given the key and value. Particularly useful
- * for SQLFabric where the routing object may be part of value and determining
- * from key alone will require an expensive global index lookup.
+ * Returns the local BucketRegion given the key and value.
* Returns null if no BucketRegion exists.
*/
public BucketRegion getBucketRegion(Object key, Object value) {
@@ -10754,74 +10560,6 @@ public class PartitionedRegion extends LocalRegion implements
}
}
- /**
- * Clear local primary buckets.
- * This is currently only used by gemfirexd truncate table
- * to clear the partitioned region.
- */
- public void clearLocalPrimaries() {
- // rest of it should be done only if this is a store while RecoveryLock
- // above still required even if this is an accessor
- if (getLocalMaxMemory() > 0) {
- // acquire the primary bucket locks
- // do this in a loop to handle the corner cases where a primary
- // bucket region ceases to be so when we actually take the lock
- // (probably not required to do this in loop after the recovery lock)
- // [sumedh] do we need both recovery lock and bucket locks?
- boolean done = false;
- Set<BucketRegion> lockedRegions = null;
- while (!done) {
- lockedRegions = getDataStore().getAllLocalPrimaryBucketRegions();
- done = true;
- for (BucketRegion br : lockedRegions) {
- try {
- br.doLockForPrimary(false);
- } catch (RegionDestroyedException rde) {
- done = false;
- break;
- } catch (PrimaryBucketException pbe) {
- done = false;
- break;
- } catch (Exception e) {
- // ignore any other exception
- logger.debug(
- "GemFireContainer#clear: ignoring exception "
- + "in bucket lock acquire", e);
- }
- }
- }
-
- try {
- // now clear the bucket regions; we go through the primary bucket
- // regions so there is distribution for every bucket but that
- // should be performant enough
- for (BucketRegion br : lockedRegions) {
- try {
- br.clear();
- } catch (Exception e) {
- // ignore any other exception
- logger.debug(
- "GemFireContainer#clear: ignoring exception "
- + "in bucket clear", e);
- }
- }
- } finally {
- // release the bucket locks
- for (BucketRegion br : lockedRegions) {
- try {
- br.doUnlockForPrimary();
- } catch (Exception e) {
- // ignore all exceptions at this stage
- logger.debug(
- "GemFireContainer#clear: ignoring exception "
- + "in bucket lock release", e);
- }
- }
- }
- }
-
- }
-
public void shadowPRWaitForBucketRecovery() {
assert this.isShadowPR();
PartitionedRegion userPR = ColocationHelper.getLeaderRegion(this);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
index 3855adc..494c288 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.execute.ResultSender;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.cache.query.internal.QCompiler;
import com.gemstone.gemfire.cache.query.internal.index.IndexCreationData;
import com.gemstone.gemfire.cache.query.internal.index.PartitionedIndex;
@@ -431,19 +430,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats
Object redundancyLock = lockRedundancyLock(moveSource,
possiblyFreeBucketId, replaceOffineData);
//DAN - I hope this is ok to do without that bucket admin lock
- // Take SQLF lock to wait for any ongoing index initializations.
- // The lock is taken here in addition to that in
- // DistributedRegion#initialize() so as to release only after
- // assignBucketRegion() has been invoked (see bug #41877).
- // Assumes that the IndexUpdater#lockForGII() lock is re-entrant.
- final IndexUpdater indexUpdater = this.partitionedRegion
- .getIndexUpdater();
- boolean sqlfIndexLocked = false;
try {
- if (indexUpdater != null) {
- indexUpdater.lockForGII();
- sqlfIndexLocked = true;
- }
buk.initializePrimaryElector(creationRequestor);
if (getPartitionedRegion().getColocatedWith() == null) {
buk.getBucketAdvisor().setShadowBucketDestroyed(false);
@@ -476,9 +463,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats
}
}
} finally {
- if (sqlfIndexLocked) {
- indexUpdater.unlockForGII();
- }
releaseRedundancyLock(redundancyLock);
if(bukReg == null) {
buk.clearPrimaryElector();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
index ee8e0c8..55d11fc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
@@ -30,7 +30,6 @@ import com.gemstone.gemfire.cache.EntryNotFoundException;
import com.gemstone.gemfire.cache.Operation;
import com.gemstone.gemfire.cache.TimeoutException;
import com.gemstone.gemfire.cache.TransactionId;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.distributed.internal.DM;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.ByteArrayDataInput;
@@ -56,23 +55,10 @@ import com.gemstone.gemfire.internal.offheap.annotations.Released;
*/
final class ProxyRegionMap implements RegionMap {
- /** An internal Listener for index maintenance for SQLFabric. */
- private final IndexUpdater indexUpdater;
-
protected ProxyRegionMap(LocalRegion owner, Attributes attr,
InternalRegionArguments internalRegionArgs) {
this.owner = owner;
this.attr = attr;
- if (internalRegionArgs != null) {
- this.indexUpdater = internalRegionArgs.getIndexUpdater();
- }
- else {
- this.indexUpdater = null;
- }
- }
-
- public final IndexUpdater getIndexUpdater() {
- return this.indexUpdater;
}
/**
@@ -249,13 +235,6 @@ final class ProxyRegionMap implements RegionMap {
lastModified = // fix for bug 40129
this.owner.basicPutPart2(event, markerEntry, true,
lastModified, false /*Clear conflict occurred */);
- // invoke SQLFabric index manager if present
- final IndexUpdater indexUpdater = getIndexUpdater();
- if (indexUpdater != null) {
- // postEvent not required to be invoked since this is currently used
- // only for FK checks
- indexUpdater.onEvent(this.owner, event, markerEntry);
- }
this.owner.basicPutPart3(event, markerEntry, true,
lastModified, true, ifNew, ifOld, expectedOldValue, requireOldValue);
return markerEntry;
@@ -399,7 +378,7 @@ final class ProxyRegionMap implements RegionMap {
}
public void removeEntry(Object key, RegionEntry re, boolean updateStat,
- EntryEventImpl event, LocalRegion owner, IndexUpdater indexUpdater) {
+ EntryEventImpl event, LocalRegion owner) {
// nothing to do
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
index 22f9903..7be2bb9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
@@ -161,13 +161,7 @@ public class QueuedOperation
key = DataSerializer.readObject(in);
if (op.isUpdate() || op.isCreate()) {
deserializationPolicy = in.readByte();
- if (deserializationPolicy ==
- DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER) {
- valueObj = DataSerializer.readObject(in);
- }
- else {
- value = DataSerializer.readByteArray(in);
- }
+ value = DataSerializer.readByteArray(in);
}
}
return new QueuedOperation(op, key, value, valueObj, deserializationPolicy,
@@ -183,13 +177,7 @@ public class QueuedOperation
DataSerializer.writeObject(this.key, out);
if (this.op.isUpdate() || this.op.isCreate()) {
out.writeByte(this.deserializationPolicy);
- if (this.deserializationPolicy !=
- DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER) {
- DataSerializer.writeByteArray(this.value, out);
- }
- else {
- DataSerializer.writeObject(this.valueObj, out);
- }
+ DataSerializer.writeByteArray(this.value, out);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
index b35eaa3..48ed5db 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
@@ -379,16 +379,14 @@ public interface RegionEntry {
/**
* Gets the value for this entry. For DiskRegions, unlike
* {@link #getValue(RegionEntryContext)} this will not fault in the value rather
- * return a temporary copy. For SQLFabric this is used during table scans in
- * queries when faulting in every value will be only an unnecessary overhead.
+ * return a temporary copy.
*/
public Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner);
/**
* Gets the value for this entry. For DiskRegions, unlike
* {@link #getValue(RegionEntryContext)} this will not fault in the value rather
- * return a temporary copy. For SQLFabric this is used during table scans in
- * queries when faulting in every value will be only an unnecessary overhead.
+ * return a temporary copy.
* The value returned will be kept off heap (and compressed) if possible.
*/
@Retained
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
index a16f1ec..57f8853 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
@@ -27,7 +27,6 @@ import com.gemstone.gemfire.cache.EntryNotFoundException;
import com.gemstone.gemfire.cache.Operation;
import com.gemstone.gemfire.cache.TimeoutException;
import com.gemstone.gemfire.cache.TransactionId;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.internal.cache.lru.LRUMapCallbacks;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
@@ -355,16 +354,13 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* Removes the given key if the enclosing RegionEntry is still in this map for
- * the given EntryEvent and updating the given {@link IndexUpdater} of the
- * region ({@link #getIndexUpdater()}) for the event.
+ * the given EntryEvent
*/
public void removeEntry(Object key, RegionEntry re, boolean updateStat,
- EntryEventImpl event, LocalRegion owner, IndexUpdater indexUpdater);
+ EntryEventImpl event, LocalRegion owner);
public void copyRecoveredEntries(RegionMap rm);
- public IndexUpdater getIndexUpdater();
-
/**
* Removes an entry that was previously destroyed and made into a tombstone.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
index a1b5d0c..d5a52d4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
@@ -123,9 +123,6 @@ public final class RemoteContainsKeyValueMessage extends RemoteOperationMessageW
r.waitOnInitialization(); // bug #43371 - accessing a region before it's initialized
}
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
final boolean replyVal;
if (this.valueCheck) {
replyVal = r.containsValueForKey(this.key);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
index 822b317..2bec70f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
@@ -357,9 +357,6 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
if (eventSender == null) {
eventSender = getSender();
}
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
@Released EntryEventImpl event = null;
try {
if (this.bridgeContext != null) {
@@ -468,8 +465,6 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
if (this.hasOldValue){
//out.writeBoolean(this.hasOldValue);
// below boolean is not strictly required, but this is for compatibility
- // with SQLFire code which writes as byte here to indicate whether
- // oldValue is an object, serialized object or byte[]
in.readByte();
setOldValBytes(DataSerializer.readByteArray(in));
}
@@ -595,12 +590,8 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
private void setOldValueIsSerialized(boolean isSerialized) {
if (isSerialized) {
- if (CachedDeserializableFactory.preferObject()) {
- this.oldValueIsSerialized = true; //VALUE_IS_OBJECT;
- } else {
- // Defer serialization until toData is called.
- this.oldValueIsSerialized = true; //VALUE_IS_SERIALIZED_OBJECT;
- }
+ // Defer serialization until toData is called.
+ this.oldValueIsSerialized = true; //VALUE_IS_SERIALIZED_OBJECT;
} else {
this.oldValueIsSerialized = false; //VALUE_IS_BYTES;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
index b7cc393..b7a4a81 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
@@ -128,9 +128,6 @@ public final class RemoteFetchEntryMessage extends RemoteOperationMessage
}
EntrySnapshot val;
try {
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
final KeyInfo keyInfo = r.getKeyInfo(key);
Region.Entry re = r.getDataView().getEntry(keyInfo, r, true);
if(re==null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
index 21590f6..124c9b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
@@ -122,9 +122,6 @@ public final class RemoteFetchVersionMessage extends RemoteOperationMessage {
}
VersionTag tag;
try {
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext) this.key).setRegionContext(r);
- }
RegionEntry re = r.getRegionEntry(key);
if (re == null) {
if (logger.isTraceEnabled(LogMarker.DM)) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
index 7e2be1f..05d62d4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
@@ -118,9 +118,6 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl
RawValue valueBytes;
Object val = null;
try {
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
KeyInfo keyInfo = r.getKeyInfo(key, cbArg);
val = r.getDataView().getSerializedValue(r, keyInfo, false, this.context, null, false /*for replicate regions*/);
valueBytes = val instanceof RawValue ? (RawValue)val : new RawValue(val);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
index f975f6f..a4e020e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
@@ -188,9 +188,6 @@ public final class RemoteInvalidateMessage extends RemoteDestroyMessage {
eventSender = getSender();
}
final Object key = getKey();
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)key).setRegionContext(r);
- }
@Released final EntryEventImpl event = EntryEventImpl.create(
r,
getOperation(),
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
index 045e51c..c0c56c9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
@@ -82,7 +82,6 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
protected static final short HAS_BRIDGE_CONTEXT = UNRESERVED_FLAGS_START;
protected static final short SKIP_CALLBACKS = (HAS_BRIDGE_CONTEXT << 1);
- protected static final short IS_PUT_DML = (SKIP_CALLBACKS << 1);
private EventID eventId;
@@ -92,8 +91,6 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
// private boolean useOriginRemote;
- private boolean isPutDML;
-
public void addEntry(PutAllEntryData entry) {
this.putAllData[this.putAllDataCount++] = entry;
}
@@ -190,7 +187,6 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
this.eventId = event.getEventId();
this.skipCallbacks = skipCallbacks;
this.callbackArg = event.getCallbackArgument();
- this.isPutDML = event.isPutDML();
}
public RemotePutAllMessage() {
@@ -241,7 +237,6 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
this.bridgeContext = DataSerializer.readObject(in);
}
this.skipCallbacks = (flags & SKIP_CALLBACKS) != 0;
- this.isPutDML = (flags & IS_PUT_DML) != 0;
this.putAllDataCount = (int)InternalDataSerializer.readUnsignedVL(in);
this.putAllData = new PutAllEntryData[putAllDataCount];
if (this.putAllDataCount > 0) {
@@ -279,10 +274,6 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
EntryVersionsList versionTags = new EntryVersionsList(putAllDataCount);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
- final boolean requiresRegionContext =
- (this.putAllData[0].key instanceof KeyWithRegionContext);
for (int i = 0; i < this.putAllDataCount; i++) {
if (!hasTags && putAllData[i].versionTag != null) {
hasTags = true;
@@ -290,7 +281,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
VersionTag<?> tag = putAllData[i].versionTag;
versionTags.add(tag);
putAllData[i].versionTag = null;
- this.putAllData[i].toData(out, requiresRegionContext);
+ this.putAllData[i].toData(out);
this.putAllData[i].versionTag = tag;
}
@@ -307,7 +298,6 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
if (this.posDup) flags |= POS_DUP;
if (this.bridgeContext != null) flags |= HAS_BRIDGE_CONTEXT;
if (this.skipCallbacks) flags |= SKIP_CALLBACKS;
- if (this.isPutDML) flags |= IS_PUT_DML;
return flags;
}
@@ -370,7 +360,6 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
baseEvent.setContext(this.bridgeContext);
}
baseEvent.setPossibleDuplicate(this.posDup);
- baseEvent.setPutDML(this.isPutDML);
if (logger.isDebugEnabled()) {
logger.debug("RemotePutAllMessage.doLocalPutAll: eventSender is {}, baseEvent is {}, msg is {}",
eventSender, baseEvent, this);
@@ -384,7 +373,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
// final boolean requiresRegionContext = dr.keyRequiresRegionContext();
InternalDistributedMember myId = r.getDistributionManager().getDistributionManagerId();
for (int i = 0; i < putAllDataCount; ++i) {
- @Released EntryEventImpl ev = PutAllPRMessage.getEventFromEntry(r, myId, eventSender, i, putAllData, false, bridgeContext, posDup, !skipCallbacks, isPutDML);
+ @Released EntryEventImpl ev = PutAllPRMessage.getEventFromEntry(r, myId, eventSender, i, putAllData, false, bridgeContext, posDup, !skipCallbacks);
try {
ev.setPutAllOperation(dpao);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
index 678927d..34d3585 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
@@ -135,8 +135,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
/**
* Indicates if and when the new value should be deserialized on the
- * the receiver. Distinguishes between Deltas which need to be eagerly
- * deserialized (DESERIALIZATION_POLICY_EAGER), a non-byte[] value that was
+ * the receiver. Distinguishes between a non-byte[] value that was
* serialized (DESERIALIZATION_POLICY_LAZY) and a
* byte[] array value that didn't need to be serialized
* (DESERIALIZATION_POLICY_NONE). While this seems like an extra data, it
@@ -252,11 +251,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
event.setOriginRemote(useOriginRemote);
if (event.hasNewValue()) {
- if (CachedDeserializableFactory.preferObject() || event.hasDelta()) {
- this.deserializationPolicy = DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER;
- } else {
- this.deserializationPolicy = DistributedCacheOperation.DESERIALIZATION_POLICY_LAZY;
- }
+ this.deserializationPolicy = DistributedCacheOperation.DESERIALIZATION_POLICY_LAZY;
event.exportNewValue(this);
}
else {
@@ -568,13 +563,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
this.oldValueIsSerialized = (in.readByte() == 1);
setOldValBytes(DataSerializer.readByteArray(in));
}
- if (this.deserializationPolicy ==
- DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER) {
- setValObj(DataSerializer.readObject(in));
- }
- else {
- setValBytes(DataSerializer.readByteArray(in));
- }
+ setValBytes(DataSerializer.readByteArray(in));
if ((flags & HAS_DELTA_BYTES) != 0) {
this.applyDeltaBytes = true;
this.deltaBytes = DataSerializer.readByteArray(in);
@@ -681,9 +670,6 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
if (eventSender == null) {
eventSender = getSender();
}
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
@Released EntryEventImpl eei = EntryEventImpl.create(
r,
getOperation(),
@@ -732,10 +718,6 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
case DistributedCacheOperation.DESERIALIZATION_POLICY_NONE:
event.setNewValue(getValBytes());
break;
- case DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER:
- // new value is a Delta
- event.setNewValue(this.valObj); // sets the delta field
- break;
default:
throw new AssertionError("unknown deserialization policy: "
+ deserializationPolicy);
@@ -1212,12 +1194,8 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
private void setOldValueIsSerialized(boolean isSerialized) {
if (isSerialized) {
- if (CachedDeserializableFactory.preferObject()) {
- this.oldValueIsSerialized = true; //VALUE_IS_OBJECT;
- } else {
- // Defer serialization until toData is called.
- this.oldValueIsSerialized = true; //VALUE_IS_SERIALIZED_OBJECT;
- }
+ // Defer serialization until toData is called.
+ this.oldValueIsSerialized = true; //VALUE_IS_SERIALIZED_OBJECT;
} else {
this.oldValueIsSerialized = false; //VALUE_IS_BYTES;
}
[28/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/690ca40b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/690ca40b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/690ca40b
Branch: refs/heads/feature/GEODE-1372
Commit: 690ca40b9c6dfa41affb31d12c66449c963682f1
Parents: f84b1c0
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Jun 1 17:34:07 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../cache/client/ClientCacheFactory.java | 465 ++++++++++---------
.../gemfire/cache/client/internal/PoolImpl.java | 2 +-
.../SystemConfigurationProperties.java | 3 -
.../internal/DistributionConfig.java | 4 +-
.../CacheServerSSLConnectionDUnitTest.java | 31 +-
5 files changed, 252 insertions(+), 253 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/690ca40b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
index 3cbfff8..738361d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
@@ -34,109 +34,112 @@ import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOC
import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
/**
-Factory class used to create the singleton {@link ClientCache client cache} and connect to one or more GemFire Cache Servers. If the application wants to connect to GemFire as a peer it should use {@link com.gemstone.gemfire.cache.CacheFactory} instead.
-<p> Once the factory has been configured using its set* methods you produce a {@link ClientCache} by calling the {@link #create} method.
-The
-<a href="../distribution/DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
-property can be used to specify a cache.xml file to initialize the cache with.
-The contents of this file must comply with the
- <code>"doc-files/cache8_0.dtd"</code> file and the top level element must be a <code>client-cache</code> element.
-<p> Client connections are managed through connection {@link Pool pools}. ClientCacheFactory creates a single pool to use by default on the cache it creates. ClientCacheFactory can also be used to configure the default connection pool using its <code>setPool*</code> and <code>addPool*</code> methods. In most cases, the defaults used by this implementation will suffice. For the default pool attributes see {@link PoolFactory}.
-If no pool is configured and a pool was not declared in cache.xml or created using {@link PoolManager} then a default one will be created that connects to a server on the default cache server port and local host. If multiple pools are declared in cache.xml or created by the PoolFactory then no default pool will exist and <code>ClientRegionFactory.setPoolName</code> will need to be called on each region created.
-<p>
-To get the existing unclosed singleton client cache instance call {@link #getAnyInstance}.
-<p>
-The following examples illustrate bootstrapping the client cache using region shortcuts:
-<p>
-Example 1: Connect to a CacheServer on the default host and port and access a region "customers"
-<PRE>
- ClientCache c = new ClientCacheFactory().create();
- Region r = c.createClientRegionFactory(PROXY).create("customers");
- // The PROXY shortcut tells GemFire to route all requests to the servers
- //. i.e. there is no local caching
-</PRE>
-Example 2: Connect using the GemFire locator and create a local LRU cache
-<PRE>
- ClientCache c = new ClientCacheFactory()
- .addPoolLocator(host, port)
- .create();
- Region r = c.createClientRegionFactory(CACHING_PROXY_HEAP_LRU)
- .create("customers");
- // The local LRU "customers" data region will automatically start evicting, by default, at 80% heap utilization threshold
-</PRE>
-Example 3: Access the query service
-<PRE>
- QueryService qs = new ClientCacheFactory().create().getQueryService();
-</PRE>
-Example 4: Construct the client cache region declaratively in cache.xml
-<PRE>
- <!DOCTYPE client-cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
- "http://www.gemstone.com/dtd/cache8_0.dtd">
- <client-cache>
- <pool name="myPool">
- <locator host="hostName" port="10334"/>
- </pool>
- <region name="myRegion" refid="PROXY"/>
- <!-- you can override or add to the PROXY attributes by adding
- a region-attributes sub element here -->
- </client-cache>
-</PRE>
-Now, create the cache telling it to read your cache.xml file:
-<PRE>
- ClientCache c = new ClientCacheFactory()
- .set("cache-xml-file", "myCache.xml")
- .create();
- Region r = c.getRegion("myRegion");
-</PRE>
-
-<p> For a complete list of all client region shortcuts see {@link ClientRegionShortcut}.
-Applications that need to explicitly control the individual region attributes can do this declaratively in XML or using API.
-<p>
-Example 5: Define custom region attributes for persistence in XML and create region using API.
- Define new region attributes with ID "MYAPP_CACHING_PROXY_MEM_LRU" that overrides the
- "CACHING_PROXY" shortcut
-<PRE>
- <!DOCTYPE client-cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
- "http://www.gemstone.com/dtd/cache8_0.dtd">
- <client-cache>
- <!-- now create a named region attributes that uses the CACHING_PROXY shortcut
- and adds a memory LRU limited to 900 megabytes -->
- <region-attributes id="MYAPP_CACHING_PROXY_MEM_LRU" refid="CACHING_PROXY" >
- <lru-memory-size maximum="900"/>
- </region-attributes>
- </client-cache>
-</PRE>
-Now, create the data region in the client cache using this new attributes ID.
-<PRE>
- ClientCache c = new ClientCacheFactory()
- .set("cache-xml-file", "myCache.xml")
- .addPoolLocator(host, port)
- .create();
- Region r = c.createClientRegionFactory("MYAPP_CACHING_PROXY_MEM_LRU").create("customers");
-</PRE>
- * @since GemFire 6.5
+ * Factory class used to create the singleton {@link ClientCache client cache} and connect to one or more GemFire Cache Servers. If the application wants to connect to GemFire as a peer it should use {@link com.gemstone.gemfire.cache.CacheFactory} instead.
+ * <p> Once the factory has been configured using its set* methods you produce a {@link ClientCache} by calling the {@link #create} method.
+ * The
+ * <a href="../distribution/DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
+ * property can be used to specify a cache.xml file to initialize the cache with.
+ * The contents of this file must comply with the
+ * <code>"doc-files/cache8_0.dtd"</code> file and the top level element must be a <code>client-cache</code> element.
+ * <p> Client connections are managed through connection {@link Pool pools}. ClientCacheFactory creates a single pool to use by default on the cache it creates. ClientCacheFactory can also be used to configure the default connection pool using its <code>setPool*</code> and <code>addPool*</code> methods. In most cases, the defaults used by this implementation will suffice. For the default pool attributes see {@link PoolFactory}.
+ * If no pool is configured and a pool was not declared in cache.xml or created using {@link PoolManager} then a default one will be created that connects to a server on the default cache server port and local host. If multiple pools are declared in cache.xml or created by the PoolFactory then no default pool will exist and <code>ClientRegionFactory.setPoolName</code> will need to be called on each region created.
+ * <p>
+ * To get the existing unclosed singleton client cache instance call {@link #getAnyInstance}.
+ * <p>
+ * The following examples illustrate bootstrapping the client cache using region shortcuts:
+ * <p>
+ * Example 1: Connect to a CacheServer on the default host and port and access a region "customers"
+ * <PRE>
+ * ClientCache c = new ClientCacheFactory().create();
+ * Region r = c.createClientRegionFactory(PROXY).create("customers");
+ * // The PROXY shortcut tells GemFire to route all requests to the servers
+ * //. i.e. there is no local caching
+ * </PRE>
+ * Example 2: Connect using the GemFire locator and create a local LRU cache
+ * <PRE>
+ * ClientCache c = new ClientCacheFactory()
+ * .addPoolLocator(host, port)
+ * .create();
+ * Region r = c.createClientRegionFactory(CACHING_PROXY_HEAP_LRU)
+ * .create("customers");
+ * // The local LRU "customers" data region will automatically start evicting, by default, at 80% heap utilization threshold
+ * </PRE>
+ * Example 3: Access the query service
+ * <PRE>
+ * QueryService qs = new ClientCacheFactory().create().getQueryService();
+ * </PRE>
+ * Example 4: Construct the client cache region declaratively in cache.xml
+ * <PRE>
+ * <!DOCTYPE client-cache PUBLIC
+ * "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
+ * "http://www.gemstone.com/dtd/cache8_0.dtd">
+ * <client-cache>
+ * <pool name="myPool">
+ * <locator host="hostName" port="10334"/>
+ * </pool>
+ * <region name="myRegion" refid="PROXY"/>
+ * <!-- you can override or add to the PROXY attributes by adding
+ * a region-attributes sub element here -->
+ * </client-cache>
+ * </PRE>
+ * Now, create the cache telling it to read your cache.xml file:
+ * <PRE>
+ * ClientCache c = new ClientCacheFactory()
+ * .set("cache-xml-file", "myCache.xml")
+ * .create();
+ * Region r = c.getRegion("myRegion");
+ * </PRE>
+ * <p>
+ * <p> For a complete list of all client region shortcuts see {@link ClientRegionShortcut}.
+ * Applications that need to explicitly control the individual region attributes can do this declaratively in XML or using API.
+ * <p>
+ * Example 5: Define custom region attributes for persistence in XML and create region using API.
+ * Define new region attributes with ID "MYAPP_CACHING_PROXY_MEM_LRU" that overrides the
+ * "CACHING_PROXY" shortcut
+ * <PRE>
+ * <!DOCTYPE client-cache PUBLIC
+ * "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
+ * "http://www.gemstone.com/dtd/cache8_0.dtd">
+ * <client-cache>
+ * <!-- now create a named region attributes that uses the CACHING_PROXY shortcut
+ * and adds a memory LRU limited to 900 megabytes -->
+ * <region-attributes id="MYAPP_CACHING_PROXY_MEM_LRU" refid="CACHING_PROXY" >
+ * <lru-memory-size maximum="900"/>
+ * </region-attributes>
+ * </client-cache>
+ * </PRE>
+ * Now, create the data region in the client cache using this new attributes ID.
+ * <PRE>
+ * ClientCache c = new ClientCacheFactory()
+ * .set("cache-xml-file", "myCache.xml")
+ * .addPoolLocator(host, port)
+ * .create();
+ * Region r = c.createClientRegionFactory("MYAPP_CACHING_PROXY_MEM_LRU").create("customers");
+ * </PRE>
+ *
+ * @since 6.5
*/
public class ClientCacheFactory {
private PoolFactory pf;
-
+
private final Properties dsProps;
private final CacheConfig cacheConfig = new CacheConfig();
-
+
/**
* Creates a new client cache factory.
*/
public ClientCacheFactory() {
this.dsProps = new Properties();
}
+
/**
* Create a new client cache factory given the initial gemfire properties.
+ *
* @param props The initial gemfire properties to be used.
- * These properties can be overridden using the {@link #set} method
- * For a full list of valid gemfire properties see {@link com.gemstone.gemfire.distributed.DistributedSystem}.
+ * These properties can be overridden using the {@link #set} method
+ * For a full list of valid gemfire properties see {@link com.gemstone.gemfire.distributed.DistributedSystem}.
*/
public ClientCacheFactory(Properties props) {
if (props == null) {
@@ -148,7 +151,8 @@ public class ClientCacheFactory {
/**
* Sets a gemfire property that will be used when creating the ClientCache.
* For a full list of valid gemfire properties see {@link com.gemstone.gemfire.distributed.DistributedSystem}.
- * @param name the name of the gemfire property
+ *
+ * @param name the name of the gemfire property
* @param value the value of the gemfire property
* @return a reference to this ClientCacheFactory object
*/
@@ -161,31 +165,26 @@ public class ClientCacheFactory {
* Create a singleton client cache. If a client cache already exists in this
* vm that is not compatible with this factory's configuration then create
* will fail.
- * <p> While creating the cache instance any declarative cache configuration (cache.xml)
+ * <p> While creating the cache instance any declarative cache configuration (cache.xml)
* is processed and used to initialize the created cache.
* <P>Note that the cache that is produced is a singleton. Before a different instance
* can be produced the old one must be {@link ClientCache#close closed}.
- *
+ *
* @return the singleton client cache
- *
- * @throws CacheXmlException
- * If a problem occurs while parsing the declarative caching
- * XML file.
- * @throws TimeoutException
- * If a {@link Region#put(Object, Object)} times out while initializing the
- * cache.
- * @throws CacheWriterException
- * If a <code>CacheWriterException</code> is thrown while
- * initializing the cache.
- * @throws RegionExistsException
- * If the declarative caching XML file describes a region
- * that already exists (including the root region).
- * @throws IllegalStateException if a client cache already exists and it
- * is not compatible with this factory's configuration.
- * @throws IllegalStateException if mcast-port or locator is set on client cache.
- * @throws AuthenticationFailedException if authentication fails.
+ * @throws CacheXmlException If a problem occurs while parsing the declarative caching
+ * XML file.
+ * @throws TimeoutException If a {@link Region#put(Object, Object)} times out while initializing the
+ * cache.
+ * @throws CacheWriterException If a <code>CacheWriterException</code> is thrown while
+ * initializing the cache.
+ * @throws RegionExistsException If the declarative caching XML file describes a region
+ * that already exists (including the root region).
+ * @throws IllegalStateException if a client cache already exists and it
+ * is not compatible with this factory's configuration.
+ * @throws IllegalStateException if mcast-port or locator is set on client cache.
+ * @throws AuthenticationFailedException if authentication fails.
* @throws AuthenticationRequiredException if server is in secure mode and client cache
- * is not configured with security credentials.
+ * is not configured with security credentials.
*/
public ClientCache create() {
return basicCreate();
@@ -193,49 +192,50 @@ public class ClientCacheFactory {
private ClientCache basicCreate() {
synchronized (ClientCacheFactory.class) {
- GemFireCacheImpl instance = GemFireCacheImpl.getInstance();
-
- {
- String propValue = this.dsProps.getProperty(MCAST_PORT);
- if (propValue != null) {
- int mcastPort = Integer.parseInt(propValue);
- if (mcastPort != 0) {
- throw new IllegalStateException("On a client cache the mcast-port must be set to 0 or not set. It was set to " + mcastPort);
+ GemFireCacheImpl instance = GemFireCacheImpl.getInstance();
+
+ {
+ String propValue = this.dsProps.getProperty(MCAST_PORT);
+ if (propValue != null) {
+ int mcastPort = Integer.parseInt(propValue);
+ if (mcastPort != 0) {
+ throw new IllegalStateException("On a client cache the mcast-port must be set to 0 or not set. It was set to " + mcastPort);
+ }
}
}
- }
- {
- String propValue = this.dsProps.getProperty(LOCATORS);
- if (propValue != null && !propValue.equals("")) {
- throw new IllegalStateException("On a client cache the locators property must be set to an empty string or not set. It was set to \"" + propValue + "\".");
+ {
+ String propValue = this.dsProps.getProperty(LOCATORS);
+ if (propValue != null && !propValue.equals("")) {
+ throw new IllegalStateException(
+ "On a client cache the locators property must be set to an empty string or not set. It was set to \"" + propValue + "\".");
+ }
}
- }
this.dsProps.setProperty(MCAST_PORT, "0");
this.dsProps.setProperty(LOCATORS, "");
- DistributedSystem system = DistributedSystem.connect(this.dsProps);
+ DistributedSystem system = DistributedSystem.connect(this.dsProps);
- if (instance != null && !instance.isClosed()) {
- // this is ok; just make sure it is a client cache
- if (!instance.isClient()) {
- throw new IllegalStateException("A client cache can not be created because a non-client cache already exists.");
- }
+ if (instance != null && !instance.isClosed()) {
+ // this is ok; just make sure it is a client cache
+ if (!instance.isClient()) {
+ throw new IllegalStateException("A client cache can not be created because a non-client cache already exists.");
+ }
- // check if pool is compatible
- Pool pool = instance.determineDefaultPool(this.pf);
- if (pool == null) {
- if (instance.getDefaultPool() != null) {
- throw new IllegalStateException("Existing cache's default pool was not compatible");
+ // check if pool is compatible
+ Pool pool = instance.determineDefaultPool(this.pf);
+ if (pool == null) {
+ if (instance.getDefaultPool() != null) {
+ throw new IllegalStateException("Existing cache's default pool was not compatible");
+ }
}
+
+ // Check if cache configuration matches.
+ cacheConfig.validateCacheConfig(instance);
+
+ return instance;
+ } else {
+ GemFireCacheImpl gfc = GemFireCacheImpl.createClient(system, this.pf, cacheConfig);
+ return gfc;
}
-
- // Check if cache configuration matches.
- cacheConfig.validateCacheConfig(instance);
-
- return instance;
- } else {
- GemFireCacheImpl gfc = GemFireCacheImpl.createClient(system, this.pf, cacheConfig);
- return gfc;
- }
}
}
@@ -245,35 +245,38 @@ public class ClientCacheFactory {
}
return this.pf;
}
-
+
/**
* Sets the free connection timeout for this pool.
* If the pool has a max connections setting, operations will block
* if all of the connections are in use. The free connection timeout
* specifies how long those operations will block waiting for
* a free connection before receiving
- * an {@link AllConnectionsInUseException}. If max connections
+ * an {@link AllConnectionsInUseException}. If max connections
* is not set this setting has no effect.
- * @see #setPoolMaxConnections(int)
+ *
* @param connectionTimeout the connection timeout in milliseconds
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>connectionTimeout</code>
- * is less than or equal to <code>0</code>.
+ * is less than or equal to <code>0</code>.
+ * @see #setPoolMaxConnections(int)
*/
public ClientCacheFactory setPoolFreeConnectionTimeout(int connectionTimeout) {
getPoolFactory().setFreeConnectionTimeout(connectionTimeout);
return this;
}
+
/**
* Sets the load conditioning interval for this pool.
- * This interval controls how frequently the pool will check to see if
+ * This interval controls how frequently the pool will check to see if
* a connection to a given server should be moved to a different
- * server to improve the load balance.
+ * server to improve the load balance.
* <p>A value of <code>-1</code> disables load conditioning
+ *
* @param loadConditioningInterval the connection lifetime in milliseconds
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>connectionLifetime</code>
- * is less than <code>-1</code>.
+ * is less than <code>-1</code>.
*/
public ClientCacheFactory setPoolLoadConditioningInterval(int loadConditioningInterval) {
getPoolFactory().setLoadConditioningInterval(loadConditioningInterval);
@@ -285,11 +288,12 @@ public class ClientCacheFactory {
* Large messages can be received and sent faster when this buffer is larger.
* Larger buffers also optimize the rate at which servers can send events
* for client subscriptions.
+ *
* @param bufferSize the size of the socket buffers used for reading and
- * writing on each connection in this pool.
+ * writing on each connection in this pool.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>bufferSize</code>
- * is less than or equal to <code>0</code>.
+ * is less than or equal to <code>0</code>.
*/
public ClientCacheFactory setPoolSocketBufferSize(int bufferSize) {
getPoolFactory().setSocketBufferSize(bufferSize);
@@ -307,8 +311,9 @@ public class ClientCacheFactory {
* as the operation being done with the connection completes. This allows
* connections to be shared amonst multiple threads keeping the number of
* connections down.
+ *
* @param threadLocalConnections if <code>true</code> then enable thread local
- * connections.
+ * connections.
* @return a reference to <code>this</code>
*/
public ClientCacheFactory setPoolThreadLocalConnections(boolean threadLocalConnections) {
@@ -316,100 +321,100 @@ public class ClientCacheFactory {
return this;
}
-
/**
* Sets the number of milliseconds to wait for a response from a server before
* timing out the operation and trying another server (if any are available).
+ *
* @param timeout number of milliseconds to wait for a response from a server
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>timeout</code>
- * is less than <code>0</code>.
+ * is less than <code>0</code>.
*/
public ClientCacheFactory setPoolReadTimeout(int timeout) {
getPoolFactory().setReadTimeout(timeout);
return this;
}
-
/**
* Set the minimum number of connections to keep available at all times.
- * When the pool is created, it will create this many connections.
+ * When the pool is created, it will create this many connections.
* If <code>0</code> then connections will not be made until an actual operation
* is done that requires client-to-server communication.
+ *
* @param minConnections the initial number of connections
- * this pool will create.
+ * this pool will create.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>minConnections</code>
- * is less than <code>0</code>.
+ * is less than <code>0</code>.
*/
public ClientCacheFactory setPoolMinConnections(int minConnections) {
getPoolFactory().setMinConnections(minConnections);
return this;
}
-
/**
- * Set the max number of client to server connections that the pool will create. If all of
+ * Set the max number of client to server connections that the pool will create. If all of
* the connections are in use, an operation requiring a client to server connection
* will block until a connection is available.
- * @see #setPoolFreeConnectionTimeout(int)
+ *
* @param maxConnections the maximum number of connections in the pool.
- * this pool will create. -1 indicates that there is no maximum number of connections
+ * this pool will create. -1 indicates that there is no maximum number of connections
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>maxConnections</code>
- * is less than <code>minConnections</code>.
+ * is less than <code>minConnections</code>.
+ * @see #setPoolFreeConnectionTimeout(int)
*/
public ClientCacheFactory setPoolMaxConnections(int maxConnections) {
getPoolFactory().setMaxConnections(maxConnections);
return this;
}
-
/**
* Set the amount of time a connection can be idle before expiring the connection.
- * If the pool size is greater than the minimum specified by
+ * If the pool size is greater than the minimum specified by
* {@link #setPoolMinConnections(int)}, connections which have been idle
- * for longer than the idleTimeout will be closed.
+ * for longer than the idleTimeout will be closed.
+ *
* @param idleTimeout The amount of time in milliseconds that an idle connection
- * should live before expiring. -1 indicates that connections should never expire.
+ * should live before expiring. -1 indicates that connections should never expire.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>idleTimout</code>
- * is less than <code>-1</code>.
+ * is less than <code>-1</code>.
*/
public ClientCacheFactory setPoolIdleTimeout(long idleTimeout) {
getPoolFactory().setIdleTimeout(idleTimeout);
return this;
}
-
/**
* Set the number of times to retry a request after timeout/exception.
- * @param retryAttempts The number of times to retry a request
- * after timeout/exception. -1 indicates that a request should be
- * tried against every available server before failing
+ *
+ * @param retryAttempts The number of times to retry a request
+ * after timeout/exception. -1 indicates that a request should be
+ * tried against every available server before failing
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>idleTimout</code>
- * is less than <code>-1</code>.
+ * is less than <code>-1</code>.
*/
public ClientCacheFactory setPoolRetryAttempts(int retryAttempts) {
getPoolFactory().setRetryAttempts(retryAttempts);
return this;
}
-
/**
* How often to ping servers to verify that they are still alive. Each
* server will be sent a ping every pingInterval if there has not
* been any other communication with the server.
- *
+ * <p>
* These pings are used by the server to monitor the health of
- * the client. Make sure that the pingInterval is less than the
+ * the client. Make sure that the pingInterval is less than the
* maximum time between pings allowed by the cache server.
+ *
* @param pingInterval The amount of time in milliseconds between
- * pings.
+ * pings.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>pingInterval</code>
- * is less than or equal to <code>0</code>.
+ * is less than or equal to <code>0</code>.
* @see CacheServer#setMaximumTimeBetweenPings(int)
*/
public ClientCacheFactory setPoolPingInterval(long pingInterval) {
@@ -417,29 +422,28 @@ public class ClientCacheFactory {
return this;
}
-
/**
* How often to send client statistics to the server.
* Doing this allows <code>gfmon</code> to monitor clients.
* <p>A value of <code>-1</code> disables the sending of client statistics
* to the server.
- *
+ *
* @param statisticInterval The amount of time in milliseconds between
- * sends of client statistics to the server.
+ * sends of client statistics to the server.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>statisticInterval</code>
- * is less than <code>-1</code>.
+ * is less than <code>-1</code>.
*/
public ClientCacheFactory setPoolStatisticInterval(int statisticInterval) {
getPoolFactory().setStatisticInterval(statisticInterval);
return this;
}
-
/**
* Configures the group that all servers this pool connects to must belong to.
+ *
* @param group the server group that this pool will connect to.
- * If <code>null</code> or <code>""</code> then all servers will be connected to.
+ * If <code>null</code> or <code>""</code> then all servers will be connected to.
* @return a reference to <code>this</code>
*/
public ClientCacheFactory setPoolServerGroup(String group) {
@@ -447,7 +451,6 @@ public class ClientCacheFactory {
return this;
}
-
/**
* Add a locator, given its host and port, to this factory.
* The locator must be a server locator and will be used to discover other running
@@ -456,19 +459,19 @@ public class ClientCacheFactory {
* the locator will still be added. When the pool is used for
* an operation if the host is still unknown an exception will
* be thrown.
+ *
* @param host the host name or ip address that the locator is listening on.
* @param port the port that the locator is listening on
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if port is outside
- * the valid range of [0..65535] inclusive.
- * @throws IllegalStateException if a server has already been {@link #addPoolServer added} to this factory.
+ * the valid range of [0..65535] inclusive.
+ * @throws IllegalStateException if a server has already been {@link #addPoolServer added} to this factory.
*/
public ClientCacheFactory addPoolLocator(String host, int port) {
getPoolFactory().addLocator(host, port);
return this;
}
-
/**
* Add a server, given its host and port, to this factory.
* The server must be a cache server and this client will
@@ -477,24 +480,25 @@ public class ClientCacheFactory {
* the server will still be added. When the pool is used for
* an operation if the host is still unknown an exception will
* be thrown.
+ *
* @param host the host name or ip address that the server is listening on.
* @param port the port that the server is listening on
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if port is outside
- * the valid range of [0..65535] inclusive.
- * @throws IllegalStateException if a locator has already been {@link #addPoolLocator added} to this factory.
+ * the valid range of [0..65535] inclusive.
+ * @throws IllegalStateException if a locator has already been {@link #addPoolLocator added} to this factory.
*/
public ClientCacheFactory addPoolServer(String host, int port) {
getPoolFactory().addServer(host, port);
return this;
}
-
/**
* If set to <code>true</code> then the created pool will have server-to-client
* subscriptions enabled.
* If set to <code>false</code> then all <code>Subscription*</code> attributes
* are ignored at create time.
+ *
* @return a reference to <code>this</code>
*/
public ClientCacheFactory setPoolSubscriptionEnabled(boolean enabled) {
@@ -502,17 +506,17 @@ public class ClientCacheFactory {
return this;
}
-
/**
* Sets the redundancy level for this pools server-to-client subscriptions.
* If <code>0</code> then no redundant copies will be kept on the servers.
* Otherwise an effort will be made to maintain the requested number of
* copies of the server-to-client subscriptions. At most one copy per server will
* be made up to the requested level.
+ *
* @param redundancy the number of redundant servers for this client's subscriptions.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>redundancyLevel</code>
- * is less than <code>-1</code>.
+ * is less than <code>-1</code>.
*/
public ClientCacheFactory setPoolSubscriptionRedundancy(int redundancy) {
getPoolFactory().setSubscriptionRedundancy(redundancy);
@@ -525,34 +529,33 @@ public class ClientCacheFactory {
* to minimize duplicate events.
* Entries that have not been modified for this amount of time
* are expired from the list
+ *
* @param messageTrackingTimeout number of milliseconds to set the timeout to.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>messageTrackingTimeout</code>
- * is less than or equal to <code>0</code>.
+ * is less than or equal to <code>0</code>.
*/
public ClientCacheFactory setPoolSubscriptionMessageTrackingTimeout(int messageTrackingTimeout) {
getPoolFactory().setSubscriptionMessageTrackingTimeout(messageTrackingTimeout);
return this;
}
-
/**
* Sets the interval in milliseconds
* to wait before sending acknowledgements to the cache server for
* events received from the server subscriptions.
- *
+ *
* @param ackInterval number of milliseconds to wait before sending event
- * acknowledgements.
+ * acknowledgements.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>ackInterval</code>
- * is less than or equal to <code>0</code>.
+ * is less than or equal to <code>0</code>.
*/
public ClientCacheFactory setPoolSubscriptionAckInterval(int ackInterval) {
getPoolFactory().setSubscriptionAckInterval(ackInterval);
return this;
}
-
/**
* By default setPRSingleHopEnabled is <code>true</code>
* in which case the client is aware of the location of partitions on servers hosting
@@ -561,7 +564,7 @@ public class ClientCacheFactory {
* Using this information, the client routes the client cache operations
* directly to the server which is hosting the required partition for the
* cache operation using a single network hop.
- * This mode works best
+ * This mode works best
* when {@link #setPoolMaxConnections(int)} is set
* to <code>-1</code> which is the default.
* This mode causes the client to have more connections to the servers.
@@ -571,11 +574,11 @@ public class ClientCacheFactory {
* The client will use fewer network connections to the servers.
* <p>
* Caution: for {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION partition} regions
- * with
+ * with
* {@link com.gemstone.gemfire.cache.PartitionAttributesFactory#setLocalMaxMemory(int) local-max-memory}
* equal to zero, no cache operations mentioned above will be routed to those
* servers as they do not host any partitions.
- *
+ *
* @return the newly created pool.
*/
public ClientCacheFactory setPoolPRSingleHopEnabled(boolean enabled) {
@@ -583,14 +586,13 @@ public class ClientCacheFactory {
return this;
}
-
/**
* If set to <code>true</code> then the created pool can be used by multiple
* users. <br>
* <br>
* Note: If set to true, all the client side regions must be
* {@link ClientRegionShortcut#PROXY proxies}. No client side storage is allowed.
- *
+ *
* @return a reference to <code>this</code>
*/
public ClientCacheFactory setPoolMultiuserAuthentication(boolean enabled) {
@@ -598,20 +600,23 @@ public class ClientCacheFactory {
return this;
}
-
- /** Returns the version of the cache implementation.
+ /**
+ * Returns the version of the cache implementation.
+ *
* @return the version of the cache implementation as a <code>String</code>
*/
public static String getVersion() {
return GemFireVersion.getGemFireVersion();
}
+
/**
* Gets an arbitrary open instance of {@link ClientCache} produced by an
* earlier call to {@link #create}.
- * @throws CacheClosedException if a cache has not been created
- * or the only created one is {@link ClientCache#isClosed closed}
+ *
+ * @throws CacheClosedException if a cache has not been created
+ * or the only created one is {@link ClientCache#isClosed closed}
* @throws IllegalStateException if the cache was created by CacheFactory instead
- * of ClientCacheFactory
+ * of ClientCacheFactory
*/
public static synchronized ClientCache getAnyInstance() {
GemFireCacheImpl instance = GemFireCacheImpl.getInstance();
@@ -625,15 +630,16 @@ public class ClientCacheFactory {
return instance;
}
}
-
- /** Sets the object preference to PdxInstance type.
+
+ /**
+ * Sets the object preference to PdxInstance type.
* When a cached object that was serialized as a PDX is read
* from the cache a {@link PdxInstance} will be returned instead of the actual domain class.
- * The PdxInstance is an interface that provides run time access to
- * the fields of a PDX without deserializing the entire PDX.
- * The PdxInstance implementation is a light weight wrapper
- * that simply refers to the raw bytes of the PDX that are kept
- * in the cache. Using this method applications can choose to
+ * The PdxInstance is an interface that provides run time access to
+ * the fields of a PDX without deserializing the entire PDX.
+ * The PdxInstance implementation is a light weight wrapper
+ * that simply refers to the raw bytes of the PDX that are kept
+ * in the cache. Using this method applications can choose to
* access PdxInstance instead of Java object.
* <p>Note that a PdxInstance is only returned if a serialized PDX is found in the cache.
* If the cache contains a deserialized PDX, then a domain class instance is returned instead of a PdxInstance.
@@ -647,11 +653,12 @@ public class ClientCacheFactory {
this.cacheConfig.setPdxReadSerialized(pdxReadSerialized);
return this;
}
-
+
/**
* Set the PDX serializer for the cache. If this serializer is set,
- * it will be consulted to see if it can serialize any domain classes which are
- * added to the cache in portable data exchange format.
+ * it will be consulted to see if it can serialize any domain classes which are
+ * added to the cache in portable data exchange format.
+ *
* @param serializer the serializer to use
* @return this ClientCacheFactory
* @since GemFire 6.6
@@ -661,16 +668,17 @@ public class ClientCacheFactory {
this.cacheConfig.setPdxSerializer(serializer);
return this;
}
-
+
/**
* Set the disk store that is used for PDX meta data. When
* serializing objects in the PDX format, the type definitions
* are persisted to disk. This setting controls which disk store
* is used for that persistence.
- *
+ * <p>
* If not set, the metadata will go in the default disk store.
+ *
* @param diskStoreName the name of the disk store to use
- * for the PDX metadata.
+ * for the PDX metadata.
* @return this ClientCacheFactory
* @since GemFire 6.6
*/
@@ -681,10 +689,10 @@ public class ClientCacheFactory {
/**
* Control whether the type metadata for PDX objects is persisted to disk.
- * The default for this setting is false.
+ * The default for this setting is false.
* If you are using persistent regions with PDX then you must set this to true.
* If you are using a WAN gateway with PDX then you should set this to true.
- *
+ *
* @param isPersistent true if the metadata should be persistent
* @return this ClientCacheFactory
* @since GemFire 6.6
@@ -693,6 +701,7 @@ public class ClientCacheFactory {
this.cacheConfig.setPdxPersistent(isPersistent);
return this;
}
+
/**
* Control whether pdx ignores fields that were unread during deserialization.
* The default is to preserve unread fields be including their data during serialization.
@@ -700,10 +709,10 @@ public class ClientCacheFactory {
* during serialization.
* <P>You should only set this attribute to <code>true</code> if you know this member
* will only be reading cache data. In this use case you do not need to pay the cost
- * of preserving the unread fields since you will never be reserializing pdx data.
- *
+ * of preserving the unread fields since you will never be reserializing pdx data.
+ *
* @param ignore <code>true</code> if fields not read during pdx deserialization should be ignored;
- * <code>false</code>, the default, if they should be preserved.
+ * <code>false</code>, the default, if they should be preserved.
* @return this ClientCacheFactory
* @since GemFire 6.6
*/
@@ -711,5 +720,5 @@ public class ClientCacheFactory {
this.cacheConfig.setPdxIgnoreUnreadFields(ignore);
return this;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/690ca40b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
index 44465d8..b9f25d7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
@@ -668,7 +668,7 @@ public class PoolImpl implements InternalPool {
}
if (!getLocators().equals(other.getLocators())) {
throw new RuntimeException(
- LocalizedStrings.PoolImpl_0_ARE_DIFFERENT.toLocalizedString(LOCATORS));
+ LocalizedStrings.PoolImpl_0_ARE_DIFFERENT.toLocalizedString("locators"));
}
if (!getServers().equals(other.getServers())) {
throw new RuntimeException(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/690ca40b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
index df320b2..b4526fa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
@@ -17,9 +17,6 @@
package com.gemstone.gemfire.distributed;
-/**
- * Created by ukohlmeyer on 26/05/2016.
- */
public interface SystemConfigurationProperties {
String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/690ca40b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 1cce999..9a900ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -2457,8 +2457,8 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
String KEY_STORE_TYPE_NAME = ".keyStoreType";
String KEY_STORE_NAME = ".keyStore";
String KEY_STORE_PASSWORD_NAME = ".keyStorePassword";
- String TRUST_STORE_NAME = "trustStore";
- String TRUST_STORE_PASSWORD_NAME = "trustStorePassword";
+ String TRUST_STORE_NAME = ".trustStore";
+ String TRUST_STORE_PASSWORD_NAME = ".trustStorePassword";
/**
* Suffix for ssl keystore and trust store properties for JMX
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/690ca40b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 615823c..bcbd035 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -22,7 +22,6 @@ 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.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.security.AuthenticationRequiredException;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
@@ -79,12 +78,13 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
return cache;
}
- private void createServer() throws IOException{
- cacheServerPort = AvailablePortHelper.getRandomAvailableTCPPort();
+ private int createServer() throws IOException{
cacheServer = cache.addCacheServer();
- cacheServer.setPort(cacheServerPort);
+ cacheServer.setPort(0);
cacheServer.start();
hostName = cacheServer.getHostnameForClients();
+ cacheServerPort = cacheServer.getPort();
+ return cacheServerPort;
}
public int getCacheServerPort(){
@@ -143,15 +143,10 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
String keyStorePath = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, keyStore);
String trustStorePath = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, trustStore);
//using new server-ssl-* properties
- gemFireProps.put(SERVER_SSL_ENABLED,
- String.valueOf(cacheServerSslenabled));
- gemFireProps.put(SERVER_SSL_PROTOCOLS,
- cacheServerSslprotocols);
- gemFireProps.put(SERVER_SSL_CIPHERS,
- cacheServerSslciphers);
- gemFireProps.put(
- SERVER_SSL_REQUIRE_AUTHENTICATION,
- String.valueOf(cacheServerSslRequireAuth));
+ gemFireProps.put(SERVER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
+ gemFireProps.put(SERVER_SSL_PROTOCOLS, cacheServerSslprotocols);
+ gemFireProps.put(SERVER_SSL_CIPHERS, cacheServerSslciphers);
+ gemFireProps.put(SERVER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
gemFireProps.put(SERVER_SSL_KEYSTORE_TYPE, "jks");
gemFireProps.put(SERVER_SSL_KEYSTORE, keyStorePath);
@@ -191,8 +186,8 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
instance.setUpServerVM(cacheServerSslenabled);
}
- public static void createServerTask() throws Exception {
- instance.createServer();
+ public static int createServerTask() throws Exception {
+ return instance.createServer();
}
public static void setUpClientVMTask(String host, int port,
@@ -245,11 +240,9 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
boolean cacheClientSslRequireAuth = true;
serverVM.invoke(() -> setUpServerVMTask(cacheServerSslenabled));
- serverVM.invoke(() -> createServerTask());
+ int port = serverVM.invoke(() -> createServerTask());
- Object array[] = (Object[])serverVM.invoke(() -> getCacheServerEndPointTask());
- String hostName = (String)array[0];
- int port = (Integer) array[1];
+ String hostName = host.getHostName();
clientVM.invoke(() -> setUpClientVMTask(hostName, port, cacheClientSslenabled, cacheClientSslRequireAuth, CLIENT_KEY_STORE, CLIENT_TRUST_STORE));
clientVM.invoke(() -> doClientRegionTestTask());
[09/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
index be511d9..3e62372 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
@@ -35,6 +35,8 @@ import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/****
*
*
@@ -110,7 +112,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
cacheServerAttributes.put("message-time-to-live", Integer.toString(cacheServer.getMessageTimeToLive()));
cacheServerAttributes.put("notify-by-subscription", Boolean.toString(cacheServer.getNotifyBySubscription()));
cacheServerAttributes.put("port", Integer.toString(cacheServer.getPort()));
- cacheServerAttributes.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, Integer.toString(cacheServer.getSocketBufferSize()));
+ cacheServerAttributes.put(SOCKET_BUFFER_SIZE, Integer.toString(cacheServer.getSocketBufferSize()));
cacheServerAttributes.put("load-poll-interval", Long.toString(cacheServer.getLoadPollInterval()));
cacheServerAttributes.put("tcp-no-delay", Boolean.toString(cacheServer.getTcpNoDelay()));
@@ -160,7 +162,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
csAttributesDefault.put("message-time-to-live", Integer.toString(CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE));
csAttributesDefault.put("notify-by-subscription", Boolean.toString(CacheServer.DEFAULT_NOTIFY_BY_SUBSCRIPTION));
csAttributesDefault.put("port", Integer.toString(CacheServer.DEFAULT_PORT));
- csAttributesDefault.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, Integer.toString(CacheServer.DEFAULT_SOCKET_BUFFER_SIZE));
+ csAttributesDefault.put(SOCKET_BUFFER_SIZE, Integer.toString(CacheServer.DEFAULT_SOCKET_BUFFER_SIZE));
csAttributesDefault.put("load-poll-interval", Long.toString(CacheServer.DEFAULT_LOAD_POLL_INTERVAL));
return csAttributesDefault;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index 88a4044..59554f5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -944,7 +944,7 @@ public class CliStrings {
public static final String EXPORT_LOGS__GROUP = "group";
public static final String EXPORT_LOGS__GROUP__HELP = "Group of members whose log files will be exported.";
public static final String EXPORT_LOGS__MSG__CANNOT_EXECUTE = "Cannot execute";
- public static final String EXPORT_LOGS__LOGLEVEL = DistributionConfig.LOG_LEVEL_NAME;
+ public static final String EXPORT_LOGS__LOGLEVEL = LOG_LEVEL;
public static final String EXPORT_LOGS__LOGLEVEL__HELP = "Minimum level of log entries to export. Valid values are: none, error, info, config , fine, finer and finest. The default is \"info\".";
public static final String EXPORT_LOGS__UPTO_LOGLEVEL = "only-log-level";
public static final String EXPORT_LOGS__UPTO_LOGLEVEL__HELP = "Whether to only include those entries that exactly match the --log-level specified.";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
index 47402a7..8649375 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
@@ -16,10 +16,11 @@
*/
package com.gemstone.gemfire.redis;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.SocketCreator;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -383,7 +384,7 @@ public class GemFireRedisServer {
if (c == null) {
CacheFactory cacheFactory = new CacheFactory();
if (logLevel != null)
- cacheFactory.set(DistributionConfig.LOG_LEVEL_NAME, logLevel);
+ cacheFactory.set(LOG_LEVEL, logLevel);
c = cacheFactory.create();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
index bccf229..dce254a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.InternalInstantiator;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
@@ -32,8 +31,8 @@ import java.io.DataOutput;
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.*;
+
import static org.junit.Assert.fail;
/**
@@ -77,7 +76,7 @@ public class DiskInstantiatorsJUnitTest {
Properties cfg = new Properties();
cfg.setProperty(MCAST_PORT, "0");
cfg.setProperty(LOCATORS, "");
- cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
+ cfg.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
this.ds = DistributedSystem.connect(cfg);
this.c = CacheFactory.create(ds);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
index 5ccbc98..dccdf79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
@@ -18,14 +18,12 @@ package com.gemstone.gemfire;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
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.*;
/**
* Tests the functionality of JOM {@link Statistics}.
@@ -40,8 +38,8 @@ public class LocalStatisticsJUnitTest extends StatisticsTestCase {
protected DistributedSystem getSystem() {
if (this.system == null) {
Properties props = new Properties();
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "StatisticsTestCase-localTest.gfs");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "StatisticsTestCase-localTest.gfs");
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
props.setProperty(SystemConfigurationProperties.NAME, getName());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
index bbc485f..09605c7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
@@ -33,8 +33,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
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.*;
/**
@@ -62,7 +61,7 @@ public class LonerDMJUnitTest {
Properties cfg = new Properties();
cfg.setProperty(MCAST_PORT, "0");
cfg.setProperty(LOCATORS, "");
- cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
+ cfg.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
for (int i=0; i < 2; i++) {
start = System.currentTimeMillis();
@@ -115,8 +114,8 @@ public class LonerDMJUnitTest {
Properties cfg = new Properties();
cfg.setProperty(MCAST_PORT, "0");
cfg.setProperty(LOCATORS, "");
- cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- cfg.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "lonerStats.gfs");
+ cfg.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ cfg.setProperty(STATISTIC_ARCHIVE_FILE, "lonerStats.gfs");
for (int i=0; i < 1; i++) {
start = System.currentTimeMillis();
@@ -168,7 +167,7 @@ public class LonerDMJUnitTest {
Properties cfg = new Properties();
cfg.setProperty(MCAST_PORT, "0");
cfg.setProperty(LOCATORS, "");
- cfg.setProperty(DistributionConfig.ROLES_NAME, "lonelyOne");
+ cfg.setProperty(ROLES, "lonelyOne");
cfg.setProperty(SystemConfigurationProperties.NAME, name);
DistributedSystem ds = DistributedSystem.connect(cfg);
System.out.println("MemberId = " + ds.getMemberId());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
index de34b2b..5e7671a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
@@ -17,14 +17,12 @@
package com.gemstone.gemfire.admin.internal;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import org.junit.After;
import org.junit.Before;
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.*;
/**
* Provides common setUp and tearDown for testing the Admin API.
@@ -63,7 +61,7 @@ public abstract class DistributedSystemTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "true");
+ props.setProperty(CONSERVE_SOCKETS, "true");
return props;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
index 55f10a4..2ed2241 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
@@ -17,15 +17,13 @@
package com.gemstone.gemfire.admin.internal;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import org.junit.After;
import org.junit.Before;
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.*;
/**
* Superclass of tests for the {@linkplain
@@ -70,7 +68,7 @@ public abstract class HealthEvaluatorTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
index b5ea652..f782d66 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
@@ -31,8 +31,7 @@ import org.junit.experimental.categories.Category;
import java.util.Map;
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.*;
@Category(IntegrationTest.class)
@@ -46,7 +45,7 @@ public class ConnectionPoolFactoryJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // to keep diskPerf logs smaller
+ props.setProperty(LOG_LEVEL, "info"); // to keep diskPerf logs smaller
this.ds = DistributedSystem.connect(props);
this.cache = CacheFactory.create(this.ds);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
index c870091..4f87adc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
@@ -373,7 +373,7 @@ public class RegionFactoryJUnitTest {
final Properties gemfireProperties = createGemFireProperties();
gemfireProperties.put(MCAST_TTL, "64");
final String xmlFileName = getName() + "-cache.xml";
- gemfireProperties.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileName);
+ gemfireProperties.put(CACHE_XML_FILE, xmlFileName);
xmlFile = new File(xmlFileName);
xmlFile.delete();
xmlFile.createNewFile();
@@ -400,8 +400,8 @@ public class RegionFactoryJUnitTest {
r1 = factory.create(this.r1Name);
assertBasicRegionFunctionality(r1, r1Name);
assertEquals(gemfireProperties.get(MCAST_TTL), r1.getCache().getDistributedSystem().getProperties().get(MCAST_TTL));
- assertEquals(gemfireProperties.get(DistributionConfig.CACHE_XML_FILE_NAME),
- r1.getCache().getDistributedSystem().getProperties().get(DistributionConfig.CACHE_XML_FILE_NAME));
+ assertEquals(gemfireProperties.get(CACHE_XML_FILE),
+ r1.getCache().getDistributedSystem().getProperties().get(CACHE_XML_FILE));
RegionAttributes ra = r1.getAttributes();
assertEquals(ra.getStatisticsEnabled(), true);
assertEquals(ra.getScope().isDistributedAck(), true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
index 5abddf4..b64a517 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
@@ -52,8 +52,7 @@ import java.util.ArrayList;
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.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.junit.runners.MethodSorters.NAME_ASCENDING;
@@ -106,7 +105,7 @@ public class ClientCacheFactoryJUnitTest {
}
try {
- new ClientCacheFactory().set(DistributionConfig.LOG_LEVEL_NAME, "severe").create();
+ new ClientCacheFactory().set(LOG_LEVEL, "severe").create();
fail("expected create to fail");
} catch (IllegalStateException expected) {
}
@@ -125,7 +124,7 @@ public class ClientCacheFactoryJUnitTest {
URL url = ClientCacheFactoryJUnitTest.class.getResource("ClientCacheFactoryJUnitTest_single_pool.xml");;
FileUtil.copy(url, this.tmpFile);
this.cc = new ClientCacheFactory()
- .set(DistributionConfig.CACHE_XML_FILE_NAME, this.tmpFile.getAbsolutePath())
+ .set(CACHE_XML_FILE, this.tmpFile.getAbsolutePath())
.create();
GemFireCacheImpl gfc = (GemFireCacheImpl)this.cc;
assertEquals(true, gfc.isClient());
@@ -217,13 +216,13 @@ public class ClientCacheFactoryJUnitTest {
@Test
public void test004SetMethod() throws Exception {
- this.cc = new ClientCacheFactory().set(DistributionConfig.LOG_LEVEL_NAME, "severe").create();
+ this.cc = new ClientCacheFactory().set(LOG_LEVEL, "severe").create();
GemFireCacheImpl gfc = (GemFireCacheImpl)this.cc;
assertEquals(true, gfc.isClient());
Properties dsProps = this.cc.getDistributedSystem().getProperties();
assertEquals("0", dsProps.getProperty(MCAST_PORT));
assertEquals("", dsProps.getProperty(LOCATORS));
- assertEquals("severe", dsProps.getProperty(DistributionConfig.LOG_LEVEL_NAME));
+ assertEquals("severe", dsProps.getProperty(LOG_LEVEL));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 44d03ce..67675d0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -30,7 +30,7 @@ import java.util.Stack;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the interaction between a
@@ -86,8 +86,8 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
Cache cache = new CacheFactory()
.set("name", "ClientServerRegisterInterestsTestGemFireServer")
.set(MCAST_PORT, "0")
- .set(DistributionConfig.LOG_FILE_NAME, "clientServerRegisterInterestsTest.log")
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_FILE, "clientServerRegisterInterestsTest.log")
+ .set(LOG_LEVEL, "config")
//.set("jmx-manager", "true")
//.set("jmx-manager-http-port", "0")
//.set("jmx-manager-port", "1199")
@@ -140,7 +140,7 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
private ClientCache setupGemFireClientCache() {
ClientCache clientCache = new ClientCacheFactory()
- .set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "TestDurableClientId")
+ .set(DURABLE_CLIENT_ID, "TestDurableClientId")
.create();
PoolFactory poolFactory = PoolManager.createFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index ee17818..1ca6a81 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -98,8 +98,8 @@ public abstract class LocatorTestBase extends DistributedTestCase {
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(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
try {
File logFile = new File(testName + "-locator" + locatorPort + ".log");
InetAddress bindAddr = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index 6edc675..ab0a980 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.query.QueryService;
import com.gemstone.gemfire.cache.query.QueryTestUtils;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.data.Portfolio;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.*;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -34,7 +33,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.stream.IntStream;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
@Category(DistributedTest.class)
public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTestCase {
@@ -46,7 +45,7 @@ public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTest
private Properties getSystemProperties(String cacheXML) {
Properties props = new Properties();
props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), cacheXML));
+ props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), cacheXML));
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index a35ef27..2bdcb88 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
import org.junit.Ignore;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Test for accessing query bind parameters from authorization callbacks
@@ -87,9 +87,9 @@ public class QueryParamsAuthorizationDUnitTest extends CacheTestCase {
public Object call() throws Exception {
ClientCacheFactory ccf = new ClientCacheFactory()
.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port)
- .set(DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME, UserPasswordAuthInit.class.getName() + ".create")
- .set("security-username", "root")
- .set("security-password", "root");
+ .set(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create")
+ .set(SECURITY_PREFIX+"username", "root")
+ .set(SECURITY_PREFIX+"password", "root");
ClientCache cache = getClientCache(ccf);
Region r1 = cache.createClientRegionFactory(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
index ca2fe2f..3128dc7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
@@ -26,6 +26,8 @@
*/
package com.gemstone.gemfire.cache.query.functional;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.query.*;
import com.gemstone.gemfire.cache.query.data.ComparableWrapper;
@@ -849,7 +851,7 @@ public class IndexCreationJUnitTest{
Properties props = new Properties();
props.setProperty(SystemConfigurationProperties.NAME, "test");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath());
+ props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath());
DistributedSystem ds = DistributedSystem.connect(props);
// Create the cache which causes the cache-xml-file to be parsed
@@ -875,7 +877,7 @@ public class IndexCreationJUnitTest{
props.setProperty(MCAST_PORT, "0");
//Using a different cache.xml that changes some region properties
//That will force the disk code to copy the region entries.
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME,
+ props.setProperty(CACHE_XML_FILE,
IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
DistributedSystem ds = DistributedSystem.connect(props);
Cache cache = CacheFactory.create(ds);
@@ -900,7 +902,7 @@ public class IndexCreationJUnitTest{
props.setProperty(SystemConfigurationProperties.NAME, "test");
props.setProperty(MCAST_PORT, "0");
props
- .setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
+ .setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
DistributedSystem ds = DistributedSystem.connect(props);
Cache cache = CacheFactory.create(ds);
Region localRegion = cache.getRegion("localRegion");
@@ -928,7 +930,7 @@ public class IndexCreationJUnitTest{
props.setProperty(SystemConfigurationProperties.NAME, "test");
props.setProperty(MCAST_PORT, "0");
props
- .setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
+ .setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
DistributedSystem ds = DistributedSystem.connect(props);
Cache cache = CacheFactory.create(ds);
Region localDiskRegion = cache.getRegion("localDiskRegion");
@@ -956,9 +958,9 @@ public class IndexCreationJUnitTest{
Properties props = new Properties();
props.setProperty(SystemConfigurationProperties.NAME, "test");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
DistributedSystem ds = DistributedSystem.connect(props);
// Create the cache which causes the cache-xml-file to be parsed
@@ -990,9 +992,9 @@ public class IndexCreationJUnitTest{
Properties props = new Properties();
props.setProperty(SystemConfigurationProperties.NAME, "test");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
DistributedSystem ds = DistributedSystem.connect(props);
Cache cache = CacheFactory.create(ds);
QueryService qs = cache.getQueryService();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
index 55358f6..a64180e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
@@ -26,7 +26,6 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.query.CacheUtils;
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 junit.framework.Assert;
@@ -38,7 +37,7 @@ import org.junit.experimental.categories.Category;
import java.util.Collection;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
*
@@ -54,7 +53,7 @@ public class DeclarativeIndexCreationJUnitTest {
@Before
public void setUp() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
+ props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
props.setProperty(MCAST_PORT, "0");
ds = DistributedSystem.connect(props);
cache = CacheFactory.create(ds);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index 457dcb3..1764849 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -21,7 +21,6 @@ package com.gemstone.gemfire.cache.query.internal.index;
import com.gemstone.gemfire.cache.*;
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;
@@ -35,7 +34,7 @@ import java.net.URISyntaxException;
import java.util.Collection;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
*
@@ -50,7 +49,7 @@ public class NewDeclarativeIndexCreationJUnitTest {
public void setUp() throws Exception {
//Read the Cache.xml placed in test.lib folder
Properties props = new Properties();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
+ props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
props.setProperty(MCAST_PORT, "0");
DistributedSystem ds = DistributedSystem.connect(props);
cache = CacheFactory.create(ds);
@@ -154,7 +153,7 @@ public class NewDeclarativeIndexCreationJUnitTest {
public void testIndexCreationExceptionOnRegionWithNewDTD() throws IOException, URISyntaxException {
if (cache != null && !cache.isClosed()) cache.close();
Properties props = new Properties();
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindexwitherror.xml"));
+ props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), "cachequeryindexwitherror.xml"));
props.setProperty(MCAST_PORT, "0");
DistributedSystem ds = DistributedSystem.connect(props);
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index 27c0616..a0b6e65 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -22,7 +22,6 @@ package com.gemstone.gemfire.cache.query.internal.index;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -31,7 +30,7 @@ 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.*;
import static org.junit.Assert.fail;
/**
@@ -59,7 +58,7 @@ public class ProgRegionCreationIndexUpdateTypeJUnitTest{
public void testProgrammaticIndexUpdateType() throws Exception {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config");
+ props.setProperty(LOG_LEVEL, "config");
DistributedSystem ds = DistributedSystem.connect(props);
cache = CacheFactory.create(ds);
//Create a Region with index maintenance type as explicit synchronous
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
index 1749d43..1d94573 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
@@ -38,7 +38,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
@@ -244,7 +244,7 @@ public class RegionSnapshotJUnitTest extends SnapshotTestCase {
cache.close();
CacheFactory cf = new CacheFactory().set(MCAST_PORT, "0")
- .set(DistributionConfig.LOG_LEVEL_NAME, "error")
+ .set(LOG_LEVEL, "error")
.setPdxSerializer(new MyPdxSerializer())
.set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
cache = cf.create();
@@ -264,7 +264,7 @@ public class RegionSnapshotJUnitTest extends SnapshotTestCase {
// change the DSID from 1 -> 100
CacheFactory cf2 = new CacheFactory().set(MCAST_PORT, "0")
- .set(DistributionConfig.LOG_LEVEL_NAME, "error")
+ .set(LOG_LEVEL, "error")
.setPdxSerializer(new MyPdxSerializer())
.set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "100");
cache = cf2.create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
index 3804ee4..381e3ee 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
@@ -16,12 +16,13 @@
*/
package com.gemstone.gemfire.cache.snapshot;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.examples.snapshot.MyObject;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DiskStore;
import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import org.junit.After;
import org.junit.Before;
@@ -52,7 +53,7 @@ public class SnapshotTestCase {
CacheFactory cf = new CacheFactory()
.set(MCAST_PORT, "0")
- .set(DistributionConfig.LOG_LEVEL_NAME, "error");
+ .set(LOG_LEVEL, "error");
cache = cf.create();
ds = cache.createDiskStoreFactory()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
index 38e79cb..d7dd994 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -32,8 +31,7 @@ import org.junit.experimental.categories.Category;
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.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -74,7 +72,7 @@ public class Bug40255JUnitTest {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
System.setProperty("gemfirePropertyFile", BUG_40255_PROPS);
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40255_XML);
+ props.setProperty(CACHE_XML_FILE, BUG_40255_XML);
System.setProperty(NESTED_ATTR_PROPERTY_STRING, NESTED_ATTR_PROPERTY_VALUE);
System.setProperty(ATTR_PROPERTY_STRING, ATTR_PROPERTY_VALUE);
System.setProperty(ELEMENT_PROPERTY_STRING, ELEMENT_PROPERTY_VALUE);
@@ -104,7 +102,7 @@ public class Bug40255JUnitTest {
props.setProperty(MCAST_PORT, "10333");
props.setProperty(LOCATORS, "");
System.setProperty("gemfirePropertyFile", BUG_40255_PROPS);
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40255_XML);
+ props.setProperty(CACHE_XML_FILE, BUG_40255_XML);
System.setProperty(NESTED_ATTR_PROPERTY_STRING, NESTED_ATTR_PROPERTY_VALUE);
System.setProperty(ATTR_PROPERTY_STRING, ATTR_PROPERTY_VALUE);
System.setProperty(ELEMENT_PROPERTY_STRING, ELEMENT_PROPERTY_VALUE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
index 9e9b2f5..93a94cd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -27,8 +26,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;
/**
@@ -77,7 +75,7 @@ public class Bug40662JUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40662_XML);
+ props.setProperty(CACHE_XML_FILE, BUG_40662_XML);
this.ds = DistributedSystem.connect(props);
this.cache = CacheFactory.create(this.ds);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
index d595ab8..aaa585a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
@@ -27,6 +27,8 @@ import java.io.*;
import java.util.Properties;
import java.util.regex.Pattern;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Test to make sure cache close is working.
*
@@ -218,10 +220,10 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
Properties props = new Properties();
String baseLogName = "diskarito";
String logfile = baseLogName+".log";
- props.put(DistributionConfig.LOG_FILE_NAME, logfile);
- props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
+ props.put(LOG_FILE, logfile);
+ props.put(LOG_FILE_SIZE_LIMIT, "1");
DistributedSystem ds = this.getSystem(props);
- props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200");
+ props.put(LOG_DISK_SPACE_LIMIT, "200");
for(int i=0;i<10;i++) {
ds = this.getSystem(props);
ds.disconnect();
@@ -237,10 +239,10 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
Properties props = new Properties();
String baseLogName = "restarto";
String logfile = baseLogName+".log";
- props.put(DistributionConfig.LOG_FILE_NAME, logfile);
- props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
- props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200");
- props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+ props.put(LOG_FILE, logfile);
+ props.put(LOG_FILE_SIZE_LIMIT, "1");
+ props.put(LOG_DISK_SPACE_LIMIT, "200");
+ props.put(LOG_LEVEL, "config");
InternalDistributedSystem ids = getSystem(props);
assertEquals(InternalLogWriter.INFO_LEVEL, ((InternalLogWriter)ids.getLogWriter()).getLogWriterLevel());
ids.disconnect();
@@ -297,9 +299,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
Properties props = new Properties();
String baseLogName = "biscuits";
String logfile = baseLogName+".log";
- props.put(DistributionConfig.LOG_FILE_NAME, logfile);
- props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
- props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+ props.put(LOG_FILE, logfile);
+ props.put(LOG_FILE_SIZE_LIMIT, "1");
+ props.put(LOG_LEVEL, "config");
DistributedSystem ds = getSystem(props);
InternalDistributedSystem ids = (InternalDistributedSystem) ds;
assertEquals(InternalLogWriter.INFO_LEVEL, ((InternalLogWriter)ids.getLogWriter()).getLogWriterLevel());
@@ -324,7 +326,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
* Ok now we have rolled and yada yada. Let's disconnect and reconnect with same name!
*/
int dsId = System.identityHashCode(ds);
- props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200");
+ props.put(LOG_DISK_SPACE_LIMIT, "200");
File f1m = new File(logfile);
assertTrue(f1m.exists());
@@ -374,9 +376,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
Properties props = new Properties();
String logfile = baseLogName+".log";
- props.put(DistributionConfig.LOG_FILE_NAME, logfile);
- props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
- props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+ props.put(LOG_FILE, logfile);
+ props.put(LOG_FILE_SIZE_LIMIT, "1");
+ props.put(LOG_LEVEL, "config");
DistributedSystem ds = getSystem(props);
InternalDistributedSystem ids = (InternalDistributedSystem) ds;
@@ -409,9 +411,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
String logfile = baseLogName+".log";
String sec_logfile = "sec_"+baseLogName+".log";
- props.put(DistributionConfig.LOG_FILE_NAME, logfile);
- props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
- props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+ props.put(LOG_FILE, logfile);
+ props.put(LOG_FILE_SIZE_LIMIT, "1");
+ props.put(LOG_LEVEL, "config");
props.put(DistributionConfig.SECURITY_LOG_FILE_NAME, sec_logfile);
props.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "config");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
index f5190f6..80e5da9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.CachePerfStats;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.dunit.Host;
@@ -27,100 +26,97 @@ import com.gemstone.gemfire.test.dunit.VM;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class CacheRegionsReliablityStatsCheckDUnitTest extends CacheTestCase {
- public CacheRegionsReliablityStatsCheckDUnitTest(String name) {
- super(name);
- }
-
- /**The tests check to see if all the reliablity stats are working
- * fine and asserts their values to constants.
- *
- * */
- public void testRegionsReliablityStats() throws Exception, RegionExistsException{
- final String rr1 = "roleA";
- final String regionNoAccess = "regionNoAccess";
- final String regionLimitedAccess = "regionLimitedAccess";
- final String regionFullAccess = "regionFullAccess";
- //final String regionNameRoleA = "roleA";
- String requiredRoles[] = { rr1};
- Cache myCache = getCache();
-
- MembershipAttributes ra = new MembershipAttributes(requiredRoles,
- LossAction.NO_ACCESS, ResumptionAction.NONE);
-
- AttributesFactory fac = new AttributesFactory();
- fac.setMembershipAttributes(ra);
- fac.setScope(Scope.DISTRIBUTED_ACK);
- fac.setDataPolicy(DataPolicy.REPLICATE);
-
- RegionAttributes attr = fac.create();
- myCache.createRegion(regionNoAccess, attr);
-
- ra = new MembershipAttributes(requiredRoles,
- LossAction.LIMITED_ACCESS, ResumptionAction.NONE);
- fac = new AttributesFactory();
- fac.setMembershipAttributes(ra);
- fac.setScope(Scope.DISTRIBUTED_ACK);
- fac.setDataPolicy(DataPolicy.REPLICATE);
- attr = fac.create();
- myCache.createRegion(regionLimitedAccess, attr);
-
- ra = new MembershipAttributes(requiredRoles,
- LossAction.FULL_ACCESS, ResumptionAction.NONE);
- fac = new AttributesFactory();
- fac.setMembershipAttributes(ra);
- fac.setScope(Scope.DISTRIBUTED_ACK);
- fac.setDataPolicy(DataPolicy.REPLICATE);
- attr = fac.create();
- myCache.createRegion(regionFullAccess, attr);
-
- CachePerfStats stats = ((GemFireCacheImpl)myCache).getCachePerfStats();
-
- assertEquals(stats.getReliableRegionsMissingNoAccess(), 1);
- assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 1);
- assertEquals(stats.getReliableRegionsMissingFullAccess(), 1);
- assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() +
- stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess() ));
-
-
- Host host = Host.getHost(0);
- VM vm1 = host.getVM(1);
-
- SerializableRunnable roleAPlayer = new CacheSerializableRunnable(
- "ROLEAPLAYER") {
- public void run2() throws CacheException
- {
-
- Properties props = new Properties();
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- props.setProperty(DistributionConfig.ROLES_NAME, rr1);
-
- getSystem(props);
- Cache cache = getCache();
- AttributesFactory fac = new AttributesFactory();
- fac.setScope(Scope.DISTRIBUTED_ACK);
- fac.setDataPolicy(DataPolicy.REPLICATE);
-
- RegionAttributes attr = fac.create();
- cache.createRegion(regionNoAccess, attr);
- cache.createRegion(regionLimitedAccess, attr);
- cache.createRegion(regionFullAccess, attr);
-
-
- }
-
- };
-
- vm1.invoke(roleAPlayer);
-
- assertEquals(stats.getReliableRegionsMissingNoAccess(), 0);
- assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 0);
- assertEquals(stats.getReliableRegionsMissingFullAccess(), 0);
- assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() +
- stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess() ));
-
-
- }
-
+ public CacheRegionsReliablityStatsCheckDUnitTest(String name) {
+ super(name);
+ }
+
+ /**
+ * The tests check to see if all the reliablity stats are working
+ * fine and asserts their values to constants.
+ */
+ public void testRegionsReliablityStats() throws Exception, RegionExistsException {
+ final String rr1 = "roleA";
+ final String regionNoAccess = "regionNoAccess";
+ final String regionLimitedAccess = "regionLimitedAccess";
+ final String regionFullAccess = "regionFullAccess";
+ //final String regionNameRoleA = "roleA";
+ String requiredRoles[] = { rr1 };
+ Cache myCache = getCache();
+
+ MembershipAttributes ra = new MembershipAttributes(requiredRoles,
+ LossAction.NO_ACCESS, ResumptionAction.NONE);
+
+ AttributesFactory fac = new AttributesFactory();
+ fac.setMembershipAttributes(ra);
+ fac.setScope(Scope.DISTRIBUTED_ACK);
+ fac.setDataPolicy(DataPolicy.REPLICATE);
+
+ RegionAttributes attr = fac.create();
+ myCache.createRegion(regionNoAccess, attr);
+
+ ra = new MembershipAttributes(requiredRoles,
+ LossAction.LIMITED_ACCESS, ResumptionAction.NONE);
+ fac = new AttributesFactory();
+ fac.setMembershipAttributes(ra);
+ fac.setScope(Scope.DISTRIBUTED_ACK);
+ fac.setDataPolicy(DataPolicy.REPLICATE);
+ attr = fac.create();
+ myCache.createRegion(regionLimitedAccess, attr);
+
+ ra = new MembershipAttributes(requiredRoles,
+ LossAction.FULL_ACCESS, ResumptionAction.NONE);
+ fac = new AttributesFactory();
+ fac.setMembershipAttributes(ra);
+ fac.setScope(Scope.DISTRIBUTED_ACK);
+ fac.setDataPolicy(DataPolicy.REPLICATE);
+ attr = fac.create();
+ myCache.createRegion(regionFullAccess, attr);
+
+ CachePerfStats stats = ((GemFireCacheImpl) myCache).getCachePerfStats();
+
+ assertEquals(stats.getReliableRegionsMissingNoAccess(), 1);
+ assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 1);
+ assertEquals(stats.getReliableRegionsMissingFullAccess(), 1);
+ assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() +
+ stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess()));
+
+ Host host = Host.getHost(0);
+ VM vm1 = host.getVM(1);
+
+ SerializableRunnable roleAPlayer = new CacheSerializableRunnable(
+ "ROLEAPLAYER") {
+ public void run2() throws CacheException {
+
+ Properties props = new Properties();
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(ROLES, rr1);
+
+ getSystem(props);
+ Cache cache = getCache();
+ AttributesFactory fac = new AttributesFactory();
+ fac.setScope(Scope.DISTRIBUTED_ACK);
+ fac.setDataPolicy(DataPolicy.REPLICATE);
+
+ RegionAttributes attr = fac.create();
+ cache.createRegion(regionNoAccess, attr);
+ cache.createRegion(regionLimitedAccess, attr);
+ cache.createRegion(regionFullAccess, attr);
+
+ }
+
+ };
+
+ vm1.invoke(roleAPlayer);
+
+ assertEquals(stats.getReliableRegionsMissingNoAccess(), 0);
+ assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 0);
+ assertEquals(stats.getReliableRegionsMissingFullAccess(), 0);
+ assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() +
+ stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess()));
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
index 80a845a..b9893d2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache30;
import com.company.app.DBLoader;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.DistributedRegion;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheTransactionManagerCreation;
@@ -33,6 +32,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Tests the declarative caching functionality introduced in GemFire
* 5.0 (i.e. congo1). Don't be confused by the 45 in my name :-)
@@ -163,7 +164,7 @@ public class CacheXml45DUnitTest extends CacheXml41DUnitTest {
// make our system play the roles used by this test so the create regions
// will not think the a required role is missing
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, MY_ROLES);
+ config.setProperty(ROLES, MY_ROLES);
this.xmlProps = config;
}
DistributedRegion.ignoreReconnect = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index eef0788..9869e2e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
@@ -28,8 +27,7 @@ import com.gemstone.gemfire.util.test.TestUtil;
import java.io.*;
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 CacheXmlTestCase extends CacheTestCase {
@@ -90,7 +88,7 @@ public class CacheXmlTestCase extends CacheTestCase {
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
if (this.xmlFile != null) {
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME,
+ props.setProperty(CACHE_XML_FILE,
this.xmlFile.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index b1e6694..d38c83f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.cache30;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
@@ -570,7 +572,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
ClientCacheFactory cf = new ClientCacheFactory();
cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
cf.setPoolSubscriptionEnabled(true);
- cf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ cf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
ClientCache cache = getClientCache(cf);
ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
crf.setConcurrencyChecksEnabled(ccEnabled);
@@ -594,9 +596,9 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
cf.setPoolSubscriptionEnabled(true);
cf.setPoolSubscriptionRedundancy(1);
// bug #50683 - secondary durable queue retains all GC messages
- cf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "" + vm.getPid());
- cf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 200);
- cf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ cf.set(DURABLE_CLIENT_ID, "" + vm.getPid());
+ cf.set(DURABLE_CLIENT_TIMEOUT, "" + 200);
+ cf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
ClientCache cache = getClientCache(cf);
ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
crf.setConcurrencyChecksEnabled(ccEnabled);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
index 7594cc2..3b7a065 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -40,6 +40,8 @@ import java.net.UnknownHostException;
import java.util.Properties;
import java.util.Set;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitTest {
public DistributedAckRegionCCEDUnitTest(String name) {
@@ -54,7 +56,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
@Override
public Properties getDistributedSystemProperties() {
Properties p = super.getDistributedSystemProperties();
- p.put(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ p.put(CONSERVE_SOCKETS, "false");
if (distributedSystemID > 0) {
p.put(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+distributedSystemID);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index 78d4138..2cd4961 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@ -16,8 +16,9 @@
*/
package com.gemstone.gemfire.cache30;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
@@ -48,8 +49,8 @@ public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
public Properties getDistributedSystemProperties() {
Properties p = new Properties();
- p.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- p.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ p.put(STATISTIC_SAMPLING_ENABLED, "true");
+ p.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
return p;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 816ef6f..3104892 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -237,12 +237,12 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
public Properties getDistributedSystemProperties() {
Properties p = new Properties();
- p.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- p.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "multicast");
+ p.put(STATISTIC_SAMPLING_ENABLED, "true");
+ p.put(STATISTIC_ARCHIVE_FILE, "multicast");
p.put(MCAST_PORT, mcastport);
p.put(MCAST_TTL, mcastttl);
p.put(LOCATORS, "localhost[" + locatorPort + "]");
- p.put(DistributionConfig.LOG_LEVEL_NAME, "info");
+ p.put(LOG_LEVEL, "info");
return p;
}
@@ -274,7 +274,7 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
locatorProps.setProperty(SystemConfigurationProperties.NAME, "LocatorWithMcast");
locatorProps.setProperty(MCAST_PORT, mcastport);
locatorProps.setProperty(MCAST_TTL, mcastttl);
- locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
+ locatorProps.setProperty(LOG_LEVEL, "info");
//locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
try {
final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, null, null,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
index 15a045c..969349f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.test.dunit.*;
@@ -28,6 +27,8 @@ import org.junit.experimental.categories.Category;
import java.util.Map;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDUnitTest {
static volatile boolean ListenerBlocking;
@@ -39,11 +40,11 @@ public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDU
@Override
public Properties getDistributedSystemProperties() {
Properties p = super.getDistributedSystemProperties();
- p.put(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ p.put(CONSERVE_SOCKETS, "false");
if (distributedSystemID > 0) {
- p.put(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+distributedSystemID);
+ p.put(DISTRIBUTED_SYSTEM_ID, ""+distributedSystemID);
}
- p.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, ""+2000000);
+ p.put(SOCKET_BUFFER_SIZE, ""+2000000);
return p;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
index d054c9f..f068360 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
@@ -35,6 +35,8 @@ import org.junit.Ignore;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* This test is only for GLOBAL REPLICATE Regions. Tests are
* similar to {@link DistributedAckRegionCCEDUnitTest}.
@@ -57,7 +59,7 @@ public class GlobalRegionCCEDUnitTest extends GlobalRegionDUnitTest {
@Override
public Properties getDistributedSystemProperties() {
Properties p = super.getDistributedSystemProperties();
- p.put(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ p.put(CONSERVE_SOCKETS, "false");
if (distributedSystemID > 0) {
p.put(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""
+ distributedSystemID);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
index 3b6fbda..679a6be 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.CachePerfStats;
import com.gemstone.gemfire.internal.cache.DistributedRegion;
import com.gemstone.gemfire.test.dunit.*;
@@ -27,6 +26,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Test to make sure message queuing works.
*
@@ -79,7 +80,7 @@ public class QueueMsgDUnitTest extends ReliabilityTestCase {
vm.invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "missing");
+ config.setProperty(ROLES, "missing");
getSystem(config);
}
});
@@ -219,7 +220,7 @@ public class QueueMsgDUnitTest extends ReliabilityTestCase {
vm.invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "pubFirst");
+ config.setProperty(ROLES, "pubFirst");
getSystem(config);
}
});
@@ -257,7 +258,7 @@ public class QueueMsgDUnitTest extends ReliabilityTestCase {
vm.invoke(new SerializableRunnable() {
public void run() {
Properties config = new Properties();
- config.setProperty(DistributionConfig.ROLES_NAME, "subFirst");
+ config.setProperty(ROLES, "subFirst");
getSystem(config);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index 9c3498d..18dab44 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -115,14 +115,14 @@ public class ReconnectDUnitTest extends CacheTestCase
public Properties getDistributedSystemProperties() {
if (dsProperties == null) {
dsProperties = new Properties();
- dsProperties.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "20000");
- dsProperties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- dsProperties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "false");
- dsProperties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ dsProperties.put(MAX_WAIT_TIME_RECONNECT, "20000");
+ dsProperties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ dsProperties.put(DISABLE_AUTO_RECONNECT, "false");
+ dsProperties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
dsProperties.put(LOCATORS, "localHost[" + locatorPort + "]");
dsProperties.put(MCAST_PORT, "0");
- dsProperties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
- dsProperties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ dsProperties.put(MEMBER_TIMEOUT, "1000");
+ dsProperties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
}
return dsProperties;
}
@@ -198,8 +198,8 @@ public class ReconnectDUnitTest extends CacheTestCase
// DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
- props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+ props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+ props.put(MAX_NUM_RECONNECT_TRIES, "2");
// props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log");
Cache cache = new CacheFactory(props).create();
IgnoredException.addIgnoredException("com.gemstone.gemfire.ForcedDisconnectException||Possible loss of quorum");
@@ -267,9 +267,9 @@ public class ReconnectDUnitTest extends CacheTestCase
// DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
- props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
- props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+ props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+ props.put(MAX_WAIT_TIME_RECONNECT, "1000");
+ props.put(MAX_NUM_RECONNECT_TRIES, "2");
// props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log");
Cache cache = new CacheFactory(props).create();
Region myRegion = cache.getRegion("root/myRegion");
@@ -287,9 +287,9 @@ public class ReconnectDUnitTest extends CacheTestCase
// DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
locatorPort = locPort;
final Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
- props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "5000");
- props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+ props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+ props.put(MAX_WAIT_TIME_RECONNECT, "5000");
+ props.put(MAX_NUM_RECONNECT_TRIES, "2");
props.put(START_LOCATOR, "localhost[" + secondLocPort + "]");
props.put(LOCATORS, props.get(LOCATORS) + ",localhost[" + secondLocPort + "]");
// props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log");
@@ -482,10 +482,10 @@ public class ReconnectDUnitTest extends CacheTestCase
{
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
- props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+ props.put(MAX_WAIT_TIME_RECONNECT, "1000");
+ props.put(MAX_NUM_RECONNECT_TRIES, "2");
props.put(LOCATORS, props.get(LOCATORS) + ",localhost[" + locPort + "]");
- props.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.put(ENABLE_CLUSTER_CONFIGURATION, "false");
try {
Locator.startLocatorAndDS(secondLocPort, null, props);
} catch (IOException e) {
@@ -506,9 +506,9 @@ public class ReconnectDUnitTest extends CacheTestCase
// DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
- props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
- props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+ props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+ props.put(MAX_WAIT_TIME_RECONNECT, "1000");
+ props.put(MAX_NUM_RECONNECT_TRIES, "2");
ReconnectDUnitTest.savedSystem = getSystem(props);
Cache cache = getCache();
Region myRegion = cache.getRegion("root/myRegion");
@@ -626,8 +626,8 @@ public class ReconnectDUnitTest extends CacheTestCase
locatorPort = locPort;
Properties config = getDistributedSystemProperties();
- config.put(DistributionConfig.ROLES_NAME, "");
- config.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ config.put(ROLES, "");
+ config.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
// config.put("log-file", "roleLossController.log");
//creating the DS
getSystem(config);
@@ -670,11 +670,11 @@ public class ReconnectDUnitTest extends CacheTestCase
LogWriterUtils.getLogWriter().info("####### STARTING THE REAL TEST ##########");
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "RoleReconnect-cache.xml");
- props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "200");
+ props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "RoleReconnect-cache.xml");
+ props.put(MAX_WAIT_TIME_RECONNECT, "200");
final int timeReconnect = 3;
- props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "3");
- props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.put(MAX_NUM_RECONNECT_TRIES, "3");
+ props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
// props.put("log-file", "roleLossVM0.log");
getSystem(props);
@@ -759,8 +759,8 @@ public class ReconnectDUnitTest extends CacheTestCase
locatorPort = locPort;
Properties config = getDistributedSystemProperties();
- config.put(DistributionConfig.ROLES_NAME, "");
- config.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ config.put(ROLES, "");
+ config.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
//creating the DS
getSystem(config);
@@ -892,10 +892,10 @@ public class ReconnectDUnitTest extends CacheTestCase
LogWriterUtils.getLogWriter().info("Starting the test and creating the cache and regions etc ...");
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.CACHE_XML_FILE_NAME, "RoleRegained.xml");
- props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "3000");
- props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "8");
- props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.put(CACHE_XML_FILE, "RoleRegained.xml");
+ props.put(MAX_WAIT_TIME_RECONNECT, "3000");
+ props.put(MAX_NUM_RECONNECT_TRIES, "8");
+ props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
getSystem(props);
basicGetSystem().getLogWriter().info("<ExpectedException action=add>"
@@ -1043,8 +1043,7 @@ public class ReconnectDUnitTest extends CacheTestCase
public void run() {
locatorPort = locPort;
final Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
-// props.put("log-file", "");
+ props.put(MAX_WAIT_TIME_RECONNECT, "1000");
dsProperties = props;
ReconnectDUnitTest.savedSystem = getSystem(props);
ReconnectDUnitTest.savedCache = (GemFireCacheImpl)getCache();
@@ -1094,8 +1093,8 @@ public class ReconnectDUnitTest extends CacheTestCase
// getSystem().disconnect();
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- props.put(DistributionConfig.ROLES_NAME, "RoleA");
+ props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.put(ROLES, "RoleA");
getSystem(props);
getCache();
@@ -1144,8 +1143,8 @@ public class ReconnectDUnitTest extends CacheTestCase
LogWriterUtils.getLogWriter().info(startupMessage);
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
- props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- props.put(DistributionConfig.ROLES_NAME, "RoleA");
+ props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.put(ROLES, "RoleA");
getSystem(props);
getCache();
[48/55] [abbrv] incubator-geode git commit: GEODE-1498 CI Failure:
DurableClientCommandsDUnitTest.testCloseDurableClients
Posted by hi...@apache.org.
GEODE-1498 CI Failure: DurableClientCommandsDUnitTest.testCloseDurableClients
Use port 0 for cache server and return a random available port for durable client.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6967ac19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6967ac19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6967ac19
Branch: refs/heads/feature/GEODE-1372
Commit: 6967ac19f2a53cf4c71b69ae06ff8fb39003de4f
Parents: 0815e1b
Author: Jianxia Chen <jc...@pivotal.io>
Authored: Mon Jun 6 13:45:15 2016 -0700
Committer: Jianxia Chen <jc...@pivotal.io>
Committed: Mon Jun 6 13:45:15 2016 -0700
----------------------------------------------------------------------
.../cli/commands/DurableClientCommandsDUnitTest.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6967ac19/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 c51f875..e8a5577 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
@@ -239,15 +239,14 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
private void setupSystem() throws Exception {
disconnectAllFromDS();
- final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(2);
setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM manager = Host.getHost(0).getVM(0);
final VM server1 = Host.getHost(0).getVM(1);
final VM client1 = Host.getHost(0).getVM(2);
- startCacheServer(server1, port[0], false, regionName);
- startDurableClient(client1, server1, port[0], clientName, "300");
+ int listeningPort = startCacheServer(server1, 0, false, regionName);
+ startDurableClient(client1, server1, listeningPort, clientName, "300");
}
/**
@@ -303,10 +302,10 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
});
}
- private void startCacheServer(VM server, final int port,
+ private int startCacheServer(VM server, final int port,
final boolean createPR, final String regionName) throws Exception {
- server.invoke(new SerializableCallable() {
+ Integer listeningPort = (Integer) server.invoke(new SerializableCallable() {
public Object call() throws Exception {
getSystem(getServerProperties());
@@ -331,9 +330,11 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
cacheServer.setPort(port);
cacheServer.start();
- return null;
+ return cacheServer.getPort();
}
});
+
+ return listeningPort.intValue();
}
private void startDurableClient(VM client, final VM server, final int port,
[17/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
index 5174806..e102d08 100755
--- a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
+++ b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.jayway.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.hamcrest.Matchers.equalTo;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 0a9069d..7f92d7c 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
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.Region.Entry;
import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallbackAdapter;
import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
import com.gemstone.gemfire.cache.wan.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry;
@@ -37,7 +36,7 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* @since GemFire 7.0.1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 2de6dd8..f22060b 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
@@ -35,7 +35,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class CacheClientNotifierDUnitTest extends WANTestBase {
private static final int NUM_KEYS = 10;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 28ccd96..8d47e00 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
@@ -33,7 +33,6 @@ import com.gemstone.gemfire.cache.wan.*;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
@@ -69,7 +68,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class WANTestBase extends DistributedTestCase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 0721ed6..6c7379f 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,7 +22,7 @@ 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.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistTXWANDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 b668827..9e94a5e 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
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.cache.wan.misc;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.logging.LogService;
@@ -33,7 +32,7 @@ import org.apache.logging.log4j.Logger;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class NewWanAuthenticationDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index fd41fe7..09703d6 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -39,8 +39,8 @@ import java.util.zip.Adler32;
import java.util.zip.CheckedInputStream;
import java.util.zip.CheckedOutputStream;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class SenderWithTransportFilterDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index 4b2fc67..2d7d42e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -38,7 +38,7 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index 93c6360..3d7d2d2 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -26,7 +26,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.wan.GatewayReceiver;
import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
import com.gemstone.gemfire.cache.wan.GatewaySender;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
@@ -38,7 +37,7 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class WANLocatorServerDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index eaa02b2..899528a 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -37,8 +37,8 @@ import java.io.File;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* DUnit for ParallelSenderQueue overflow operations.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index a33c1ea..6b33b69 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -39,8 +39,8 @@ import java.util.List;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 8a327a7..750f416 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.wan.*;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
@@ -40,7 +39,7 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
import static com.gemstone.gemfire.test.dunit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index 86ca1a3..74137e8 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -32,8 +32,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
index 9ce3de6..3d6458b 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
@@ -33,7 +33,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index 8af63ed..36b856a 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -30,8 +30,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.pause;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 3a86f0f..2234566 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -30,8 +30,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.pause;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
index 10e55e1..543222c 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.pause;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
index c51853d..ded6be1 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.pause;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 91c9e45..6b3fa73 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.pause;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index abefb3b..5e13790 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.pause;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index e2d813c..048bd37 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.pause;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index 7243add..50466b5 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -62,7 +62,7 @@ import java.net.UnknownHostException;
import java.util.*;
import java.util.Map.Entry;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
import static com.gemstone.gemfire.internal.FileUtil.delete;
import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
index 7b20343..a52f9ca 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
@@ -31,7 +31,7 @@ import javax.net.ssl.SSLSession;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.util.test.TestUtil.getResourcePath;
[35/55] [abbrv] incubator-geode git commit: GEODE-1377: Changed
property for spark tests to use new DistributedSystemConfigProperties
Posted by hi...@apache.org.
GEODE-1377: Changed property for spark tests to use new DistributedSystemConfigProperties
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/653eaf28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/653eaf28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/653eaf28
Branch: refs/heads/feature/GEODE-1372
Commit: 653eaf28cf032545936ac9462fe8361ebfe88de1
Parents: 670fae4
Author: Jason Huynh <hu...@gmail.com>
Authored: Thu Jun 2 10:02:24 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Thu Jun 2 10:34:17 2016 -0700
----------------------------------------------------------------------
.../io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/653eaf28/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 1c6a5a2..1bae89b 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
@@ -17,6 +17,7 @@
package ittest.io.pivotal.geode.spark.connector;
import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import io.pivotal.geode.spark.connector.GeodeConnection;
import io.pivotal.geode.spark.connector.GeodeConnectionConf;
import io.pivotal.geode.spark.connector.GeodeConnectionConf$;
@@ -38,7 +39,6 @@ import io.pivotal.geode.spark.connector.package$;
import scala.Tuple2;
import scala.Option;
import scala.Some;
-
import java.util.*;
import static io.pivotal.geode.spark.connector.javaapi.GeodeJavaUtil.RDDSaveBatchSizePropKey;
@@ -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(CACHE_XML_FILE, "src/it/resources/test-retrieve-regions.xml");
+ settings.setProperty(DistributedSystemConfigProperties.CACHE_XML_FILE, "src/it/resources/test-retrieve-regions.xml");
settings.setProperty("num-of-servers", Integer.toString(numServers));
int locatorPort = GeodeCluster$.MODULE$.start(settings);
[50/55] [abbrv] incubator-geode git commit: GEODE-1464: remove sqlf
code
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
index 2d5989b..da60a98 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
@@ -267,10 +267,6 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire
EntryVersionsList versionTags = new EntryVersionsList(removeAllDataCount);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
- final boolean requiresRegionContext =
- (this.removeAllData[0].key instanceof KeyWithRegionContext);
for (int i = 0; i < this.removeAllDataCount; i++) {
if (!hasTags && removeAllData[i].versionTag != null) {
hasTags = true;
@@ -278,7 +274,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire
VersionTag<?> tag = removeAllData[i].versionTag;
versionTags.add(tag);
removeAllData[i].versionTag = null;
- this.removeAllData[i].toData(out, requiresRegionContext);
+ this.removeAllData[i].toData(out);
this.removeAllData[i].versionTag = tag;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor.java
index bd19104..4f49ccf 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor.java
@@ -1898,9 +1898,6 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
setClearCountReference(region);
try {
boolean initialized = region.isInitialized();
- if(region.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(region);
- }
RegionEntry entry = region.basicGetEntry(this.key);
if (entry != null) {
synchronized (entry) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
index 2cc6681..317f4e6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
@@ -56,17 +56,6 @@ public class TXEntry implements Region.Entry
this.keyInfo = key;
this.myTX = tx;
this.rememberReads = rememberReads;
-
- //Assert that these contructors are invoked only
- // via factory path. I am not able to make them private
- // because SqlfabricTxEntry needs extending TxEntry
- /*if(logger.isDebugEnabled()) {
- StackTraceElement[] traces =Thread.currentThread().getStackTrace();
- //The third element should be the factory one
- StackTraceElement trace = traces[2];
- Assert.assertTrue(TxEntryFactory.class.isAssignableFrom(trace.getClass()));
- Assert.assertTrue(trace.getMethodName().equals("createEntry"));
- }*/
}
public boolean isLocal() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
index f392f04..c6caefa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedM
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.DataSerializableFixedID;
import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.delta.Delta;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.lang.StringUtils;
@@ -82,10 +81,6 @@ public class TXEntryState implements Releasable
*/
private int nearSideEventOffset = -1;
- //Asif: In case of Sqlfabric, the pending value may be a SerializableDelta object
- //which may be containing base value ( in case of Tx create) along with bunch
- //of incremental deltas, so for correct behaviour this field should be accessed only
- //by its getter. Do not use it directly
private Object pendingValue;
/**
@@ -290,24 +285,12 @@ public class TXEntryState implements Releasable
}
public Object getOriginalValue() {
- Object value = this.originalValue;
-
- if(value instanceof Delta) {
- value = ((Delta) value).getResultantValue();
- }
-
- return value;
+ return this.originalValue;
}
public Object getPendingValue()
{
- Object value = this.pendingValue;
-
- if(value instanceof Delta) {
- value = ((Delta) value).getResultantValue();
- }
-
- return value;
+ return this.pendingValue;
}
public Object getCallbackArgument()
@@ -335,12 +318,7 @@ public class TXEntryState implements Releasable
void setPendingValue(Object pv)
{
- if(pv instanceof Delta) {
- Object toMerge = this.pendingValue;
- this.pendingValue = ((Delta)pv).merge(toMerge, this.op == OP_CREATE);
- }else {
- this.pendingValue = pv;
- }
+ this.pendingValue = pv;
}
void setCallbackArgument(Object callbackArgument)
@@ -2001,9 +1979,6 @@ public class TXEntryState implements Releasable
valueBytes = (byte[])v;
}
else {
- // this value shouldn't be a Delta
- Assert.assertTrue(!(v instanceof Delta));
-
deserializationPolicy = DistributedCacheOperation.DESERIALIZATION_POLICY_LAZY;
valueBytes = EntryEventImpl.serialize(v);
}
@@ -2076,7 +2051,6 @@ public class TXEntryState implements Releasable
}
- // Asif:Add for sql fabric as it has to plug in its own TXEntry object
private final static TXEntryStateFactory factory = new TXEntryStateFactory() {
public TXEntryState createEntry()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
index 6d997c7..6327ed7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
@@ -104,24 +104,17 @@ public class TXRegionLockRequestImpl
final GemFireCacheImpl cache = getCache(false);
try {
final int size = InternalDataSerializer.readArrayLength(in);
- boolean read = false;
if (cache != null && size > 0) {
this.r = (LocalRegion)cache.getRegion(this.regionPath);
- if( this.r != null ) {
- this.entryKeys = readEntryKeySet(this.r.keyRequiresRegionContext(), size, in);
- read = true;
- }
- }
- if ( !read && size > 0 ) {
- this.entryKeys = readEntryKeySet(false, size, in);
}
+ this.entryKeys = readEntryKeySet(size, in);
} catch (CacheClosedException cce) {
// don't throw in deserialization
this.entryKeys = null;
}
}
- private final Set<Object> readEntryKeySet(final boolean keyRequiresRegionContext,
+ private final Set<Object> readEntryKeySet(
final int size, final DataInput in) throws IOException,
ClassNotFoundException {
@@ -133,9 +126,6 @@ public class TXRegionLockRequestImpl
Object key;
for (int i = 0; i < size; i++) {
key = DataSerializer.readObject(in);
- if (keyRequiresRegionContext) {
- ((KeyWithRegionContext)key).setRegionContext(this.r);
- }
set.add(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
index 19cbe33..479beb2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
@@ -524,12 +524,7 @@ public class TXRegionState {
return changes;
}
- public Map<Object,TXEntryState> getEntriesInTxForSqlFabric() {
- return Collections.unmodifiableMap(this.entryMods);
- }
-
public TXState getTXState() {
- // TODO Auto-generated method stub
return txState;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
index 0ce049d..c42f63c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
@@ -1325,13 +1325,10 @@ public class TXState implements TXStateInterface {
* @param rememberRead true if the value read from committed state
* needs to be remembered in tx state for repeatable read.
* @param createIfAbsent should a transactional entry be created if not present.
- * Used by sql fabric system
* @return a txEntryState or null if the entry doesn't exist in the transaction and/or committed state.
*/
public TXEntryState txReadEntry(KeyInfo keyInfo, LocalRegion localRegion,
boolean rememberRead, boolean createIfAbsent) {
- // EntryNotFoundException can be expected in case of sqlfabric and should
- // not be caught.
localRegion.cache.getCancelCriterion().checkCancelInProgress(null);
return txReadEntry(keyInfo, localRegion, rememberRead, null, createIfAbsent);
}
@@ -1764,7 +1761,7 @@ public class TXState implements TXStateInterface {
// final boolean requiresRegionContext = theRegion.keyRequiresRegionContext();
InternalDistributedMember myId = theRegion.getDistributionManager().getDistributionManagerId();
for (int i = 0; i < putallOp.putAllDataSize; ++i) {
- @Released EntryEventImpl ev = PutAllPRMessage.getEventFromEntry(theRegion, myId,myId, i, putallOp.putAllData, false, putallOp.getBaseEvent().getContext(), false, !putallOp.getBaseEvent().isGenerateCallbacks(), false);
+ @Released EntryEventImpl ev = PutAllPRMessage.getEventFromEntry(theRegion, myId,myId, i, putallOp.putAllData, false, putallOp.getBaseEvent().getContext(), false, !putallOp.getBaseEvent().isGenerateCallbacks());
try {
ev.setPutAllOperation(putallOp);
if (theRegion.basicPut(ev, false, false, null, false)) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
index ffcae4b..865ebd5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
@@ -146,7 +146,6 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
* @param rememberRead true if the value read from committed state
* needs to be remembered in tx state for repeatable read.
* @param createTxEntryIfAbsent should a transactional entry be created if not present.
- * Used by sqlfabric system
* @return a txEntryState or null if the entry doesn't exist in the transaction and/or committed state.
*/
public TXEntryState txReadEntry(KeyInfo entryKey, LocalRegion localRegion, boolean rememberRead
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
index ceb98f0..9754ab9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
@@ -369,14 +369,7 @@ public class UpdateAttributesProcessor {
// set the processor ID to be able to send reply to sender in case of any
// unexpected exception during deserialization etc.
ReplyProcessor21.setMessageRPId(this.processorId);
- try {
- this.profile = DataSerializer.readObject(in);
- } catch (DSFIDFactory.SqlfSerializationException ex) {
- // Ignore SQLFabric serialization errors and reply with nothing.
- // This can happen even during normal startup of all SQLFabric VMs
- // when DS connect is complete but SQLFabric boot is still in progress.
- this.profile = null;
- }
+ this.profile = DataSerializer.readObject(in);
this.exchangeProfiles = in.readBoolean();
this.removeProfile = in.readBoolean();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation.java
index fce4dee..23fb300 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation.java
@@ -94,11 +94,6 @@ public class UpdateEntryVersionOperation extends DistributedCacheOperation {
@Retained
protected InternalCacheEvent createEvent(DistributedRegion rgn)
throws EntryNotFoundException {
-
- if (rgn.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(rgn);
- }
-
@Retained EntryEventImpl ev = EntryEventImpl.create(rgn, getOperation(), this.key,
null /* newValue */, this.callbackArg /*callbackArg*/, true /* originRemote*/ , getSender(), false /*generateCallbacks*/);
ev.setEventId(this.eventId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateOperation.java
index 730d6d7..e60cda3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateOperation.java
@@ -100,11 +100,7 @@ public class UpdateOperation extends AbstractUpdateOperation
m.event = ev;
m.eventId = ev.getEventId();
m.key = ev.getKey();
- if (CachedDeserializableFactory.preferObject() || ev.hasDelta()) {
- m.deserializationPolicy = DESERIALIZATION_POLICY_EAGER;
- } else {
- m.deserializationPolicy = DESERIALIZATION_POLICY_LAZY;
- }
+ m.deserializationPolicy = DESERIALIZATION_POLICY_LAZY;
ev.exportNewValue(m);
}
@@ -297,8 +293,7 @@ public class UpdateOperation extends AbstractUpdateOperation
*/
static void setNewValueInEvent(byte[] newValue, Object newValueObj,
EntryEventImpl event, byte deserializationPolicy) {
- if (newValue == null
- && deserializationPolicy != DESERIALIZATION_POLICY_EAGER) {
+ if (newValue == null) {
// in an UpdateMessage this results from a create(key, null) call,
// set local invalid flag in event if this is a normal region. Otherwise
// it should be a distributed invalid.
@@ -317,9 +312,6 @@ public class UpdateOperation extends AbstractUpdateOperation
case DESERIALIZATION_POLICY_NONE:
event.setNewValue(newValue);
break;
- case DESERIALIZATION_POLICY_EAGER:
- event.setNewValue(newValueObj);
- break;
default:
throw new InternalGemFireError(LocalizedStrings
.UpdateOperation_UNKNOWN_DESERIALIZATION_POLICY_0
@@ -332,10 +324,6 @@ public class UpdateOperation extends AbstractUpdateOperation
{
Object argNewValue = null;
final boolean originRemote = true, generateCallbacks = true;
-
- if (rgn.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(rgn);
- }
@Retained EntryEventImpl result = EntryEventImpl.create(rgn, getOperation(), this.key,
argNewValue, // oldValue,
this.callbackArg, originRemote, getSender(), generateCallbacks);
@@ -413,13 +401,7 @@ public class UpdateOperation extends AbstractUpdateOperation
this.deltaBytes = DataSerializer.readByteArray(in);
}
else {
- if (this.deserializationPolicy
- == DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER) {
- this.newValueObj = DataSerializer.readObject(in);
- }
- else {
- this.newValue = DataSerializer.readByteArray(in);
- }
+ this.newValue = DataSerializer.readByteArray(in);
if ((extraFlags & HAS_DELTA_WITH_FULL_VALUE) != 0) {
this.deltaBytes = DataSerializer.readByteArray(in);
}
@@ -500,13 +482,7 @@ public class UpdateOperation extends AbstractUpdateOperation
byte[] valueBytes = null;
Object valueObj = null;
if (this.newValueObj != null) {
- if (this.deserializationPolicy ==
- DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER) {
- valueObj = this.newValueObj;
- }
- else {
- valueBytes = EntryEventImpl.serialize(this.newValueObj);
- }
+ valueBytes = EntryEventImpl.serialize(this.newValueObj);
}
else {
valueBytes = this.newValue;
@@ -576,10 +552,6 @@ public class UpdateOperation extends AbstractUpdateOperation
// boolean localLoad = false, netLoad = false, netSearch = false,
// distributed = true;
final boolean originRemote = true, generateCallbacks = true;
-
- if (rgn.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(rgn);
- }
@Retained EntryEventImpl ev = EntryEventImpl.create(rgn, getOperation(), this.key,
argNewValue, this.callbackArg, originRemote, getSender(),
generateCallbacks);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
index 32abd68..edf3316 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
@@ -173,9 +173,6 @@ public class ValidatingDiskRegion extends DiskRegion implements DiskRecoveryStor
public void handleValueOverflow(RegionEntryContext context) {throw new IllegalStateException("should never be called");}
@Override
- public void afterValueOverflow(RegionEntryContext context) {throw new IllegalStateException();}
-
- @Override
public Object prepareValueForCache(RegionEntryContext r, Object val, boolean isEntryUpdate) {
throw new IllegalStateException("Should never be called");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
index 7d5b255..93fc533 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
@@ -40,12 +40,6 @@ public abstract class WrappedCallbackArgument {
*/
private Object _originalCallbackArg;
- /** If the GatewayEvent is in a Sql Fabric started Hub, in which case
- * the original callback argument is not serialized
- *
- */
- private boolean serializeCallbackArg = true;
-
/**
* No arg constructor for DataSerializable.
*/
@@ -57,20 +51,6 @@ public abstract class WrappedCallbackArgument {
*
* @param originalCallbackArg The original callback argument set by the
* caller or null if there was not callback arg
- * @param serializeCBArg boolean indicating if the event is created by a
- * sql fabric system
- */
- public WrappedCallbackArgument(Object originalCallbackArg, boolean serializeCBArg) {
- this._originalCallbackArg = originalCallbackArg;
- this.serializeCallbackArg = serializeCBArg;
- }
-
-
- /**
- * Constructor.
- *
- * @param originalCallbackArg The original callback argument set by the
- * caller or null if there was not callback arg
*/
public WrappedCallbackArgument(Object originalCallbackArg) {
this._originalCallbackArg = originalCallbackArg;
@@ -86,11 +66,7 @@ public abstract class WrappedCallbackArgument {
}
public void toData(DataOutput out) throws IOException {
- if(this.serializeCallbackArg) {
- DataSerializer.writeObject(this._originalCallbackArg, out);
- }else {
- DataSerializer.writeObject(null, out);
- }
+ DataSerializer.writeObject(this._originalCallbackArg, out);
}
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java
deleted file mode 100644
index 27d02c4..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.gemstone.gemfire.internal.cache.delta;
-
-import com.gemstone.gemfire.cache.EntryEvent;
-
-/**
- * Represents changes to apply to a region entry instead of a new value.
- * A Delta is passed as the new value in a put operation on a Region
- * and knows how to apply itself to an old value.
- *
- * Internal Note: When an update message carries a Delta as a payload,
- * it makes sure it gets deserialized before being put into the region.
- *
- * @since GemFire 5.5
- * @see com.gemstone.gemfire.internal.cache.UpdateOperation
- */
-public interface Delta {
-
- /**
- * Apply delta to the old value from the provided EntryEvent.
- * If the delta cannot be applied for any reason then an (unchecked)
- * exception should be thrown. If the put is being applied in a
- * distributed-ack scope, then the exception will be propagated back
- * to the originating put call, but will not necessarily cause puts
- * in other servers to fail.
- *
- * @param putEvent the EntryEvent for the put operation, from which
- * the old value can be obtained (as well as other information such
- * as the key and region being operated on)
- *
- * @return the new value to be put into the region
- */
- Object apply(EntryEvent<?, ?> putEvent);
-
- Object merge(Object toMerge, boolean isCreate);
-
- Object merge(Object toMerge);
-
- Object getResultantValue();
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
index 7b7c34d..fefc1c1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
@@ -159,7 +159,6 @@ public abstract class AbstractExecution implements InternalExecution {
}
protected AbstractExecution() {
- this.hasRoutingObjects = false;
}
protected AbstractExecution(AbstractExecution ae) {
@@ -173,7 +172,6 @@ public abstract class AbstractExecution implements InternalExecution {
this.memberMappedArg = ae.memberMappedArg;
}
this.isMemberMappedArgument = ae.isMemberMappedArgument;
- this.hasRoutingObjects = ae.hasRoutingObjects;
this.isClientServerMode = ae.isClientServerMode;
if (ae.proxyCache != null) {
this.proxyCache = ae.proxyCache;
@@ -211,26 +209,10 @@ public abstract class AbstractExecution implements InternalExecution {
return this.rc;
}
- public AbstractExecution withRoutingObjects(Set<Object> routingObjects) {
- if (routingObjects == null) {
- throw new FunctionException(
- LocalizedStrings.FunctionService_ROUTING_OBJECTS_SET_IS_NULL
- .toLocalizedString());
- }
- this.filter.clear();
- this.filter.addAll(routingObjects);
- this.hasRoutingObjects = true;
- return this;
- }
-
public Set getFilter() {
return this.filter;
}
- public boolean hasRoutingObjects() {
- return this.hasRoutingObjects;
- }
-
public AbstractExecution setIsReExecute() {
this.isReExecute = true;
if (this.executionNodesListener != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionStreamingResultCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionStreamingResultCollector.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionStreamingResultCollector.java
index 3874ad9..7ed908e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionStreamingResultCollector.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionStreamingResultCollector.java
@@ -96,8 +96,7 @@ public class FunctionStreamingResultCollector extends ReplyProcessor21 implement
this.execution = execution;
this.fites = Collections.synchronizedList(new ArrayList<FunctionInvocationTargetException>());
// add a reference to self inside the ResultCollector, if required, to avoid
- // this ReplyProcessor21 from being GCed; currently is of use for SQLFabric
- // result collectors to properly implement streaming
+ // this ReplyProcessor21 from being GCed
if (rc instanceof LocalResultCollector<?, ?>) {
((LocalResultCollector<?, ?>)rc).setProcessor(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
index 5ffd72d..81944ef 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
/**
- * Internal interface for SQLFabric. It has internal methods specific for SQLFabric
+ * Internal interface that adds some internal methods to the Execution interface.
*
* @since GemFire 5.8LA
*
@@ -36,31 +36,6 @@ public interface InternalExecution extends Execution {
MemberMappedArgument argument);
/**
- * Specifies a data filter of routing objects for selecting the GemFire
- * members to execute the function that are not GemFire keys rather routing
- * objects as determined by resolver. Currently used by SQL fabric for passing
- * routing objects obtained from the custom resolvers.
- * <p>
- * If the set is empty the function is executed on all members that have the
- * {@linkplain FunctionService#onRegion(com.gemstone.gemfire.cache.Region)
- * region defined}.
- * </p>
- *
- * @param routingObjects
- * Set defining the routing objects to be used for executing the
- * function.
- *
- * @return an Execution with the routing objects
- *
- * @throws IllegalArgumentException
- * if the set of routing objects passed is null.
- * @throws UnsupportedOperationException
- * if not called after
- * {@link FunctionService#onRegion(com.gemstone.gemfire.cache.Region)}
- */
- public InternalExecution withRoutingObjects(Set<Object> routingObjects);
-
- /**
* Specifies a filter of bucketIDs for selecting the GemFire
* members to execute the function on.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
index 54e03c7..f0ed757 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
/**
*
- * Provides internal methods for sqlFabric product
+ * Provides internal methods for tests
*
*
* @since GemFire 6.1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalRegionFunctionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalRegionFunctionContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalRegionFunctionContext.java
index 2234925..90ad79c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalRegionFunctionContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalRegionFunctionContext.java
@@ -30,11 +30,6 @@ import com.gemstone.gemfire.internal.cache.LocalDataSet;
/**
* Internal interface used to provide for some essential functionality for
* {@link RegionFunctionContext} invoked by {@link PartitionRegionHelper}.
- * SQLFabric provides its own implementation when using function messages
- * instead of {@link Function}s so {@link PartitionRegionHelper} should not
- * depend on casting to {@link RegionFunctionContextImpl} directly rather should
- * use this interface.
- *
*/
public interface InternalRegionFunctionContext extends RegionFunctionContext {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutor.java
index ac628a0..3912245 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutor.java
@@ -239,13 +239,6 @@ public class MemberFunctionExecutor extends AbstractExecution {
.toLocalizedString("bucket as filter"));
}
- @Override
- public AbstractExecution withRoutingObjects(Set<Object> routingObjects) {
- throw new FunctionException(
- LocalizedStrings.ExecuteFunction_CANNOT_SPECIFY_0_FOR_DATA_INDEPENDENT_FUNCTIONS
- .toLocalizedString("routing objects"));
- }
-
public InternalExecution withMemberMappedArgument(
MemberMappedArgument argument) {
if(argument == null){
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutor.java
index 1929169..a9f933a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutor.java
@@ -182,13 +182,6 @@ public class MultiRegionFunctionExecutor extends AbstractExecution {
}
@Override
- public AbstractExecution withRoutingObjects(Set<Object> routingObjects) {
- throw new FunctionException(
- LocalizedStrings.ExecuteFunction_CANNOT_SPECIFY_0_FOR_ONREGIONS_FUNCTION
- .toLocalizedString("routing objects"));
- }
-
- @Override
protected ResultCollector executeFunction(Function function) {
if (function.hasResult()) {
ResultCollector rc = this.rc;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
index 15d39c9..302b24e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
@@ -26,9 +26,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.execute.Execution;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultSender;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.LocalDataSet;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
/**
* Context available to data dependent functions. When function is executed
@@ -67,17 +65,6 @@ public class RegionFunctionContextImpl extends FunctionContextImpl implements
this.localBucketSet = localBucketSet;
this.isPossibleDuplicate = isPossibleDuplicate;
setFunctionContexts();
- // set the region context for keys if required
- if (routingObjects != null) {
- final LocalRegion r = (LocalRegion)this.dataSet;
- if (r.keyRequiresRegionContext()) {
- for (Object key : routingObjects) {
- if (key instanceof KeyWithRegionContext) {
- ((KeyWithRegionContext)key).setRegionContext(r);
- }
- }
- }
- }
}
private void setFunctionContexts() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerFunctionExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerFunctionExecutor.java
index 9c06bf6..d821b32 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerFunctionExecutor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerFunctionExecutor.java
@@ -266,13 +266,6 @@ public class ServerFunctionExecutor extends AbstractExecution {
.toLocalizedString("buckets as filter"));
}
- @Override
- public AbstractExecution withRoutingObjects(Set<Object> routingObjects) {
- throw new FunctionException(
- LocalizedStrings.ExecuteFunction_CANNOT_SPECIFY_0_FOR_DATA_INDEPENDENT_FUNCTIONS
- .toLocalizedString("routing objects"));
- }
-
public Execution withArgs(Object args) {
if (args == null) {
throw new FunctionException(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
index f3f534a..ffdfde0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
@@ -38,7 +38,6 @@ import com.gemstone.gemfire.distributed.internal.ReplySender;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
@@ -125,9 +124,6 @@ public final class ContainsKeyValueMessage extends PartitionMessageWithDirectRep
final boolean replyVal;
if (ds != null) {
try {
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
if (this.valueCheck) {
replyVal = ds.containsValueForKeyLocally(this.bucketId, this.key);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
index 2700c61..3bd32cc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
@@ -48,7 +48,6 @@ import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.FilterRoutingInfo;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
@@ -253,9 +252,6 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
}
@Released EntryEventImpl event = null;
try {
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
if (this.bridgeContext != null) {
event = EntryEventImpl.create(r, getOperation(), this.key, null/*newValue*/,
getCallbackArg(), false/*originRemote*/, eventSender,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
index 8a6563b..efd0bea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
@@ -52,7 +52,6 @@ import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.InitialImageOperation;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.VersionTagHolder;
@@ -523,8 +522,6 @@ public final class FetchBulkEntriesMessage extends PartitionMessage
try {
ByteArrayInputStream byteStream = new ByteArrayInputStream(msg.chunk);
DataInputStream in = new DataInputStream(byteStream);
- final boolean requiresRegionContext = this.pr
- .keyRequiresRegionContext();
Object key;
int currentId;
@@ -538,9 +535,6 @@ public final class FetchBulkEntriesMessage extends PartitionMessage
deserializingKey = true;
key = DataSerializer.readObject(in);
if (key != null) {
- if (requiresRegionContext) {
- ((KeyWithRegionContext) key).setRegionContext(this.pr);
- }
deserializingKey = false;
Object value = DataSerializer.readObject(in);
VersionTag versionTag = DataSerializer.readObject(in);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
index d7a3a5f..a18837a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
@@ -51,7 +51,6 @@ import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.CachedDeserializable;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.InitialImageOperation;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
@@ -542,17 +541,12 @@ public final class FetchEntriesMessage extends PartitionMessage
try {
ByteArrayInputStream byteStream = new ByteArrayInputStream(msg.chunk);
DataInputStream in = new DataInputStream(byteStream);
- final boolean requiresRegionContext = this.pr
- .keyRequiresRegionContext();
Object key;
while (in.available() > 0) {
deserializingKey = true;
key = DataSerializer.readObject(in);
if (key != null) {
- if (requiresRegionContext) {
- ((KeyWithRegionContext)key).setRegionContext(this.pr);
- }
deserializingKey = false;
Object value = DataSerializer.readObject(in);
VersionTag versionTag = DataSerializer.readObject(in);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
index fafb546..82f9efb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
@@ -46,7 +46,6 @@ import com.gemstone.gemfire.internal.cache.DataLocationException;
import com.gemstone.gemfire.internal.cache.EntrySnapshot;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.KeyInfo;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
@@ -146,9 +145,6 @@ public final class FetchEntryMessage extends PartitionMessage
EntrySnapshot val;
if (ds != null) {
try {
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
KeyInfo keyInfo = r.getKeyInfo(key);
val = (EntrySnapshot)r.getDataView().getEntryOnRemote(keyInfo, r, true);
r.getPrStats().endPartitionMessagesProcessing(startTime);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
index 3faf1da..6714271 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
@@ -44,7 +44,6 @@ import com.gemstone.gemfire.internal.HeapDataOutputStream;
import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.InitialImageOperation;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.tier.InterestType;
@@ -495,14 +494,9 @@ public final class FetchKeysMessage extends PartitionMessage
try {
ByteArrayInputStream byteStream = new ByteArrayInputStream(msg.chunk);
DataInputStream in = new DataInputStream(byteStream);
- final boolean requiresRegionContext = this.pr
- .keyRequiresRegionContext();
while (in.available() > 0) {
Object key = DataSerializer.readObject(in);
if (key != null) {
- if (requiresRegionContext) {
- ((KeyWithRegionContext)key).setRegionContext(this.pr);
- }
synchronized(returnValue) {
returnValue.add(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
index e903def..a0d4f63 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
@@ -29,6 +29,18 @@ import com.gemstone.gemfire.internal.InternalDataSerializer;
import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.cache.*;
import com.gemstone.gemfire.internal.cache.BucketRegion.RawValue;
+import com.gemstone.gemfire.internal.cache.CachedDeserializableFactory;
+import com.gemstone.gemfire.internal.cache.DataLocationException;
+import com.gemstone.gemfire.internal.cache.EntryEventImpl;
+import com.gemstone.gemfire.internal.cache.ForceReattemptException;
+import com.gemstone.gemfire.internal.cache.KeyInfo;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
+import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
+import com.gemstone.gemfire.internal.cache.TXManagerImpl;
+import com.gemstone.gemfire.internal.cache.TXStateProxy;
+import com.gemstone.gemfire.internal.cache.Token;
+import com.gemstone.gemfire.internal.cache.VersionTagHolder;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
@@ -159,9 +171,6 @@ public final class GetMessage extends PartitionMessageWithDirectReply
if (ds != null) {
VersionTagHolder event = new VersionTagHolder();
try {
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
KeyInfo keyInfo = r.getKeyInfo(key, cbArg);
boolean lockEntry = forceUseOfPRExecutor || isDirectAck();
@@ -325,7 +334,6 @@ public final class GetMessage extends PartitionMessageWithDirectReply
// static values for valueType
static final byte VALUE_IS_SERIALIZED_OBJECT = 0;
static final byte VALUE_IS_BYTES = 1;
- /** came from partial SQLF merge and reconciling with it but not used yet */
//static final byte VALUE_IS_OBJECT = 2;
static final byte VALUE_IS_INVALID = 3;
static final byte VALUE_IS_TOMBSTONE = 4;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
index 6f86acd..bbb9753 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
@@ -45,7 +45,6 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
import com.gemstone.gemfire.internal.cache.FilterRoutingInfo;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
@@ -177,9 +176,6 @@ public final class InvalidateMessage extends DestroyMessage {
eventSender = getSender();
}
final Object key = getKey();
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)key).setRegionContext(r);
- }
@Released final EntryEventImpl event = EntryEventImpl.create(
r,
getOperation(),
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PREntriesIterator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PREntriesIterator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PREntriesIterator.java
index ec2a8db..94a3670 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PREntriesIterator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PREntriesIterator.java
@@ -22,11 +22,9 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
/**
- * This interface is implemented by the iterators
- * GemFireContainer.PRLocalEntriesIterator,
- * PartitionedRegion.PRLocalBucketSetEntriesIterator and
- * PartitionedRegion.KeysSetIterator used by SqlFabric to obtain information of
- * the bucket ID from which the current local entry is being fetched from.
+ * This interface provides the
+ * bucket ID from which the current local entry is being fetched from
+ * and the PartitionedRegion being iterated.
*
*/
public interface PREntriesIterator<T> extends Iterator<T>{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRUpdateEntryVersionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
index e1766dc..726246b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
@@ -42,7 +42,6 @@ import com.gemstone.gemfire.internal.cache.DataLocationException;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
@@ -126,10 +125,6 @@ public class PRUpdateEntryVersionMessage extends
protected boolean operateOnPartitionedRegion(DistributionManager dm,
PartitionedRegion pr, long startTime) throws CacheException,
QueryException, DataLocationException, InterruptedException, IOException {
- if (pr.keyRequiresRegionContext()) {
- ((KeyWithRegionContext) key).setRegionContext(pr);
- }
-
// release not needed because disallowOffHeapValues called
final EntryEventImpl event = EntryEventImpl.create(pr, getOperation(),
getKey(), null, /* newValue */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
index c2ab27e..1b83ee3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
@@ -468,10 +468,6 @@ public abstract class PartitionMessage extends DistributionMessage implements
this.processorId = processor == null? 0 : processor.getProcessorId();
this.notificationOnly = true;
- //Set sqlfAsyncListenerRecepients = r.getRegionAdvisor().adviseSqlfAsyncEventListenerHub();
- //sqlfAsyncListenerRecepients.retainAll(adjunctRecipients);
- //Now remove those adjunct recepients which are present in SqlfAsyncListenerRecepients
- //adjunctRecipients.removeAll(sqlfAsyncListenerRecepients);
this.setFilterInfo(filterRoutingInfo);
Set failures1= null;
if(!adjunctRecipients.isEmpty()) {
@@ -482,20 +478,6 @@ public abstract class PartitionMessage extends DistributionMessage implements
setRecipients(adjunctRecipients);
failures1 = r.getDistributionManager().putOutgoing(this);
}
- /*
- //Now distribute message with old value to Sqlf Hub nodes
- if(!sqlfAsyncListenerRecepients.isEmpty()) {
- //System.out.println("Asif1: sqlf hub recepients ="+sqlfHubRecepients);
- resetRecipients();
- setRecipients(sqlfAsyncListenerRecepients);
- event.applyDelta(true);
- Set failures2 = r.getDistributionManager().putOutgoing(this);
- if(failures1 == null) {
- failures1 = failures2;
- }else if(failures2 != null) {
- failures1.addAll(failures2);
- }
- }*/
return failures1;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
index 7bbe5ce..f7c63f9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
@@ -59,7 +59,6 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
@@ -101,8 +100,6 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
protected static final short HAS_BRIDGE_CONTEXT = UNRESERVED_FLAGS_START;
protected static final short SKIP_CALLBACKS = (HAS_BRIDGE_CONTEXT << 1);
- //using the left most bit for IS_PUT_DML, the last available bit
- protected static final short IS_PUT_DML = (short) (SKIP_CALLBACKS << 1);
private transient InternalDistributedSystem internalDs;
@@ -117,7 +114,6 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
transient VersionedObjectList versions = null;
- private boolean isPutDML;
/**
* Empty constructor to satisfy {@link DataSerializer}requirements
*/
@@ -125,7 +121,7 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
}
public PutAllPRMessage(int bucketId, int size, boolean notificationOnly,
- boolean posDup, boolean skipCallbacks, Object callbackArg, boolean isPutDML) {
+ boolean posDup, boolean skipCallbacks, Object callbackArg) {
this.bucketId = Integer.valueOf(bucketId);
putAllPRData = new PutAllEntryData[size];
this.notificationOnly = notificationOnly;
@@ -133,7 +129,6 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
this.skipCallbacks = skipCallbacks;
this.callbackArg = callbackArg;
initTxMemberId();
- this.isPutDML = isPutDML;
}
public void addEntry(PutAllEntryData entry) {
@@ -270,10 +265,6 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
EntryVersionsList versionTags = new EntryVersionsList(putAllPRDataSize);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
- final boolean requiresRegionContext =
- (this.putAllPRData[0].getKey() instanceof KeyWithRegionContext);
for (int i = 0; i < this.putAllPRDataSize; i++) {
// If sender's version is >= 7.0.1 then we can send versions list.
if (!hasTags && putAllPRData[i].versionTag != null) {
@@ -283,7 +274,7 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
VersionTag<?> tag = putAllPRData[i].versionTag;
versionTags.add(tag);
putAllPRData[i].versionTag = null;
- putAllPRData[i].toData(out, requiresRegionContext);
+ putAllPRData[i].toData(out);
putAllPRData[i].versionTag = tag;
// PutAllEntryData's toData did not serialize eventID to save
// performance for DR, but in PR,
@@ -302,7 +293,6 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
s = super.computeCompressedShort(s);
if (this.bridgeContext != null) s |= HAS_BRIDGE_CONTEXT;
if (this.skipCallbacks) s |= SKIP_CALLBACKS;
- if (this.isPutDML) s |= IS_PUT_DML;
return s;
}
@@ -311,7 +301,6 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
ClassNotFoundException {
super.setBooleans(s, in);
this.skipCallbacks = ((s & SKIP_CALLBACKS) != 0);
- this.isPutDML = ((s & IS_PUT_DML) != 0);
}
@Override
@@ -436,12 +425,8 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
// Fix the updateMsg misorder issue
// Lock the keys when doing postPutAll
Object keys[] = new Object[putAllPRDataSize];
- final boolean keyRequiresRegionContext = r.keyRequiresRegionContext();
for (int i = 0; i < putAllPRDataSize; ++i) {
keys[i] = putAllPRData[i].getKey();
- if (keyRequiresRegionContext) {
- ((KeyWithRegionContext)keys[i]).setRegionContext(r);
- }
}
if (!notificationOnly) {
@@ -482,7 +467,7 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
* in this request, because these request will be blocked by foundKey
*/
for (int i=0; i<putAllPRDataSize; i++) {
- @Released EntryEventImpl ev = getEventFromEntry(r, myId, eventSender, i,putAllPRData,notificationOnly,bridgeContext,posDup,skipCallbacks, this.isPutDML);
+ @Released EntryEventImpl ev = getEventFromEntry(r, myId, eventSender, i,putAllPRData,notificationOnly,bridgeContext,posDup,skipCallbacks);
try {
key = ev.getKey();
@@ -558,7 +543,7 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
}
} else {
for (int i=0; i<putAllPRDataSize; i++) {
- EntryEventImpl ev = getEventFromEntry(r, myId, eventSender, i,putAllPRData,notificationOnly,bridgeContext,posDup,skipCallbacks, this.isPutDML);
+ EntryEventImpl ev = getEventFromEntry(r, myId, eventSender, i,putAllPRData,notificationOnly,bridgeContext,posDup,skipCallbacks);
try {
ev.setOriginRemote(true);
if (this.callbackArg != null) {
@@ -594,7 +579,7 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
InternalDistributedMember myId, InternalDistributedMember eventSender,
int idx, DistributedPutAllOperation.PutAllEntryData[] data,
boolean notificationOnly, ClientProxyMembershipID bridgeContext,
- boolean posDup, boolean skipCallbacks, boolean isPutDML) {
+ boolean posDup, boolean skipCallbacks) {
PutAllEntryData prd = data[idx];
//EntryEventImpl ev = EntryEventImpl.create(r,
// prd.getOp(),
@@ -633,7 +618,6 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
} else {
ev.setTailKey(prd.getTailKey());
}
- ev.setPutDML(isPutDML);
evReturned = true;
return ev;
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
index db137c6..e63d288 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
@@ -56,7 +56,6 @@ import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.FilterRoutingInfo;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
@@ -119,8 +118,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
/**
* Indicates if and when the new value should be deserialized on the
- * the receiver. Distinguishes between Deltas which need to be eagerly
- * deserialized (DESERIALIZATION_POLICY_EAGER), a non-byte[] value that was
+ * the receiver. Distinguishes between a non-byte[] value that was
* serialized (DESERIALIZATION_POLICY_LAZY) and a
* byte[] array value that didn't need to be serialized
* (DESERIALIZATION_POLICY_NONE). While this seems like an extra data, it
@@ -182,15 +180,11 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
private VersionTag versionTag;
- private transient boolean isPutDML;
-
// additional bitmask flags used for serialization/deserialization
protected static final short CACHE_WRITE = UNRESERVED_FLAGS_START;
protected static final short HAS_EXPECTED_OLD_VAL = (CACHE_WRITE << 1);
protected static final short HAS_VERSION_TAG = (HAS_EXPECTED_OLD_VAL << 1);
- //using the left most bit for IS_PUT_DML, the last available bit
- protected static final short IS_PUT_DML = (short) (HAS_VERSION_TAG << 1);
// extraFlags
protected static final int HAS_BRIDGE_CONTEXT =
@@ -349,11 +343,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
this.expectedOldValue = expectedOldValue;
this.key = event.getKey();
if (event.hasNewValue()) {
- if (CachedDeserializableFactory.preferObject() || event.hasDelta()) {
- this.deserializationPolicy = DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER;
- } else {
- this.deserializationPolicy = DistributedCacheOperation.DESERIALIZATION_POLICY_LAZY;
- }
+ this.deserializationPolicy = DistributedCacheOperation.DESERIALIZATION_POLICY_LAZY;
event.exportNewValue(this);
}
else {
@@ -627,14 +617,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
this.deltaBytes = DataSerializer.readByteArray(in);
}
else {
- // for eager deserialization avoid extra byte array serialization
- if (this.deserializationPolicy ==
- DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER) {
- setValObj(DataSerializer.readObject(in));
- }
- else {
- setValBytes(DataSerializer.readByteArray(in));
- }
+ setValBytes(DataSerializer.readByteArray(in));
if ((extraFlags & HAS_DELTA_WITH_FULL_VALUE) != 0) {
this.deltaBytes = DataSerializer.readByteArray(in);
}
@@ -642,10 +625,6 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
if ((flags & HAS_VERSION_TAG) != 0) {
this.versionTag = DataSerializer.readObject(in);
}
- if ((flags & IS_PUT_DML) != 0) {
- this.isPutDML = true;
- }
-
}
@Override
@@ -752,7 +731,6 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
}
}
if (this.versionTag != null) s |= HAS_VERSION_TAG;
- if (this.event.isPutDML()) s |= IS_PUT_DML;
return s;
}
@@ -788,9 +766,6 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
if (eventSender == null) {
eventSender = getSender();
}
- if (r.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(r);
- }
@Released final EntryEventImpl ev = EntryEventImpl.create(
r,
getOperation(),
@@ -814,7 +789,6 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
ev.setCausedByMessage(this);
ev.setInvokePRCallbacks(!notificationOnly);
ev.setPossibleDuplicate(this.posDup);
- ev.setPutDML(this.isPutDML);
/*if (this.hasOldValue) {
if (this.oldValueIsSerialized) {
ev.setSerializedOldValue(getOldValueBytes());
@@ -839,10 +813,6 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
case DistributedCacheOperation.DESERIALIZATION_POLICY_NONE:
ev.setNewValue(getValBytes());
break;
- case DistributedCacheOperation.DESERIALIZATION_POLICY_EAGER:
- // new value is a Delta
- ev.setNewValue(this.valObj); // sets the delta field
- break;
default:
throw new AssertionError("unknown deserialization policy: "
+ deserializationPolicy);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
index 176a41a..a5b4d71 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
@@ -1157,23 +1157,6 @@ public class RegionAdvisor extends CacheDistributionAdvisor
return result;
}
- // For SQLFabric ALTER TABLE, need to reset the parentAdvisors if colocated
- // region changes
- public void resetBucketAdvisorParents() {
- if (this.buckets != null) {
- for (ProxyBucketRegion pbr : this.buckets) {
- if (pbr.getCreatedBucketRegion() != null) {
- throw new InternalGemFireException(
- LocalizedStrings.RegionAdvisor_CANNOT_RESET_EXISTING_BUCKET
- .toLocalizedString(new Object[] {
- pbr.getPartitionedRegion().getFullPath(),
- pbr.getBucketId() }));
- }
- pbr.getBucketAdvisor().resetParentAdvisor(pbr.getBucketId());
- }
- }
- }
-
/**
* Returns the bucket identified by bucketId after waiting for initialization
* to finish processing queued profiles. Call synchronizes and waits on
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteFetchKeysMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteFetchKeysMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteFetchKeysMessage.java
index ac95e03..bea08fc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteFetchKeysMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteFetchKeysMessage.java
@@ -49,7 +49,6 @@ import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.HeapDataOutputStream;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.InitialImageOperation;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.RemoteOperationException;
@@ -421,14 +420,9 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
ByteArrayInputStream byteStream = new ByteArrayInputStream(msg.chunk);
DataInputStream in = new DataInputStream(byteStream);
- final boolean requiresRegionContext = this.region
- .keyRequiresRegionContext();
while (in.available() > 0) {
Object key = DataSerializer.readObject(in);
if (key != null) {
- if (requiresRegionContext) {
- ((KeyWithRegionContext)key).setRegionContext(this.region);
- }
synchronized(returnValue) {
returnValue.add(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
index 125cdb0..5c9e799 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
@@ -59,7 +59,6 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
@@ -260,10 +259,6 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply
EntryVersionsList versionTags = new EntryVersionsList(removeAllPRDataSize);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
- final boolean requiresRegionContext =
- (this.removeAllPRData[0].getKey() instanceof KeyWithRegionContext);
for (int i = 0; i < this.removeAllPRDataSize; i++) {
// If sender's version is >= 7.0.1 then we can send versions list.
if (!hasTags && removeAllPRData[i].versionTag != null) {
@@ -273,7 +268,7 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply
VersionTag<?> tag = removeAllPRData[i].versionTag;
versionTags.add(tag);
removeAllPRData[i].versionTag = null;
- removeAllPRData[i].toData(out, requiresRegionContext);
+ removeAllPRData[i].toData(out);
removeAllPRData[i].versionTag = tag;
// RemoveAllEntryData's toData did not serialize eventID to save
// performance for DR, but in PR,
@@ -423,12 +418,8 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply
// Fix the updateMsg misorder issue
// Lock the keys when doing postRemoveAll
Object keys[] = new Object[removeAllPRDataSize];
- final boolean keyRequiresRegionContext = r.keyRequiresRegionContext();
for (int i = 0; i < removeAllPRDataSize; ++i) {
keys[i] = removeAllPRData[i].getKey();
- if (keyRequiresRegionContext) {
- ((KeyWithRegionContext)keys[i]).setRegionContext(r);
- }
}
if (!notificationOnly) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
index 6111561..44647b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
@@ -243,8 +243,7 @@ public class PartitionedRegionLoadModel {
// [sumedh] remove from buckets array too to be consistent since
// this method will be invoked repeatedly for all colocated regions,
// and then we may miss some colocated regions for a bucket leading
- // to all kinds of issues later (e.g. see SQLF test for #41472 that
- // shows some problems including NPEs, hangs etc.)
+ // to all kinds of issues later
this.buckets[i] = null;
continue;
}
@@ -555,22 +554,12 @@ public class PartitionedRegionLoadModel {
public Move findBestPrimaryMove() {
Move bestMove= null;
double bestImprovement = 0;
- GemFireCacheImpl cache = null;
for(Member source: this.members.values()) {
for(Bucket bucket: source.getPrimaryBuckets()) {
for(Member target: bucket.getMembersHosting()) {
if(source.equals(target)) {
continue;
}
- // If node is not fully initialized yet, then skip this node
- // (SQLFabric DDL replay in progress).
- if (cache == null) {
- cache = GemFireCacheImpl.getInstance();
- }
- if (cache != null
- && cache.isUnInitializedMember(target.getMemberId())) {
- continue;
- }
double improvement = improvement(source.getPrimaryLoad(), source
.getWeight(), target.getPrimaryLoad(), target.getWeight(), bucket.getPrimaryLoad(),
getPrimaryAverage());
@@ -1211,12 +1200,6 @@ public class PartitionedRegionLoadModel {
if(getBuckets().contains(bucket)) {
return RefusalReason.ALREADY_HOSTING;
}
- // If node is not fully initialized yet, then skip this node (SQLFabric
- // DDL replay in progress).
- final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if (cache != null && cache.isUnInitializedMember(getMemberId())) {
- return RefusalReason.UNITIALIZED_MEMBER;
- }
//Check the ip address
if(checkZone) {
//If the source member is equivalent to the target member, go
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
index 448be92..e3a3d53 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
@@ -39,7 +39,6 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.EventIDHolder;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
import com.gemstone.gemfire.internal.cache.tier.Command;
@@ -320,9 +319,6 @@ public class GatewayReceiverCommand extends BaseCommand {
try {
byte[] value = valuePart.getSerializedForm();
boolean isObject = valuePart.isObject();
- if (region.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)key).setRegionContext(region);
- }
// [sumedh] This should be done on client while sending
// since that is the WAN gateway
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
@@ -428,9 +424,6 @@ public class GatewayReceiverCommand extends BaseCommand {
try {
byte[] value = valuePart.getSerializedForm();
boolean isObject = valuePart.isObject();
- if (region.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)key).setRegionContext(region);
- }
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
if (authzRequest != null) {
PutOperationContext putContext = authzRequest.putAuthorize(
@@ -523,9 +516,6 @@ public class GatewayReceiverCommand extends BaseCommand {
}
handleMessageRetry(region, clientEvent);
// Destroy the entry
- if (region.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)key).setRegionContext(region);
- }
try {
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
if (authzRequest != null) {
@@ -606,9 +596,6 @@ public class GatewayReceiverCommand extends BaseCommand {
}
// Update the version tag
- if (region.keyRequiresRegionContext()) {
- ((KeyWithRegionContext) key).setRegionContext(region);
- }
try {
region.basicBridgeUpdateVersionStamp(key, callbackArg, servConn.getProxyID(), false, clientEvent);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/DistTxEntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/DistTxEntryEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/DistTxEntryEvent.java
index 6e7c21c..c84fb99 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/DistTxEntryEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/DistTxEntryEvent.java
@@ -138,12 +138,7 @@ public class DistTxEntryEvent extends EntryEventImpl {
EntryVersionsList versionTags = new EntryVersionsList(
this.putAllOp.putAllDataSize);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
final PutAllEntryData[] putAllData = this.putAllOp.getPutAllEntryData();
- // final boolean requiresRegionContext =
- // (putAllData[0].key instanceof KeyWithRegionContext);
- final boolean requiresRegionContext = false;
for (int i = 0; i < this.putAllOp.putAllDataSize; i++) {
if (!hasTags && putAllData[i].versionTag != null) {
hasTags = true;
@@ -151,7 +146,7 @@ public class DistTxEntryEvent extends EntryEventImpl {
VersionTag<?> tag = putAllData[i].versionTag;
versionTags.add(tag);
putAllData[i].versionTag = null;
- putAllData[i].toData(out, requiresRegionContext);
+ putAllData[i].toData(out);
putAllData[i].versionTag = tag;
}
out.writeBoolean(hasTags);
@@ -206,13 +201,8 @@ public class DistTxEntryEvent extends EntryEventImpl {
this.removeAllOp.removeAllDataSize);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
- // final boolean requiresRegionContext =
- // (this.removeAllData[0].key instanceof KeyWithRegionContext);
final RemoveAllEntryData[] removeAllData = this.removeAllOp
.getRemoveAllEntryData();
- final boolean requiresRegionContext = false;
for (int i = 0; i < this.removeAllOp.removeAllDataSize; i++) {
if (!hasTags && removeAllData[i].versionTag != null) {
hasTags = true;
@@ -220,7 +210,7 @@ public class DistTxEntryEvent extends EntryEventImpl {
VersionTag<?> tag = removeAllData[i].versionTag;
versionTags.add(tag);
removeAllData[i].versionTag = null;
- removeAllData[i].toData(out, requiresRegionContext);
+ removeAllData[i].toData(out);
removeAllData[i].versionTag = tag;
}
out.writeBoolean(hasTags);
[06/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
index 59ec773..8200961 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.internal;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import junit.framework.AssertionFailedError;
@@ -27,7 +26,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
-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.assertFalse;
@@ -58,48 +57,48 @@ public class SSLConfigJUnitTest {
SSL_PROPS_MAP.put("javax.net.ssl.trustStorePassword", "gemfire-trust-password");
// SSL Properties for GemFire in-cluster connections
- CLUSTER_SSL_PROPS_MAP.put(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME, "jks");
- CLUSTER_SSL_PROPS_MAP.put(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME, "/export/gemfire-configs/gemfire.keystore");
- CLUSTER_SSL_PROPS_MAP.put(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME, "gemfire-key-password");
- CLUSTER_SSL_PROPS_MAP.put(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/gemfire.truststore");
- CLUSTER_SSL_PROPS_MAP.put(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME, "gemfire-trust-password");
+ CLUSTER_SSL_PROPS_MAP.put(CLUSTER_SSL_KEYSTORE_TYPE, "jks");
+ CLUSTER_SSL_PROPS_MAP.put(CLUSTER_SSL_KEYSTORE, "/export/gemfire-configs/gemfire.keystore");
+ CLUSTER_SSL_PROPS_MAP.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "gemfire-key-password");
+ CLUSTER_SSL_PROPS_MAP.put(CLUSTER_SSL_TRUSTSTORE, "/export/gemfire-configs/gemfire.truststore");
+ CLUSTER_SSL_PROPS_MAP.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "gemfire-trust-password");
// Partially over-ridden SSL Properties for cluster
- CLUSTER_SSL_PROPS_SUBSET_MAP.put(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME, "/export/gemfire-configs/gemfire.keystore");
- CLUSTER_SSL_PROPS_SUBSET_MAP.put(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/gemfire.truststore");
+ CLUSTER_SSL_PROPS_SUBSET_MAP.put(CLUSTER_SSL_KEYSTORE, "/export/gemfire-configs/gemfire.keystore");
+ CLUSTER_SSL_PROPS_SUBSET_MAP.put(CLUSTER_SSL_TRUSTSTORE, "/export/gemfire-configs/gemfire.truststore");
// SSL Properties for GemFire JMX Manager connections
- JMX_SSL_PROPS_MAP.put(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME, "jks");
- JMX_SSL_PROPS_MAP.put(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_NAME, "/export/gemfire-configs/manager.keystore");
- JMX_SSL_PROPS_MAP.put(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME, "manager-key-password");
- JMX_SSL_PROPS_MAP.put(DistributionConfig.JMX_MANAGER_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/manager.truststore");
- JMX_SSL_PROPS_MAP.put(DistributionConfig.JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME, "manager-trust-password");
+ JMX_SSL_PROPS_MAP.put(JMX_MANAGER_SSL_KEYSTORE_TYPE, "jks");
+ JMX_SSL_PROPS_MAP.put(JMX_MANAGER_SSL_KEYSTORE, "/export/gemfire-configs/manager.keystore");
+ JMX_SSL_PROPS_MAP.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD, "manager-key-password");
+ JMX_SSL_PROPS_MAP.put(JMX_MANAGER_SSL_TRUSTSTORE, "/export/gemfire-configs/manager.truststore");
+ JMX_SSL_PROPS_MAP.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD, "manager-trust-password");
// SSL Properties for GemFire CacheServer connections
- SERVER_SSL_PROPS_MAP.put(DistributionConfig.SERVER_SSL_KEYSTORE_TYPE_NAME, "jks");
- SERVER_SSL_PROPS_MAP.put(DistributionConfig.SERVER_SSL_KEYSTORE_NAME, "/export/gemfire-configs/cacheserver.keystore");
- SERVER_SSL_PROPS_MAP.put(DistributionConfig.SERVER_SSL_KEYSTORE_PASSWORD_NAME, "cacheserver-key-password");
- SERVER_SSL_PROPS_MAP.put(DistributionConfig.SERVER_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/cacheserver.truststore");
- SERVER_SSL_PROPS_MAP.put(DistributionConfig.SERVER_SSL_TRUSTSTORE_PASSWORD_NAME, "cacheserver-trust-password");
+ SERVER_SSL_PROPS_MAP.put(SERVER_SSL_KEYSTORE_TYPE, "jks");
+ SERVER_SSL_PROPS_MAP.put(SERVER_SSL_KEYSTORE, "/export/gemfire-configs/cacheserver.keystore");
+ SERVER_SSL_PROPS_MAP.put(SERVER_SSL_KEYSTORE_PASSWORD, "cacheserver-key-password");
+ SERVER_SSL_PROPS_MAP.put(SERVER_SSL_TRUSTSTORE, "/export/gemfire-configs/cacheserver.truststore");
+ SERVER_SSL_PROPS_MAP.put(SERVER_SSL_TRUSTSTORE_PASSWORD, "cacheserver-trust-password");
// SSL Properties for GemFire gateway connections
- GATEWAY_SSL_PROPS_MAP.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_TYPE_NAME, "jks");
- GATEWAY_SSL_PROPS_MAP.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME, "/export/gemfire-configs/gateway.keystore");
- GATEWAY_SSL_PROPS_MAP.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_PASSWORD_NAME, "gateway-key-password");
- GATEWAY_SSL_PROPS_MAP.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/gateway.truststore");
- GATEWAY_SSL_PROPS_MAP.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME, "gateway-trust-password");
+ GATEWAY_SSL_PROPS_MAP.put(GATEWAY_SSL_KEYSTORE_TYPE, "jks");
+ GATEWAY_SSL_PROPS_MAP.put(GATEWAY_SSL_KEYSTORE, "/export/gemfire-configs/gateway.keystore");
+ GATEWAY_SSL_PROPS_MAP.put(GATEWAY_SSL_KEYSTORE_PASSWORD, "gateway-key-password");
+ GATEWAY_SSL_PROPS_MAP.put(GATEWAY_SSL_TRUSTSTORE, "/export/gemfire-configs/gateway.truststore");
+ GATEWAY_SSL_PROPS_MAP.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD, "gateway-trust-password");
// Partially over-ridden SSL Properties for GemFire JMX Manager connections
- JMX_SSL_PROPS_SUBSET_MAP.put(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_NAME, "/export/gemfire-configs/manager.keystore");
- JMX_SSL_PROPS_SUBSET_MAP.put(DistributionConfig.JMX_MANAGER_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/manager.truststore");
+ JMX_SSL_PROPS_SUBSET_MAP.put(JMX_MANAGER_SSL_KEYSTORE, "/export/gemfire-configs/manager.keystore");
+ JMX_SSL_PROPS_SUBSET_MAP.put(JMX_MANAGER_SSL_TRUSTSTORE, "/export/gemfire-configs/manager.truststore");
// Partially over-ridden SSL Properties for GemFire JMX Manager connections
- SERVER_PROPS_SUBSET_MAP.put(DistributionConfig.SERVER_SSL_KEYSTORE_NAME, "/export/gemfire-configs/cacheserver.keystore");
- SERVER_PROPS_SUBSET_MAP.put(DistributionConfig.SERVER_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/cacheserver.truststore");
+ SERVER_PROPS_SUBSET_MAP.put(SERVER_SSL_KEYSTORE, "/export/gemfire-configs/cacheserver.keystore");
+ SERVER_PROPS_SUBSET_MAP.put(SERVER_SSL_TRUSTSTORE, "/export/gemfire-configs/cacheserver.truststore");
// Partially over-ridden SSL Properties for GemFire JMX Manager connections
- GATEWAY_PROPS_SUBSET_MAP.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME, "/export/gemfire-configs/gateway.keystore");
- GATEWAY_PROPS_SUBSET_MAP.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME, "/export/gemfire-configs/gateway.truststore");
+ GATEWAY_PROPS_SUBSET_MAP.put(GATEWAY_SSL_KEYSTORE, "/export/gemfire-configs/gateway.keystore");
+ GATEWAY_PROPS_SUBSET_MAP.put(GATEWAY_SSL_TRUSTSTORE, "/export/gemfire-configs/gateway.truststore");
}
@@ -109,7 +108,7 @@ public class SSLConfigJUnitTest {
public void testMCastPortWithSSL() throws Exception {
Properties props = new Properties( );
// default mcast-port is not 0.
- props.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true");
+ props.setProperty(SSL_ENABLED, "true");
try {
new DistributionConfigImpl( props );
@@ -127,7 +126,7 @@ public class SSLConfigJUnitTest {
public void testMCastPortWithClusterSSL() throws Exception {
Properties props = new Properties( );
// default mcast-port is not 0.
- props.setProperty(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
+ props.setProperty(CLUSTER_SSL_ENABLED, "true");
try {
new DistributionConfigImpl( props );
@@ -156,7 +155,7 @@ public class SSLConfigJUnitTest {
Properties props = new Properties();
sslciphers = "RSA_WITH_GARBAGE";
- props.setProperty(DistributionConfig.SSL_CIPHERS_NAME, sslciphers);
+ props.setProperty(SSL_CIPHERS, sslciphers);
config = new DistributionConfigImpl( props );
isEqual( config.getSSLEnabled(), sslenabled );
@@ -165,7 +164,7 @@ public class SSLConfigJUnitTest {
isEqual( config.getSSLRequireAuthentication(), requireAuth );
sslprotocols = "SSLv7";
- props.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, sslprotocols);
+ props.setProperty(SSL_PROTOCOLS, sslprotocols);
config = new DistributionConfigImpl( props );
isEqual( config.getSSLEnabled(), sslenabled );
@@ -174,7 +173,7 @@ public class SSLConfigJUnitTest {
isEqual( config.getSSLRequireAuthentication(), requireAuth );
requireAuth = false;
- props.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ props.setProperty(SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
config = new DistributionConfigImpl( props );
isEqual( config.getSSLEnabled(), sslenabled );
@@ -183,7 +182,7 @@ public class SSLConfigJUnitTest {
isEqual( config.getSSLRequireAuthentication(), requireAuth );
sslenabled = true;
- props.setProperty(DistributionConfig.SSL_ENABLED_NAME, String.valueOf(sslenabled));
+ props.setProperty(SSL_ENABLED, String.valueOf(sslenabled));
props.setProperty(MCAST_PORT, "0");
config = new DistributionConfigImpl( props );
@@ -214,7 +213,7 @@ public class SSLConfigJUnitTest {
Properties props = new Properties();
sslciphers = "RSA_WITH_GARBAGE";
- props.setProperty(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
+ props.setProperty(CLUSTER_SSL_CIPHERS, sslciphers);
config = new DistributionConfigImpl( props );
isEqual( config.getClusterSSLEnabled(), sslenabled );
@@ -223,7 +222,7 @@ public class SSLConfigJUnitTest {
isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
sslprotocols = "SSLv7";
- props.setProperty(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
+ props.setProperty(CLUSTER_SSL_PROTOCOLS, sslprotocols);
config = new DistributionConfigImpl( props );
isEqual( config.getClusterSSLEnabled(), sslenabled );
@@ -232,7 +231,7 @@ public class SSLConfigJUnitTest {
isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
requireAuth = false;
- props.setProperty(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
config = new DistributionConfigImpl( props );
isEqual( config.getClusterSSLEnabled(), sslenabled );
@@ -241,7 +240,7 @@ public class SSLConfigJUnitTest {
isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
sslenabled = true;
- props.setProperty(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
+ props.setProperty(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
props.setProperty(MCAST_PORT, "0");
config = new DistributionConfigImpl( props );
@@ -346,11 +345,11 @@ public class SSLConfigJUnitTest {
boolean jmxManagerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_NAME, String.valueOf(jmxManagerSsl));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_ENABLED_NAME, String.valueOf(jmxManagerSslenabled));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_PROTOCOLS_NAME, jmxManagerSslprotocols);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_CIPHERS_NAME, jmxManagerSslciphers);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(jmxManagerSslRequireAuth));
+ gemFireProps.put(JMX_MANAGER_SSL, String.valueOf(jmxManagerSsl));
+ gemFireProps.put(JMX_MANAGER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
+ gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
+ gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
+ gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
try{
DistributionConfigImpl config = new DistributionConfigImpl( gemFireProps );
}catch(IllegalArgumentException e){
@@ -360,15 +359,15 @@ public class SSLConfigJUnitTest {
}
gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_NAME, String.valueOf(jmxManagerSsl));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_PROTOCOLS_NAME, jmxManagerSslprotocols);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_CIPHERS_NAME, jmxManagerSslciphers);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(jmxManagerSslRequireAuth));
+ gemFireProps.put(JMX_MANAGER_SSL, String.valueOf(jmxManagerSsl));
+ gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
+ gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
+ gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
DistributionConfigImpl config = new DistributionConfigImpl( gemFireProps );
isEqual( config.getClusterSSLEnabled(), sslenabled );
@@ -396,15 +395,15 @@ public class SSLConfigJUnitTest {
boolean cacheServerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.SERVER_SSL_ENABLED_NAME, String.valueOf(cacheServerSslenabled));
- gemFireProps.put(DistributionConfig.SERVER_SSL_PROTOCOLS_NAME, cacheServerSslprotocols);
- gemFireProps.put(DistributionConfig.SERVER_SSL_CIPHERS_NAME, cacheServerSslciphers);
- gemFireProps.put(DistributionConfig.SERVER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(cacheServerSslRequireAuth));
+ gemFireProps.put(SERVER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
+ gemFireProps.put(SERVER_SSL_PROTOCOLS, cacheServerSslprotocols);
+ gemFireProps.put(SERVER_SSL_CIPHERS, cacheServerSslciphers);
+ gemFireProps.put(SERVER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
DistributionConfigImpl config = new DistributionConfigImpl( gemFireProps );
isEqual( config.getClusterSSLEnabled(), sslenabled );
@@ -431,15 +430,15 @@ public class SSLConfigJUnitTest {
boolean gatewaySslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- 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);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(gatewaySslRequireAuth));
+ gemFireProps.put(GATEWAY_SSL_ENABLED, String.valueOf(gatewaySslenabled));
+ gemFireProps.put(GATEWAY_SSL_PROTOCOLS, gatewaySslprotocols);
+ gemFireProps.put(GATEWAY_SSL_CIPHERS, gatewaySslciphers);
+ gemFireProps.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, String.valueOf(gatewaySslRequireAuth));
DistributionConfigImpl config = new DistributionConfigImpl( gemFireProps );
isEqual( config.getClusterSSLEnabled(), sslenabled );
@@ -469,8 +468,8 @@ public class SSLConfigJUnitTest {
//sslEnabled and clusterSSLEnabled set at the same time
Properties gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "false");
+ gemFireProps.put(SSL_ENABLED, "true");
+ gemFireProps.put(CLUSTER_SSL_ENABLED, "false");
DistributionConfigImpl config = null;
try{
config = new DistributionConfigImpl( gemFireProps );
@@ -484,10 +483,10 @@ public class SSLConfigJUnitTest {
//ssl-protocol and cluster-ssl-protocol set at the same time
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, clusterSslprotocols);
+ gemFireProps.put(SSL_ENABLED, "true");
+ gemFireProps.put(SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, clusterSslprotocols);
try{
config = new DistributionConfigImpl( gemFireProps );
throw new Exception();
@@ -500,10 +499,10 @@ public class SSLConfigJUnitTest {
//ssl-protocol and cluster-ssl-protocol set at the same time with same value
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
+ gemFireProps.put(SSL_ENABLED, "true");
+ gemFireProps.put(SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
try{
config = new DistributionConfigImpl( gemFireProps );
} catch(IllegalArgumentException e){
@@ -513,10 +512,10 @@ public class SSLConfigJUnitTest {
//ssl-cipher and cluster-ssl-cipher set at the same time
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, clusterSslciphers);
+ gemFireProps.put(SSL_ENABLED, "true");
+ gemFireProps.put(SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, clusterSslciphers);
try{
config = new DistributionConfigImpl( gemFireProps );
throw new Exception();
@@ -529,10 +528,10 @@ public class SSLConfigJUnitTest {
//ssl-cipher and cluster-ssl-cipher set at the same time with same value
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
+ gemFireProps.put(SSL_ENABLED, "true");
+ gemFireProps.put(SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
try{
config = new DistributionConfigImpl( gemFireProps );
} catch(IllegalArgumentException e){
@@ -542,10 +541,10 @@ public class SSLConfigJUnitTest {
//ssl-require-authentication and cluster-ssl-require-authentication set at the same time
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, "false");
+ gemFireProps.put(SSL_ENABLED, "true");
+ gemFireProps.put(SSL_REQUIRE_AUTHENTICATION, "true");
+ gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "false");
try{
config = new DistributionConfigImpl( gemFireProps );
throw new Exception();
@@ -558,10 +557,10 @@ public class SSLConfigJUnitTest {
//ssl-require-authentication and cluster-ssl-require-authentication set at the same time and have the same value
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, "true");
+ gemFireProps.put(SSL_ENABLED, "true");
+ gemFireProps.put(SSL_REQUIRE_AUTHENTICATION, "true");
+ gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
try{
config = new DistributionConfigImpl( gemFireProps );
} catch(IllegalArgumentException e){
@@ -571,10 +570,10 @@ public class SSLConfigJUnitTest {
// only ssl-* properties provided. same should reflect in cluster-ssl properties
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.SSL_PROTOCOLS_NAME, sslprotocols);
+ gemFireProps.put(SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
+ gemFireProps.put(SSL_CIPHERS, sslciphers);
+ gemFireProps.put(SSL_PROTOCOLS, sslprotocols);
gemFireProps.putAll(getGfSecurityPropertiesSSL());
@@ -599,10 +598,10 @@ public class SSLConfigJUnitTest {
//only clutser-ssl-properties provided.
gemFireProps = new Properties();
gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(clusterSslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(clusterSslRequireAuth));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, clusterSslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, clusterSslprotocols);
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(clusterSslenabled));
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(clusterSslRequireAuth));
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, clusterSslciphers);
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, clusterSslprotocols);
gemFireProps.putAll(getGfSecurityPropertiesCluster(false));
@@ -613,11 +612,11 @@ public class SSLConfigJUnitTest {
isEqual(clusterSslciphers, config.getClusterSSLCiphers());
isEqual(clusterSslRequireAuth, config.getClusterSSLRequireAuthentication());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
clusterSSLProperties = config.getClusterSSLProperties();
isEqual( SSL_PROPS_MAP, clusterSSLProperties );
@@ -637,15 +636,15 @@ public class SSLConfigJUnitTest {
boolean jmxManagerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_ENABLED_NAME, String.valueOf(jmxManagerSslenabled));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_PROTOCOLS_NAME, jmxManagerSslprotocols);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_CIPHERS_NAME, jmxManagerSslciphers);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(jmxManagerSslRequireAuth));
+ gemFireProps.put(JMX_MANAGER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
+ gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
+ gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
+ gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesJMX(false /*partialJmxSslConfigOverride*/));
@@ -660,11 +659,11 @@ public class SSLConfigJUnitTest {
isEqual( config.getJmxManagerSSLCiphers(), jmxManagerSslciphers );
isEqual( config.getJmxManagerSSLRequireAuthentication(), jmxManagerSslRequireAuth );
- isEqual(JMX_SSL_PROPS_MAP.get(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_NAME), config.getJmxManagerSSLKeyStore());
- isEqual(JMX_SSL_PROPS_MAP.get(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME), config.getJmxManagerSSLKeyStoreType());
- isEqual(JMX_SSL_PROPS_MAP.get(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME), config.getJmxManagerSSLKeyStorePassword());
- isEqual(JMX_SSL_PROPS_MAP.get(DistributionConfig.JMX_MANAGER_SSL_TRUSTSTORE_NAME), config.getJmxManagerSSLTrustStore());
- isEqual(JMX_SSL_PROPS_MAP.get(DistributionConfig.JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getJmxManagerSSLTrustStorePassword());
+ isEqual(JMX_SSL_PROPS_MAP.get(JMX_MANAGER_SSL_KEYSTORE), config.getJmxManagerSSLKeyStore());
+ isEqual(JMX_SSL_PROPS_MAP.get(JMX_MANAGER_SSL_KEYSTORE_TYPE), config.getJmxManagerSSLKeyStoreType());
+ isEqual(JMX_SSL_PROPS_MAP.get(JMX_MANAGER_SSL_KEYSTORE_PASSWORD), config.getJmxManagerSSLKeyStorePassword());
+ isEqual(JMX_SSL_PROPS_MAP.get(JMX_MANAGER_SSL_TRUSTSTORE), config.getJmxManagerSSLTrustStore());
+ isEqual(JMX_SSL_PROPS_MAP.get(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD), config.getJmxManagerSSLTrustStorePassword());
}
@Test
@@ -680,15 +679,15 @@ public class SSLConfigJUnitTest {
boolean cacheServerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.SERVER_SSL_ENABLED_NAME, String.valueOf(cacheServerSslenabled));
- gemFireProps.put(DistributionConfig.SERVER_SSL_PROTOCOLS_NAME, cacheServerSslprotocols);
- gemFireProps.put(DistributionConfig.SERVER_SSL_CIPHERS_NAME, cacheServerSslciphers);
- gemFireProps.put(DistributionConfig.SERVER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(cacheServerSslRequireAuth));
+ gemFireProps.put(SERVER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
+ gemFireProps.put(SERVER_SSL_PROTOCOLS, cacheServerSslprotocols);
+ gemFireProps.put(SERVER_SSL_CIPHERS, cacheServerSslciphers);
+ gemFireProps.put(SERVER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforCS(false));
@@ -703,11 +702,11 @@ public class SSLConfigJUnitTest {
isEqual( config.getServerSSLCiphers(), cacheServerSslciphers );
isEqual( config.getServerSSLRequireAuthentication(), cacheServerSslRequireAuth );
- isEqual(SERVER_SSL_PROPS_MAP.get(DistributionConfig.SERVER_SSL_KEYSTORE_NAME), config.getServerSSLKeyStore());
- isEqual(SERVER_SSL_PROPS_MAP.get(DistributionConfig.SERVER_SSL_KEYSTORE_TYPE_NAME), config.getServerSSLKeyStoreType());
- isEqual(SERVER_SSL_PROPS_MAP.get(DistributionConfig.SERVER_SSL_KEYSTORE_PASSWORD_NAME), config.getServerSSLKeyStorePassword());
- isEqual(SERVER_SSL_PROPS_MAP.get(DistributionConfig.SERVER_SSL_TRUSTSTORE_NAME), config.getServerSSLTrustStore());
- isEqual(SERVER_SSL_PROPS_MAP.get(DistributionConfig.SERVER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getServerSSLTrustStorePassword());
+ isEqual(SERVER_SSL_PROPS_MAP.get(SERVER_SSL_KEYSTORE), config.getServerSSLKeyStore());
+ isEqual(SERVER_SSL_PROPS_MAP.get(SERVER_SSL_KEYSTORE_TYPE), config.getServerSSLKeyStoreType());
+ isEqual(SERVER_SSL_PROPS_MAP.get(SERVER_SSL_KEYSTORE_PASSWORD), config.getServerSSLKeyStorePassword());
+ isEqual(SERVER_SSL_PROPS_MAP.get(SERVER_SSL_TRUSTSTORE), config.getServerSSLTrustStore());
+ isEqual(SERVER_SSL_PROPS_MAP.get(SERVER_SSL_TRUSTSTORE_PASSWORD), config.getServerSSLTrustStorePassword());
}
@Test
@@ -723,15 +722,15 @@ public class SSLConfigJUnitTest {
boolean gatewaySslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- 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);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(gatewaySslRequireAuth));
+ gemFireProps.put(GATEWAY_SSL_ENABLED, String.valueOf(gatewaySslenabled));
+ gemFireProps.put(GATEWAY_SSL_PROTOCOLS, gatewaySslprotocols);
+ gemFireProps.put(GATEWAY_SSL_CIPHERS, gatewaySslciphers);
+ gemFireProps.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, String.valueOf(gatewaySslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforGateway(false));
@@ -746,11 +745,11 @@ public class SSLConfigJUnitTest {
isEqual( config.getGatewaySSLCiphers(), gatewaySslciphers );
isEqual( config.getGatewaySSLRequireAuthentication(), gatewaySslRequireAuth );
- isEqual(GATEWAY_SSL_PROPS_MAP.get(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME), config.getGatewaySSLKeyStore());
- isEqual(GATEWAY_SSL_PROPS_MAP.get(DistributionConfig.GATEWAY_SSL_KEYSTORE_TYPE_NAME), config.getGatewaySSLKeyStoreType());
- isEqual(GATEWAY_SSL_PROPS_MAP.get(DistributionConfig.GATEWAY_SSL_KEYSTORE_PASSWORD_NAME), config.getGatewaySSLKeyStorePassword());
- isEqual(GATEWAY_SSL_PROPS_MAP.get(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME), config.getGatewaySSLTrustStore());
- isEqual(GATEWAY_SSL_PROPS_MAP.get(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME), config.getGatewaySSLTrustStorePassword());
+ isEqual(GATEWAY_SSL_PROPS_MAP.get(GATEWAY_SSL_KEYSTORE), config.getGatewaySSLKeyStore());
+ isEqual(GATEWAY_SSL_PROPS_MAP.get(GATEWAY_SSL_KEYSTORE_TYPE), config.getGatewaySSLKeyStoreType());
+ isEqual(GATEWAY_SSL_PROPS_MAP.get(GATEWAY_SSL_KEYSTORE_PASSWORD), config.getGatewaySSLKeyStorePassword());
+ isEqual(GATEWAY_SSL_PROPS_MAP.get(GATEWAY_SSL_TRUSTSTORE), config.getGatewaySSLTrustStore());
+ isEqual(GATEWAY_SSL_PROPS_MAP.get(GATEWAY_SSL_TRUSTSTORE_PASSWORD), config.getGatewaySSLTrustStorePassword());
}
@@ -767,15 +766,15 @@ public class SSLConfigJUnitTest {
boolean jmxManagerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_ENABLED_NAME, String.valueOf(jmxManagerSslenabled));
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_PROTOCOLS_NAME, jmxManagerSslprotocols);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_CIPHERS_NAME, jmxManagerSslciphers);
- gemFireProps.put(DistributionConfig.JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(jmxManagerSslRequireAuth));
+ gemFireProps.put(JMX_MANAGER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
+ gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
+ gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
+ gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesJMX(true /*partialJmxSslConfigOverride*/));
@@ -790,17 +789,17 @@ public class SSLConfigJUnitTest {
isEqual( config.getJmxManagerSSLCiphers(), jmxManagerSslciphers );
isEqual( config.getJmxManagerSSLRequireAuthentication(), jmxManagerSslRequireAuth );
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
-
- isEqual(JMX_SSL_PROPS_SUBSET_MAP.get(DistributionConfig.JMX_MANAGER_SSL_KEYSTORE_NAME), config.getJmxManagerSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getJmxManagerSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getJmxManagerSSLKeyStorePassword());
- isEqual(JMX_SSL_PROPS_SUBSET_MAP.get(DistributionConfig.JMX_MANAGER_SSL_TRUSTSTORE_NAME), config.getJmxManagerSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getJmxManagerSSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
+
+ isEqual(JMX_SSL_PROPS_SUBSET_MAP.get(JMX_MANAGER_SSL_KEYSTORE), config.getJmxManagerSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getJmxManagerSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getJmxManagerSSLKeyStorePassword());
+ isEqual(JMX_SSL_PROPS_SUBSET_MAP.get(JMX_MANAGER_SSL_TRUSTSTORE), config.getJmxManagerSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getJmxManagerSSLTrustStorePassword());
}
@@ -817,15 +816,15 @@ public class SSLConfigJUnitTest {
boolean cacheServerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.SERVER_SSL_ENABLED_NAME, String.valueOf(cacheServerSslenabled));
- gemFireProps.put(DistributionConfig.SERVER_SSL_PROTOCOLS_NAME, cacheServerSslprotocols);
- gemFireProps.put(DistributionConfig.SERVER_SSL_CIPHERS_NAME, cacheServerSslciphers);
- gemFireProps.put(DistributionConfig.SERVER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(cacheServerSslRequireAuth));
+ gemFireProps.put(SERVER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
+ gemFireProps.put(SERVER_SSL_PROTOCOLS, cacheServerSslprotocols);
+ gemFireProps.put(SERVER_SSL_CIPHERS, cacheServerSslciphers);
+ gemFireProps.put(SERVER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforCS(true));
@@ -840,17 +839,17 @@ public class SSLConfigJUnitTest {
isEqual( config.getServerSSLCiphers(), cacheServerSslciphers );
isEqual( config.getServerSSLRequireAuthentication(), cacheServerSslRequireAuth );
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
-
- isEqual(SERVER_PROPS_SUBSET_MAP.get(DistributionConfig.SERVER_SSL_KEYSTORE_NAME), config.getServerSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getServerSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getServerSSLKeyStorePassword());
- isEqual(SERVER_PROPS_SUBSET_MAP.get(DistributionConfig.SERVER_SSL_TRUSTSTORE_NAME), config.getServerSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getServerSSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
+
+ isEqual(SERVER_PROPS_SUBSET_MAP.get(SERVER_SSL_KEYSTORE), config.getServerSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getServerSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getServerSSLKeyStorePassword());
+ isEqual(SERVER_PROPS_SUBSET_MAP.get(SERVER_SSL_TRUSTSTORE), config.getServerSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getServerSSLTrustStorePassword());
}
@Test
@@ -866,15 +865,15 @@ public class SSLConfigJUnitTest {
boolean gatewaySslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- 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);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(gatewaySslRequireAuth));
+ gemFireProps.put(GATEWAY_SSL_ENABLED, String.valueOf(gatewaySslenabled));
+ gemFireProps.put(GATEWAY_SSL_PROTOCOLS, gatewaySslprotocols);
+ gemFireProps.put(GATEWAY_SSL_CIPHERS, gatewaySslciphers);
+ gemFireProps.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, String.valueOf(gatewaySslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforGateway(true));
@@ -889,17 +888,17 @@ public class SSLConfigJUnitTest {
isEqual( config.getGatewaySSLCiphers(), gatewaySslciphers );
isEqual( config.getGatewaySSLRequireAuthentication(), gatewaySslRequireAuth );
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
- isEqual(GATEWAY_PROPS_SUBSET_MAP.get(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME), config.getGatewaySSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getGatewaySSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getGatewaySSLKeyStorePassword());
- isEqual(GATEWAY_PROPS_SUBSET_MAP.get(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME), config.getGatewaySSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getGatewaySSLTrustStorePassword());
+ isEqual(GATEWAY_PROPS_SUBSET_MAP.get(GATEWAY_SSL_KEYSTORE), config.getGatewaySSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getGatewaySSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getGatewaySSLKeyStorePassword());
+ isEqual(GATEWAY_PROPS_SUBSET_MAP.get(GATEWAY_SSL_TRUSTSTORE), config.getGatewaySSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getGatewaySSLTrustStorePassword());
}
@@ -917,10 +916,10 @@ public class SSLConfigJUnitTest {
Properties gemFireProps = new Properties();
gemFireProps.put(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforCS(true));
@@ -942,17 +941,17 @@ public class SSLConfigJUnitTest {
System.out.println(config.toLoggerString());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
-
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getServerSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getServerSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getServerSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getServerSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getServerSSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
+
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getServerSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getServerSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getServerSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getServerSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getServerSSLTrustStorePassword());
}
@@ -970,15 +969,15 @@ public class SSLConfigJUnitTest {
Properties gemFireProps = new Properties();
gemFireProps.put(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.SERVER_SSL_ENABLED_NAME, String.valueOf(cacheServerSslenabled));
- gemFireProps.put(DistributionConfig.SERVER_SSL_PROTOCOLS_NAME, cacheServerSslprotocols);
- gemFireProps.put(DistributionConfig.SERVER_SSL_CIPHERS_NAME, cacheServerSslciphers);
- gemFireProps.put(DistributionConfig.SERVER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(cacheServerSslRequireAuth));
+ gemFireProps.put(SERVER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
+ gemFireProps.put(SERVER_SSL_PROTOCOLS, cacheServerSslprotocols);
+ gemFireProps.put(SERVER_SSL_CIPHERS, cacheServerSslciphers);
+ gemFireProps.put(SERVER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforCS(true));
@@ -1000,17 +999,17 @@ public class SSLConfigJUnitTest {
System.out.println(config.toLoggerString());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
-
- isEqual(SERVER_PROPS_SUBSET_MAP.get(DistributionConfig.SERVER_SSL_KEYSTORE_NAME), config.getServerSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getServerSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getServerSSLKeyStorePassword());
- isEqual(SERVER_PROPS_SUBSET_MAP.get(DistributionConfig.SERVER_SSL_TRUSTSTORE_NAME), config.getServerSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getServerSSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
+
+ isEqual(SERVER_PROPS_SUBSET_MAP.get(SERVER_SSL_KEYSTORE), config.getServerSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getServerSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getServerSSLKeyStorePassword());
+ isEqual(SERVER_PROPS_SUBSET_MAP.get(SERVER_SSL_TRUSTSTORE), config.getServerSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getServerSSLTrustStorePassword());
}
@Test
@@ -1027,10 +1026,10 @@ public class SSLConfigJUnitTest {
Properties gemFireProps = new Properties();
gemFireProps.put(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforGateway(true));
@@ -1052,17 +1051,17 @@ public class SSLConfigJUnitTest {
System.out.println(config.toLoggerString());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
-
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getGatewaySSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getGatewaySSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getGatewaySSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getGatewaySSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getGatewaySSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
+
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getGatewaySSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getGatewaySSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getGatewaySSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getGatewaySSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getGatewaySSLTrustStorePassword());
}
@@ -1080,15 +1079,15 @@ public class SSLConfigJUnitTest {
Properties gemFireProps = new Properties();
gemFireProps.put(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewayServerSslenabled));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewayServerSslprotocols);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewayServerSslciphers);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(gatewayServerSslRequireAuth));
+ gemFireProps.put(GATEWAY_SSL_ENABLED, String.valueOf(gatewayServerSslenabled));
+ gemFireProps.put(GATEWAY_SSL_PROTOCOLS, gatewayServerSslprotocols);
+ gemFireProps.put(GATEWAY_SSL_CIPHERS, gatewayServerSslciphers);
+ gemFireProps.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, String.valueOf(gatewayServerSslRequireAuth));
gemFireProps.putAll(getGfSecurityPropertiesforGateway(true));
@@ -1105,17 +1104,17 @@ public class SSLConfigJUnitTest {
System.out.println(config.toLoggerString());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
-
- isEqual(GATEWAY_PROPS_SUBSET_MAP.get(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME), config.getGatewaySSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getGatewaySSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getGatewaySSLKeyStorePassword());
- isEqual(GATEWAY_PROPS_SUBSET_MAP.get(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME), config.getGatewaySSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getGatewaySSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
+
+ isEqual(GATEWAY_PROPS_SUBSET_MAP.get(GATEWAY_SSL_KEYSTORE), config.getGatewaySSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getGatewaySSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getGatewaySSLKeyStorePassword());
+ isEqual(GATEWAY_PROPS_SUBSET_MAP.get(GATEWAY_SSL_TRUSTSTORE), config.getGatewaySSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getGatewaySSLTrustStorePassword());
}
@@ -1133,10 +1132,10 @@ public class SSLConfigJUnitTest {
Properties gemFireProps = new Properties();
gemFireProps.put(MCAST_PORT, "0");
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, String.valueOf(sslenabled));
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, sslprotocols);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_CIPHERS_NAME, sslciphers);
- gemFireProps.put(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(requireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
gemFireProps.putAll(getGfSecurityPropertiesJMX(true));
@@ -1158,17 +1157,17 @@ public class SSLConfigJUnitTest {
System.out.println(config.toLoggerString());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getClusterSSLTrustStorePassword());
-
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME), config.getJmxManagerSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME), config.getJmxManagerSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME), config.getJmxManagerSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME), config.getJmxManagerSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME), config.getJmxManagerSSLTrustStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
+
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getJmxManagerSSLKeyStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getJmxManagerSSLKeyStoreType());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getJmxManagerSSLKeyStorePassword());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getJmxManagerSSLTrustStore());
+ isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getJmxManagerSSLTrustStorePassword());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
index 197c28b..704b7d5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.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.internal.FileUtil;
import com.gemstone.gemfire.internal.cache.persistence.BackupManager;
import com.gemstone.gemfire.internal.cache.persistence.RestoreScript;
@@ -33,8 +32,7 @@ import java.net.URISyntaxException;
import java.net.URL;
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.*;
/**
@@ -44,7 +42,7 @@ import static org.junit.Assert.*;
public class BackupJUnitTest {
protected static GemFireCacheImpl cache = null;
protected static File TMP_DIR;
- protected static File CACHE_XML_FILE;
+ protected static File cacheXmlFile;
protected static DistributedSystem ds = null;
protected static Properties props = new Properties();
@@ -69,12 +67,12 @@ public class BackupJUnitTest {
TMP_DIR = tmpDirName == null ? new File("") : new File(tmpDirName);
try {
URL url = BackupJUnitTest.class.getResource("BackupJUnitTest.cache.xml");
- CACHE_XML_FILE = new File(url.toURI().getPath());
+ cacheXmlFile = new File(url.toURI().getPath());
} catch (URISyntaxException e) {
throw new ExceptionInInitializerError(e);
}
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, CACHE_XML_FILE.getAbsolutePath());
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
+ props.setProperty(CACHE_XML_FILE, cacheXmlFile.getAbsolutePath());
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
}
createCache();
@@ -303,7 +301,7 @@ public class BackupJUnitTest {
backup.finishBackup(backupDir, null, false);
File cacheXmlBackup = FileUtil.find(backupDir, ".*config.cache.xml");
assertTrue(cacheXmlBackup.exists());
- byte[] expectedBytes = getBytes(CACHE_XML_FILE);
+ byte[] expectedBytes = getBytes(cacheXmlFile);
byte[] backupBytes = getBytes(cacheXmlBackup);
assertEquals(expectedBytes.length, backupBytes.length);
for(int i = 0; i < expectedBytes.length; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
index ef4e6be..dd84a72 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.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.internal.Assert;
import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
@@ -30,8 +29,7 @@ import org.junit.experimental.categories.Category;
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.*;
import static org.junit.Assert.*;
/**
@@ -57,7 +55,7 @@ public class Bug37244JUnitTest
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // to keep diskPerf logs smaller
+ props.setProperty(LOG_LEVEL, "info"); // to keep diskPerf logs smaller
distributedSystem = DistributedSystem.connect(props);
cache = CacheFactory.create(distributedSystem);
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
index 8432b69..fd76e65 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
@@ -36,8 +36,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
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.*;
/**
*
@@ -94,7 +93,7 @@ public class Bug41091DUnitTest extends CacheTestCase {
});
Properties props = new Properties();
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
props.setProperty(LOCATORS, NetworkUtils.getServerHostName(host) + "[" + locatorPort + "]");
getSystem(props);
@@ -114,7 +113,7 @@ public class Bug41091DUnitTest extends CacheTestCase {
public void run() {
Properties props = new Properties();
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
props.setProperty(LOCATORS, NetworkUtils.getServerHostName(host) + "[" + locatorPort + "]");
getSystem(props);
Cache cache = getCache();
@@ -149,9 +148,9 @@ public class Bug41091DUnitTest extends CacheTestCase {
disconnectFromDS();
Properties props = new Properties();
props.setProperty(MCAST_PORT, String.valueOf(0));
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
try {
File logFile = new File(testName + "-locator" + locatorPort
+ ".log");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
index 451df52..a1f8c07 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.util.DelayedAction;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -27,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class Bug45934DUnitTest extends CacheTestCase {
public Bug45934DUnitTest(String name) {
@@ -46,7 +45,7 @@ public class Bug45934DUnitTest extends CacheTestCase {
// 1. create the local cache
CacheFactory cf = new CacheFactory();
cf.set(MCAST_PORT, "45934");
- cf.set(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ cf.set(CONSERVE_SOCKETS, "false");
Cache cache = getCache(cf);
// 2. create normal region locally
@@ -84,7 +83,7 @@ public class Bug45934DUnitTest extends CacheTestCase {
public Object call() throws Exception {
CacheFactory cf = new CacheFactory();
cf.set(MCAST_PORT, "45934");
- cf.set(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ cf.set(CONSERVE_SOCKETS, "false");
getCache(cf).<Integer, Integer> createRegionFactory(RegionShortcut.REPLICATE_PERSISTENT)
.create(name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index 5881066..2e5d0aa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -24,7 +24,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.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.tier.InterestType;
import com.gemstone.gemfire.test.dunit.*;
@@ -34,6 +33,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* This tests the fix for bug #43407 under a variety of configurations and
* also tests that tombstones are treated in a similar manner. The ticket
@@ -181,7 +182,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating client cache");
ClientCache c = new ClientCacheFactory()
.addPoolServer("localhost", serverPort)
- .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel())
+ .set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel())
.create();
Region myRegion = c.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(regionName);;
if (useTX) {
@@ -299,7 +300,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating client cache");
ClientCache c = new ClientCacheFactory()
.addPoolServer("localhost", serverPort)
- .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel())
+ .set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel())
.create();
Region myRegion = c.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(regionName);;
if (useTX) {
@@ -421,7 +422,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating client cache");
ClientCache c = new ClientCacheFactory()
.addPoolServer("localhost", serverPort)
- .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel())
+ .set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel())
.setPoolSubscriptionEnabled(true)
.create();
[38/55] [abbrv] incubator-geode git commit: Geode-11: Exception
thrown when attempting to create lucene index on region with eviction
Posted by hi...@apache.org.
Geode-11: Exception thrown when attempting to create lucene index on region with eviction
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a3a721a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a3a721a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a3a721a1
Branch: refs/heads/feature/GEODE-1372
Commit: a3a721a18c6f510470de84db6ca980c303c8250a
Parents: 1aa3917
Author: Jason Huynh <hu...@gmail.com>
Authored: Wed Jun 1 10:44:32 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Thu Jun 2 10:50:46 2016 -0700
----------------------------------------------------------------------
.../lucene/internal/LuceneServiceImpl.java | 11 +++++++++
.../LuceneIndexCreationIntegrationTest.java | 24 ++++++++++----------
2 files changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a3a721a1/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index f9bb8ba..67edc6d 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -28,6 +28,8 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.EvictionAlgorithm;
+import com.gemstone.gemfire.cache.EvictionAttributes;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.execute.FunctionService;
@@ -181,6 +183,15 @@ public class LuceneServiceImpl implements InternalLuceneService {
regionPath = dataregion.getFullPath();
LuceneIndexImpl index = null;
+
+ //For now we cannot support eviction with local destroy.
+ //Eviction with overflow to disk still needs to be supported
+ EvictionAttributes evictionAttributes = dataregion.getAttributes().getEvictionAttributes();
+ EvictionAlgorithm evictionAlgorithm = evictionAttributes.getAlgorithm();
+ if (evictionAlgorithm != EvictionAlgorithm.NONE && evictionAttributes.getAction().isLocalDestroy()) {
+ throw new UnsupportedOperationException("Lucene indexes on regions with eviction and action local destroy are not supported");
+ }
+
if (dataregion instanceof PartitionedRegion) {
// partitioned region
index = new LuceneIndexForPartitionedRegion(indexName, regionPath, cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a3a721a1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
index d1cd8ac..dc08f69 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
@@ -33,11 +33,13 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
+import com.gemstone.gemfire.cache.EvictionAction;
import com.gemstone.gemfire.cache.EvictionAttributes;
import com.gemstone.gemfire.cache.ExpirationAttributes;
import com.gemstone.gemfire.cache.FixedPartitionAttributes;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities;
import com.gemstone.gemfire.cache.lucene.test.TestObject;
@@ -109,18 +111,6 @@ public class LuceneIndexCreationIntegrationTest extends LuceneIntegrationTest {
}
@Test
- public void shouldNotUseEvictionForInternalRegionsWhenUserRegionHasEviction() {
- createIndex("text");
- cache.createRegionFactory(RegionShortcut.PARTITION)
- .setEvictionAttributes(EvictionAttributes.createLRUEntryAttributes(1))
- .create(REGION_NAME);
-
- verifyInternalRegions(region -> {
- assertEquals(true, region.getAttributes().getEvictionAttributes().getAction().isNone());
- });
- }
-
- @Test
public void shouldNotUseIdleTimeoutForInternalRegionsWhenUserRegionHasIdleTimeout() {
createIndex("text");
cache.createRegionFactory(RegionShortcut.PARTITION)
@@ -176,6 +166,16 @@ public class LuceneIndexCreationIntegrationTest extends LuceneIntegrationTest {
this.cache.createRegionFactory(RegionShortcut.REPLICATE).create(REGION_NAME);
}
+ @Test
+ public void cannotCreateLuceneIndexForRegionWithEviction() throws IOException, ParseException {
+ expectedException.expect(UnsupportedOperationException.class);
+ expectedException.expectMessage("Lucene indexes on regions with eviction and action local destroy are not supported");
+ createIndex("field1", "field2", "field3");
+ RegionFactory regionFactory = this.cache.createRegionFactory(RegionShortcut.PARTITION);
+ regionFactory.setEvictionAttributes(EvictionAttributes.createLIFOEntryAttributes(100, EvictionAction.LOCAL_DESTROY));
+ regionFactory.create(REGION_NAME);
+ }
+
private void verifyInternalRegions(Consumer<LocalRegion> verify) {
LuceneTestUtilities.verifyInternalRegions(luceneService, cache, verify);
}
[25/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
new file mode 100644
index 0000000..d80a3e8
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
@@ -0,0 +1,746 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.distributed;
+
+
+public interface DistributedSystemConfigProperties {
+ /**
+ * The static definition of the <a href="DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a>
+ * property
+ */
+ String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a>
+ * property
+ */
+ String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
+ * property
+ */
+ String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
+ * property
+ */
+ String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#async-distribution-timeout">"async-distribution-timeout"</a>
+ * property
+ */
+ String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#async-max-queue-size">"async-max-queue-size"</a>
+ * property
+ */
+ String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#async-queue-timeout">"async-queue-timeout"</a>
+ * property
+ */
+ String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#bind-address">"bind-address"</a>
+ * property
+ */
+ String BIND_ADDRESS = "bind-address";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
+ * property
+ */
+ String CACHE_XML_FILE = "cache-xml-file";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-configuration-dir">"cluster-configuration-dir"</a>
+ * property
+ */
+ String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a>
+ * property
+ */
+ String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
+ * property
+ */
+ String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a>
+ * property
+ */
+ String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a>
+ * property
+ */
+ String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a>
+ * property
+ */
+ String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a>
+ * property
+ */
+ String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a>
+ * property
+ */
+ String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a>
+ * property
+ */
+ String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a>
+ * property
+ */
+ String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#conflate-events">"conflate-events"</a>
+ * property
+ */
+ String CONFLATE_EVENTS = "conflate-events";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
+ * property
+ */
+ String CONSERVE_SOCKETS = "conserve-sockets";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#delta-propagation">"delta-propagation"</a>
+ * property
+ */
+ String DELTA_PROPAGATION = "delta-propagation";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#deploy-working-dir">"deploy-working-dir"</a>
+ * property
+ */
+ String DEPLOY_WORKING_DIR = "deploy-working-dir";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#disable-auto-reconnect">"disable-auto-reconnect"</a>
+ * property
+ */
+ String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#disable-tcp">"disable-tcp"</a>
+ * property
+ */
+ String DISABLE_TCP = "disable-tcp";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#distributed-system-id">"distributed-system-id"</a>
+ * property
+ */
+ String DISTRIBUTED_SYSTEM_ID = "distributed-system-id";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#durable-client-id">"durable-client-id"</a>
+ * property
+ */
+ String DURABLE_CLIENT_ID = "durable-client-id";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#durable-client-timeout">"durable-client-timeout"</a>
+ * property
+ */
+ String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#enable-cluster-configuration">"enable-cluster-configuration"</a>
+ * property
+ */
+ String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#enable-network-partition-detection">"enable-network-partition-detection"</a>
+ * property
+ */
+ String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#enable-time-statistics">"enable-time-statistics"</a>
+ * property
+ */
+ String ENABLE_TIME_STATISTICS = "enable-time-statistics";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#enforce-unique-host">"enforce-unique-host"</a>
+ * property
+ */
+ String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-ciphers">"gateway-ssl-ciphers"</a>
+ * property
+ */
+ String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-enabled">"gateway-ssl-enabled"</a>
+ * property
+ */
+ String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore">"gateway-ssl-keystore"</a>
+ * property
+ */
+ String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-password">"gateway-ssl-keystore-password"</a>
+ * property
+ */
+ String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-type">"gateway-ssl-keystore-type"</a>
+ * property
+ */
+ String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-protocols">"gateway-ssl-protocols"</a>
+ * property
+ */
+ String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-require-authentication">"gateway-ssl-require-authentication"</a>
+ * property
+ */
+ String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore">"gateway-ssl-truststore"</a>
+ * property
+ */
+ String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore-password">"gateway-ssl-truststore-password"</a>
+ * property
+ */
+ String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#groups">"groups"</a>
+ * property
+ */
+ String GROUPS = "groups";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-bind-address">"http-service-bind-address"</a>
+ * property
+ */
+ String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-port">"http-service-port"</a>
+ * property
+ */
+ String HTTP_SERVICE_PORT = "http-service-port";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-ciphers">"http-service-ssl-ciphers"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-enabled">"http-service-ssl-enabled"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore">"http-service-ssl-keystore"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-password">"http-service-ssl-keystore-password"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-type">"http-service-ssl-keystore-type"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-protocols">"http-service-ssl-protocols"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-require-authentication">"http-service-ssl-require-authentication"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore">"http-service-ssl-truststore"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore-password">"http-service-ssl-truststore-password"</a>
+ * property
+ */
+ String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager">"jmx-manager"</a>
+ * property
+ */
+ String JMX_MANAGER = "jmx-manager";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-access-file">"jmx-manager-access-file"</a>
+ * property
+ */
+ String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-bind-address">"jmx-manager-bind-address"</a>
+ * property
+ */
+ String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-hostname-for-clients">"jmx-manager-hostname-for-clients"</a>
+ * property
+ */
+ String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-http-port">"jmx-manager-http-port"</a>
+ * property
+ *
+ * @deprecated as of GemFire 8.0 use {@link #HTTP_SERVICE_PORT} instead.
+ */
+ String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-password-file">"jmx-manager-password-file"</a>
+ * property
+ */
+ String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-port">"jmx-manager-port"</a>
+ * property
+ */
+ String JMX_MANAGER_PORT = "jmx-manager-port";
+ /**
+ * * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl">"jmx-manager-ssl"</a>
+ * property
+ * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
+ */
+ String JMX_MANAGER_SSL = "jmx-manager-ssl";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-start">"jmx-manager-start"</a>
+ * property
+ */
+ String JMX_MANAGER_START = "jmx-manager-start";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-update-rate">"jmx-manager-update-rate"</a>
+ * property
+ */
+ String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-ciphers">"jmx-manager-ssl-ciphers"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-enabled">"jmx-manager-ssl-enabled"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore">"jmx-manager-ssl-keystore"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-password">"jmx-manager-ssl-keystore-password"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-type">"jmx-manager-ssl-keystore-type"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-protocols">"jmx-manager-ssl-protocols"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-require-authentication">"jmx-manager-ssl-require-authentication"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore">"jmx-manager-ssl-truststore"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore-password">"jmx-manager-ssl-truststore-password"</a>
+ * property
+ */
+ String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
+ String LICENCE_APPLICATION_CACHE = "license-application-cache";
+ String LICENCE_DATA_MANAGEMENT = "license-data-management";
+ String LICENCE_SERVER_TIMEOUT = "license-server-timeout";
+ String LICENCE_WORKING_DIR = "license-working-dir";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#load-cluster-configuration-from-dir">"load-cluster-configuration-from-dir"</a>
+ * property
+ */
+ String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#locator-wait-time">"locator-wait-time"</a>
+ * property
+ */
+ String LOCATOR_WAIT_TIME = "locator-wait-time";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#locators">"locators"</a>
+ * property
+ */
+ String LOCATORS = "locators";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
+ * property
+ */
+ String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#log-file">"log-file"</a>
+ * property
+ */
+ String LOG_FILE = "log-file";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
+ * property
+ */
+ String LOG_FILE_SIZE_LIMIT = "log-file-size-limit";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#log-level">"log-level"</a>
+ * property
+ */
+ String LOG_LEVEL = "log-level";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#max-num-reconnect-tries">"max-num-reconnect-tries"</a>
+ * property
+ */
+ String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#max-wait-time-reconnect">"max-wait-time-reconnect"</a>
+ * property
+ */
+ String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#mcast-address">"mcast-address"</a>
+ * property
+ */
+ String MCAST_ADDRESS = "mcast-address";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a>
+ * property
+ */
+ String MCAST_FLOW_CONTROL = "mcast-flow-control";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#mcast-port">"mcast-port"</a>
+ * property
+ */
+ String MCAST_PORT = "mcast-port";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a>
+ * property
+ */
+ String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a>
+ * property
+ */
+ String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#mcast-ttl">"mcast-ttl"</a>
+ * property
+ */
+ String MCAST_TTL = "mcast-ttl";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#member-timeout">"member-timeout"</a>
+ * property
+ */
+ String MEMBER_TIMEOUT = "member-timeout";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#membership-port-range">"membership-port-range"</a>
+ * property
+ */
+ String MEMBERSHIP_PORT_RANGE = "membership-port-range";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#memcached-bind-address">"memcached-bind-address"</a>
+ * property
+ */
+ String MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#memcached-port">"memcached-port"</a>
+ * property
+ */
+ String MEMCACHED_PORT = "memcached-port";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#memcached-protocol">"memcached-protocol"</a>
+ * property
+ */
+ String MEMCACHED_PROTOCOL = "memcached-protocol";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#name">"name"</a>
+ * property
+ */
+ String NAME = "name";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#redundancy-zone">"redundancy-zone"</a>
+ * property
+ */
+ String REDUNDANCY_ZONE = "redundancy-zone";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#remote-locators">"remote-locators"</a>
+ * property
+ */
+ String REMOTE_LOCATORS = "remote-locators";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#remove-unresponsive-client">"remove-unresponsive-client"</a>
+ * property
+ */
+ String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#roles">"roles"</a>
+ * property
+ */
+ String ROLES = "roles";
+ /**
+ * The static definition of the security prefix "security-" used in conjuntion with other security-* properties</a>
+ * property
+ */
+ String SECURITY_PREFIX = "security-";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-client-accessor">"security-client-accessor"</a>
+ * property
+ */
+ String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-client-accessor-pp">"security-client-accessor-pp"</a>
+ * property
+ */
+ String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-client-auth-init">"security-client-auth-init"</a>
+ * property
+ */
+ String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-client-authenticator">"security-client-authenticator"</a>
+ * property
+ */
+ String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-client-dhalgo">"security-client-dhalgo"</a>
+ * property
+ */
+ String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-log-file">"security-log-file"</a>
+ * property
+ */
+ String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-log-level">"security-log-level"</a>
+ * property
+ */
+ String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-peer-auth-init">"security-peer-auth-init"</a>
+ * property
+ */
+ String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-peer-authenticator">"security-peer-authenticator"</a>
+ * property
+ */
+ String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#security-peer-verifymember-timeout">"security-peer-verifymember-timeout"</a>
+ * property
+ */
+ String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-bind-address">"server-bind-address"</a>
+ * property
+ */
+ String SERVER_BIND_ADDRESS = "server-bind-address";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-ciphers">"server-ssl-ciphers"</a>
+ * property
+ */
+ String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-enabled">"server-ssl-enabled"</a>
+ * property
+ */
+ String SERVER_SSL_ENABLED = "server-ssl-enabled";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore">"server-ssl-keystore"</a>
+ * property
+ */
+ String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-password">"server-ssl-keystore-password"</a>
+ * property
+ */
+ String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-type">"server-ssl-keystore-type"</a>
+ * property
+ */
+ String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-protocols">"server-ssl-protocols"</a>
+ * property
+ */
+ String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-require-authentication">"server-ssl-require-authentication"</a>
+ * property
+ */
+ String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore">"server-ssl-truststore"</a>
+ * property
+ */
+ String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore-password">"server-ssl-truststore-password"</a>
+ * property
+ */
+ String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
+ * property
+ */
+ String SOCKET_BUFFER_SIZE = "socket-buffer-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
+ * property
+ */
+ String SOCKET_LEASE_TIME = "socket-lease-time";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#start-dev-rest-api">"start-dev-rest-api"</a>
+ * property
+ */
+ String START_DEV_REST_API = "start-dev-rest-api";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#start-locator">"start-locator"</a>
+ * property
+ */
+ String START_LOCATOR = "start-locator";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a>
+ * property
+ */
+ String STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
+ * property
+ */
+ String STATISTIC_SAMPLE_RATE = "statistic-sample-rate";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#statistic-sampling-enabled">"statistic-sampling-enabled"</a>
+ * property
+ */
+ String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#tcp-port">"tcp-port"</a>
+ * property
+ */
+ String TCP_PORT = "tcp-port";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a>
+ * property
+ */
+ String UDP_FRAGMENT_SIZE = "udp-fragment-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a>
+ * property
+ */
+ String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a>
+ * property
+ */
+ String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#use-cluster-configuration">"use-cluster-configuration"</a>
+ * property
+ */
+ String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#user-command-packages">"user-command-packages"</a>
+ * property
+ */
+ String USER_COMMAND_PACKAGES = "user-command-packages";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#off-heap-memory-size">"off-heap-memory-size"</a>
+ * property
+ */
+ String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#redis-port">"redis-port"</a>
+ * property
+ */
+ String REDIS_PORT = "redis-port";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#redis-bind-address">"redis-bind-address"</a>
+ * property
+ */
+ String REDIS_BIND_ADDRESS = "redis-bind-address";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#redis-password">"redis-password"</a>
+ * property
+ */
+ String REDIS_PASSWORD = "redis-password";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#lock-memory">"lock-memory"</a>
+ * property
+ */
+ String LOCK_MEMORY = "lock-memory";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#shiro-init">"shiro-init"</a>
+ * property
+ */
+ String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#distributed-transactions">"distributed-transactions"</a>
+ * property
+ */
+ String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
+ * property
+ *
+ * @deprecated as of Gemfire 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
+ */
+ String SSL_ENABLED = "ssl-enabled";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#ssl-protocols">"ssl-protocols"</a>
+ * property
+ *
+ * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
+ */
+ String SSL_PROTOCOLS = "ssl-protocols";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#ssl-ciphers">"ssl-ciphers"</a>
+ * property
+ *
+ * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
+ */
+ String SSL_CIPHERS = "ssl-ciphers";
+ /**
+ * The static definition of the <a href="DistributedSystem.html#ssl-require-authentication">"ssl-require-authentication"</a>
+ * property
+ *
+ * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
+ */
+ String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index f759886..22814a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.distributed;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index f19ce09..e4fe16c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.distributed;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.Cache;
@@ -60,7 +60,7 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SERVER_BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SERVER_BIND_ADDRESS;
/**
* The ServerLauncher class is a launcher class with main method to start a GemFire Server (implying a GemFire Cache
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
deleted file mode 100644
index b4526fa..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.distributed;
-
-
-public interface SystemConfigurationProperties {
- String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
- String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
- String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit";
- String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit";
- String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout";
- String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size";
- String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout";
- String BIND_ADDRESS = "bind-address";
- String CACHE_XML_FILE = "cache-xml-file";
- String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
- String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
- String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
- String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
- String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
- String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
- String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
- String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
- String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
- String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
- String CONFLATE_EVENTS = "conflate-events";
- String CONSERVE_SOCKETS = "conserve-sockets";
- String DELTA_PROPAGATION = "delta-propagation";
- String DEPLOY_WORKING_DIR = "deploy-working-dir";
- String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect";
- String DISABLE_TCP = "disable-tcp";
- String DISTRIBUTED_SYSTEM_ID = "distributed-system-id";
- String DURABLE_CLIENT_ID = "durable-client-id";
- String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout";
- String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
- String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
- String ENABLE_TIME_STATISTICS = "enable-time-statistics";
- String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
- String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
- String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
- String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
- String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
- String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
- String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
- String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
- String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
- String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
- String GROUPS = "groups";
- String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address";
- String HTTP_SERVICE_PORT = "http-service-port";
- String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
- String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
- String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
- String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
- String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
- String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
- String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
- String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
- String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
- String JMX_MANAGER = "jmx-manager";
- String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file";
- String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address";
- String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients";
-
- /**
- * The name of the "jmx-manager-http-port" property.
- *
- * @deprecated as of 8.0 use {@link #HTTP_SERVICE_PORT} instead.
- */
- String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
- String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file";
- String JMX_MANAGER_PORT = "jmx-manager-port";
-
- /**
- * @deprecated as of 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
- */
- String JMX_MANAGER_SSL = "jmx-manager-ssl";
- String JMX_MANAGER_START = "jmx-manager-start";
- String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
- String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
- String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
- String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
- String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
- String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
- String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
- String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
- String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
- String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
- String LICENCE_APPLICATION_CACHE = "license-application-cache";
- String LICENCE_DATA_MANAGEMENT = "license-data-management";
- String LICENCE_SERVER_TIMEOUT = "license-server-timeout";
- String LICENCE_WORKING_DIR = "license-working-dir";
- String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir";
- String LOCATOR_WAIT_TIME = "locator-wait-time";
- String LOCATORS = "locators";
- String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit";
- String LOG_FILE = "log-file";
- String LOG_FILE_SIZE_LIMIT = "log-file-size-limit";
- String LOG_LEVEL = "log-level";
- String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
- String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect";
- String MCAST_ADDRESS = "mcast-address";
- String MCAST_FLOW_CONTROL = "mcast-flow-control";
- String MCAST_PORT = "mcast-port";
- String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size";
- String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size";
- String MCAST_TTL = "mcast-ttl";
- String MEMBER_TIMEOUT = "member-timeout";
- String MEMBERSHIP_PORT_RANGE = "membership-port-range";
- String MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
- String MEMCACHED_PORT = "memcached-port";
- String MEMCACHED_PROTOCOL = "memcached-protocol";
-
- /**
- * The "name" property, representing the system's name
- */
- String NAME = "name";
- String REDUNDANCY_ZONE = "redundancy-zone";
- String REMOTE_LOCATORS = "remote-locators";
- String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client";
- String ROLES = "roles";
- String SECURITY_PREFIX = "security-";
- String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
- String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
- String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
- String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
- String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo";
- String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file";
- String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
- String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
- String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
- String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout";
- String SERVER_BIND_ADDRESS = "server-bind-address";
- String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
- String SERVER_SSL_ENABLED = "server-ssl-enabled";
- String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
- String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
- String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
- String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
- String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
- String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
- String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
- String SOCKET_BUFFER_SIZE = "socket-buffer-size";
- String SOCKET_LEASE_TIME = "socket-lease-time";
- String START_DEV_REST_API = "start-dev-rest-api";
- String START_LOCATOR = "start-locator";
- String STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
- String STATISTIC_SAMPLE_RATE = "statistic-sample-rate";
- String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled";
- String TCP_PORT = "tcp-port";
- String UDP_FRAGMENT_SIZE = "udp-fragment-size";
- String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size";
- String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size";
- String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
- String USER_COMMAND_PACKAGES = "user-command-packages";
- String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
-
- String REDIS_PORT = "redis-port";
- String REDIS_BIND_ADDRESS = "redis-bind-address";
- String REDIS_PASSWORD = "redis-password";
- String LOCK_MEMORY = "lock-memory";
- String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
- String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
-
- /**
- * Returns the value of the <a
- * href="../DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
- * property.
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
- */
- String SSL_ENABLED = "ssl-enabled";
-
- /**
- * The name of the "SSLProtocols" property
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
- */
- String SSL_PROTOCOLS = "ssl-protocols";
-
- /**
- * The name of the "SSLCiphers" property
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
- */
- String SSL_CIPHERS = "ssl-ciphers";
-
- /**
- * The name of the "SSLRequireAuthentication" property
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
- */
- String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 4212bb3..f529196 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.distributed.internal;
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.InvalidValueException;
import com.gemstone.gemfire.UnmodifiableException;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.AbstractConfig;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.internal.SocketCreator;
@@ -688,7 +687,7 @@ public abstract class AbstractDistributionConfig
LocalizedStrings.AbstractDistributionConfig_ENABLE_TIME_STATISTICS_NAME
.toLocalizedString());
- m.put(SystemConfigurationProperties.DEPLOY_WORKING_DIR,
+ m.put(DEPLOY_WORKING_DIR,
LocalizedStrings.AbstractDistributionConfig_DEPLOY_WORKING_DIR_0
.toLocalizedString(DEFAULT_DEPLOY_WORKING_DIR));
@@ -996,7 +995,7 @@ public abstract class AbstractDistributionConfig
m.put(GROUPS, "A comma separated list of all the groups this member belongs to." +
" Defaults to \"\".");
- m.put(SystemConfigurationProperties.USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
+ m.put(USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
m.put(JMX_MANAGER, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
m.put(JMX_MANAGER_START, "If true then the jmx manager will be started when the cache is created. Defaults to false.");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 9a900ca..fee905c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -18,7 +18,7 @@
package com.gemstone.gemfire.distributed.internal;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.Config;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
@@ -48,7 +48,7 @@ import java.util.*;
*
* @since GemFire 2.1
*/
-public interface DistributionConfig extends Config, LogConfig, SystemConfigurationProperties {
+public interface DistributionConfig extends Config, LogConfig, DistributedSystemConfigProperties {
//////////////////// Instance Methods ////////////////////
@@ -107,7 +107,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
void setMcastPort(int value);
/**
- * The default value of the "mcastPort" property
+ * The default value of the "mcast-port" property
*/
int DEFAULT_MCAST_PORT = 0;
@@ -124,7 +124,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
int MAX_MCAST_PORT = 65535;
/**
- * The name of the "mcastPort" property
+ * The name of the "mcast-port" property
*/
@ConfigAttribute(type = Integer.class, min = MIN_MCAST_PORT, max = MAX_MCAST_PORT)
String MCAST_PORT_NAME = MCAST_PORT;
@@ -389,7 +389,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* The name of the "deploy-working-dir" property.
*/
@ConfigAttribute(type = File.class)
- String DEPLOY_WORKING_DIR_NAME = SystemConfigurationProperties.DEPLOY_WORKING_DIR;
+ String DEPLOY_WORKING_DIR_NAME = DEPLOY_WORKING_DIR;
/**
* Default will be the current working directory as determined by
@@ -419,7 +419,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
* The name of the "user-command-packages" property.
*/
@ConfigAttribute(type = String.class)
- String USER_COMMAND_PACKAGES_NAME = SystemConfigurationProperties.USER_COMMAND_PACKAGES;
+ String USER_COMMAND_PACKAGES_NAME = USER_COMMAND_PACKAGES;
/**
* The default value of the "user-command-packages" property
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index e8e4f3b..3288e98 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -20,7 +20,6 @@ package com.gemstone.gemfire.distributed.internal;
import com.gemstone.gemfire.GemFireConfigException;
import com.gemstone.gemfire.GemFireIOException;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.internal.SocketCreator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
@@ -1141,7 +1140,7 @@ public class DistributionConfigImpl
// a no-op since multicast discovery has been removed
// and the default mcast port is now zero
- // ConfigSource cs = getAttSourceMap().get(SystemConfigurationProperties.MCAST_PORT);
+ // ConfigSource cs = getAttSourceMap().get(DistributedSystemConfigProperties.MCAST_PORT);
// if (cs == null) {
// String locators = getLocators();
// if (locators != null && !locators.isEmpty()) {
@@ -1557,7 +1556,7 @@ public class DistributionConfigImpl
}
public void setUserCommandPackages(String value) {
- this.userCommandPackages = (String)checkAttribute(SystemConfigurationProperties.USER_COMMAND_PACKAGES, value);
+ this.userCommandPackages = (String)checkAttribute(USER_COMMAND_PACKAGES, value);
}
public boolean getDeltaPropagation() {
@@ -1629,7 +1628,7 @@ public class DistributionConfigImpl
}
public void setDeployWorkingDir(File value) {
- this.deployWorkingDir = (File)checkAttribute(SystemConfigurationProperties.DEPLOY_WORKING_DIR, value);
+ this.deployWorkingDir = (File)checkAttribute(DEPLOY_WORKING_DIR, value);
}
public void setLogFile(File value) {
this.logFile = (File)checkAttribute(LOG_FILE, value);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 9439fbb..9d49b49 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -73,8 +73,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* The concrete implementation of {@link DistributedSystem} that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 8b9b307..483778d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -71,7 +71,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Provides the implementation of a distribution <code>Locator</code>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
index 8970fda..2102893 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
/**
* This class maintains statistics for the locator
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index 3493a87..d8d26b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -83,7 +83,7 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon
import com.gemstone.gemfire.management.internal.configuration.utils.XmlUtils;
import com.gemstone.gemfire.management.internal.configuration.utils.ZipUtils;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@SuppressWarnings({ "deprecation", "unchecked" })
public class SharedConfiguration {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
index 6fca8b7..9af29ec 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.distributed.internal.membership.gms.auth;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.distributed.internal.membership.NetView;
@@ -38,6 +37,7 @@ import java.util.Properties;
import java.util.Set;
import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
// static messages
@@ -113,7 +113,7 @@ public class GMSAuthenticator implements Authenticator {
*/
String authenticate(DistributedMember member, Object credentials, Properties secProps, DistributedMember localMember) throws AuthenticationFailedException {
- String authMethod = secProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTHENTICATOR);
+ String authMethod = secProps.getProperty(SECURITY_PEER_AUTHENTICATOR);
if (authMethod == null || authMethod.length() == 0) {
return null;
}
@@ -180,7 +180,7 @@ public class GMSAuthenticator implements Authenticator {
return getCredentials(member, securityProps);
} catch (Exception e) {
- String authMethod = securityProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT);
+ String authMethod = securityProps.getProperty(SECURITY_PEER_AUTH_INIT);
services.getSecurityLogWriter().warning(LocalizedStrings.AUTH_FAILED_TO_OBTAIN_CREDENTIALS_IN_0_USING_AUTHINITIALIZE_1_2, new Object[] { authMethod, e.getLocalizedMessage() });
return null;
}
@@ -191,7 +191,7 @@ public class GMSAuthenticator implements Authenticator {
*/
Properties getCredentials(DistributedMember member, Properties secProps) {
Properties credentials = null;
- String authMethod = secProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT);
+ String authMethod = secProps.getProperty(SECURITY_PEER_AUTH_INIT);
try {
if (authMethod != null && authMethod.length() > 0) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index d618dce..910ba2c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -46,8 +46,8 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
import static com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL;
import static com.gemstone.gemfire.internal.DataSerializableFixedID.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index dae240f..5d455ec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -29,7 +29,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Provides an implementation of the {@link Config} interface
* that implements functionality that all {@link Config} implementations
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
index cd35e53..33d3765 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
@@ -33,8 +33,8 @@ import java.net.Socket;
import java.net.SocketAddress;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* MigrationClient is used to retrieve all of the data for a region from
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
index a611d39..cf5eea0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.admin.internal.InetAddressUtil;
import com.gemstone.gemfire.cache.Cache;
@@ -34,8 +34,8 @@ import java.util.Enumeration;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* MigrationServer creates a cache using a supplied cache.xml and then
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
index 8f1ad81..7cb7df1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.*;
import com.gemstone.gemfire.admin.AdminException;
@@ -47,7 +47,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
/**
* Provides static methods for various system administation tasks.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
index 213653e..17fbf94 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.admin;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import java.util.Iterator;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
index 06b5721..8421c9a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tranport config for RemoteGfManagerAgent.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
index 4bf8fea..bb595d1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -43,8 +43,8 @@ import java.net.URL;
import java.util.*;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_FILE;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SERVER_BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOG_FILE;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SERVER_BIND_ADDRESS;
/**
* Launcher program to start a cache server.
@@ -263,7 +263,7 @@ public class CacheServerLauncher {
"critical-off-heap-percentage";
public static final String EVICTION_OFF_HEAP_PERCENTAGE =
"eviction-off-heap-percentage";
- protected static final String LOCK_MEMORY = SystemConfigurationProperties.LOCK_MEMORY;
+ protected static final String LOCK_MEMORY = DistributedSystemConfigProperties.LOCK_MEMORY;
protected final File processDirOption(final Map<String, Object> options, final String dirValue) throws FileNotFoundException {
final File inputWorkingDirectory = new File(dirValue);
@@ -1197,7 +1197,7 @@ public class CacheServerLauncher {
/**
* Reads {@link DistributedSystem#PROPERTY_FILE} and determines if the
- * {@link SystemConfigurationProperties#LOG_FILE} property is set to stdout
+ * {@link DistributedSystemConfigProperties#LOG_FILE} property is set to stdout
* @return true if the logging would go to stdout
*/
private static boolean isLoggingToStdOut() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
index 4c6ea10..126d713 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
@@ -72,7 +72,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Represents a (disk-based) persistent store for region data. Used for both
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
index c59d098..9c19461 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.*;
import com.gemstone.gemfire.distributed.internal.DistributionStats;
import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
/**
* GemFire statistics about a Pool
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
index 89db1eb..85b2041 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
@@ -56,7 +56,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Implements the acceptor thread on the bridge server. Accepts connections from
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
index ba2a7a8..df9bbd4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -54,7 +54,7 @@ import java.security.Principal;
import java.util.*;
import java.util.concurrent.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Class <code>CacheClientNotifier</code> works on the server and manages
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
index ade09ee..4d1c1d2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger;
import java.io.*;
import java.util.Arrays;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This class represents a ConnectionProxy of the CacheClient
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
index 9bc8956..2408009 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
@@ -56,7 +56,7 @@ import java.security.cert.X509Certificate;
import java.security.spec.X509EncodedKeySpec;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class HandShake implements ClientHandShake
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
index c35ccb5..1a66030 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
@@ -60,7 +60,7 @@ import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Provides an implementation for the server socket end of the hierarchical
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 01c36bd..1c373c1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.UnsupportedVersionException;
import com.gemstone.gemfire.cache.VersionException;
import com.gemstone.gemfire.distributed.DistributedMember;
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.HeapDataOutputStream;
import com.gemstone.gemfire.internal.Version;
@@ -47,7 +46,7 @@ import java.net.SocketTimeoutException;
import java.security.Principal;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* A <code>ServerHandShakeProcessor</code> verifies the client's version compatibility with server.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
index 5cd1849..4ee3585 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
@@ -17,8 +17,7 @@
package com.gemstone.gemfire.internal.cache.xmlcache;
import com.gemstone.gemfire.cache.CacheXmlException;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import org.xml.sax.*;
@@ -692,7 +691,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/** The name of the <code>overflow-directory</code> attribute */
protected static final String OVERFLOW_DIRECTORY = "overflow-directory";
/** The name of the <code>socket-buffer-size</code> attribute */
- protected static final String SOCKET_BUFFER_SIZE = SystemConfigurationProperties.SOCKET_BUFFER_SIZE;
+ protected static final String SOCKET_BUFFER_SIZE = DistributedSystemConfigProperties.SOCKET_BUFFER_SIZE;
/** The name of the <code>socket-read-timeout</code> attribute */
protected static final String SOCKET_READ_TIMEOUT = "socket-read-timeout";
/** The name of the <code>maximum-queue-memory</code> attribute */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
index 27f5302..37ce630 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.logging;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
index 5cfa58d..838bfc6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
@@ -48,7 +48,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.Callable;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class GeodeSecurityUtil {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
index 2bb5183..fff008f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
@@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import static com.gemstone.gemfire.management.internal.security.ResourceConstants.ACCESS_DENIED_MESSAGE;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class CustomAuthRealm extends AuthorizingRealm{
public static final String REALM_NAME = "CUSTOMAUTHREALM";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
index a3d78ed..80c8a56 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -49,7 +49,7 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/** <p>Connection is a socket holder that sends and receives serialized
message objects. A Connection may be closed to preserve system
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
index ac28941..b408d86 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.cli;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.management.cli.CliMetaData;
@@ -37,6 +37,8 @@ import java.lang.reflect.Method;
import java.util.*;
import java.util.Map.Entry;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
/**
*
* @since GemFire 7.0
@@ -48,7 +50,7 @@ public class CommandManager {
private static final Object INSTANCE_LOCK = new Object();
private static CommandManager INSTANCE = null;
- public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.USER_COMMAND_PACKAGES;
+ public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + USER_COMMAND_PACKAGES;
public static final String USER_CMD_PACKAGES_ENV_VARIABLE = "GEMFIRE_USER_COMMAND_PACKAGES";
private Properties cacheProperties;
@@ -93,7 +95,7 @@ public class CommandManager {
// Find by packages specified in the distribution config
if (this.cacheProperties != null) {
- String cacheUserCmdPackages = this.cacheProperties.getProperty(SystemConfigurationProperties.USER_COMMAND_PACKAGES);
+ String cacheUserCmdPackages = this.cacheProperties.getProperty(DistributedSystemConfigProperties.USER_COMMAND_PACKAGES);
if (cacheUserCmdPackages != null && !cacheUserCmdPackages.isEmpty()) {
StringTokenizer tokenizer = new StringTokenizer(cacheUserCmdPackages, ",");
while (tokenizer.hasMoreTokens()) {
[12/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 3b08779..864c93b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -109,11 +109,11 @@ public abstract class AbstractDistributionConfig
protected int checkTcpPort(int value) {
if ( getSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), SSL_ENABLED_NAME }));
+ .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), SSL_ENABLED }));
}
if ( getClusterSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED_NAME }));
+ .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
}
return value;
}
@@ -122,11 +122,11 @@ public abstract class AbstractDistributionConfig
protected int checkMcastPort(int value) {
if ( getSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), SSL_ENABLED_NAME }));
+ .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), SSL_ENABLED }));
}
if ( getClusterSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED_NAME }));
+ .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
}
return value;
}
@@ -164,25 +164,25 @@ public abstract class AbstractDistributionConfig
return value;
}
- @ConfigAttributeChecker(name=SSL_ENABLED_NAME)
+ @ConfigAttributeChecker(name=SSL_ENABLED)
protected Boolean checkSSLEnabled(Boolean value) {
if ( value.booleanValue() && (getMcastPort() != 0) ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_FALSE_WHEN_2_IS_NOT_0
- .toLocalizedString(new Object[] { SSL_ENABLED_NAME, value, MCAST_PORT }));
+ .toLocalizedString(new Object[] { SSL_ENABLED, value, MCAST_PORT }));
}
return value;
}
- @ConfigAttributeChecker(name=CLUSTER_SSL_ENABLED_NAME)
+ @ConfigAttributeChecker(name=CLUSTER_SSL_ENABLED)
protected Boolean checkClusterSSLEnabled(Boolean value) {
if ( value.booleanValue() && (getMcastPort() != 0) ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_FALSE_WHEN_2_IS_NOT_0
- .toLocalizedString(new Object[] { CLUSTER_SSL_ENABLED_NAME, value, MCAST_PORT }));
+ .toLocalizedString(new Object[] { CLUSTER_SSL_ENABLED, value, MCAST_PORT }));
}
return value;
}
- @ConfigAttributeChecker(name=HTTP_SERVICE_BIND_ADDRESS_NAME)
+ @ConfigAttributeChecker(name=HTTP_SERVICE_BIND_ADDRESS)
protected String checkHttpServiceBindAddress(String value) {
if (value != null && value.length() > 0 &&
!SocketCreator.isLocalHost(value)) {
@@ -195,7 +195,7 @@ public abstract class AbstractDistributionConfig
}
- @ConfigAttributeChecker(name=DISTRIBUTED_SYSTEM_ID_NAME)
+ @ConfigAttributeChecker(name=DISTRIBUTED_SYSTEM_ID)
protected int checkDistributedSystemId(int value) {
String distributedSystemListener = System
.getProperty(DistributionConfig.GEMFIRE_PREFIX + "DistributedSystemListener");
@@ -204,13 +204,13 @@ public abstract class AbstractDistributionConfig
if (value < MIN_DISTRIBUTED_SYSTEM_ID) {
throw new IllegalArgumentException(
LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2
- .toLocalizedString(new Object[] { DISTRIBUTED_SYSTEM_ID_NAME,
+ .toLocalizedString(new Object[] { DISTRIBUTED_SYSTEM_ID,
Integer.valueOf(value),
Integer.valueOf(MIN_DISTRIBUTED_SYSTEM_ID) }));
}
}
if (value > MAX_DISTRIBUTED_SYSTEM_ID) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {DISTRIBUTED_SYSTEM_ID_NAME, Integer.valueOf(value), Integer.valueOf(MAX_DISTRIBUTED_SYSTEM_ID)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {DISTRIBUTED_SYSTEM_ID, Integer.valueOf(value), Integer.valueOf(MAX_DISTRIBUTED_SYSTEM_ID)}));
}
return value;
}
@@ -344,36 +344,36 @@ public abstract class AbstractDistributionConfig
}
/** check a new mcast flow-control setting */
- @ConfigAttributeChecker(name=MCAST_FLOW_CONTROL_NAME)
+ @ConfigAttributeChecker(name=MCAST_FLOW_CONTROL)
protected FlowControlParams checkMcastFlowControl(FlowControlParams params) {
int value = params.getByteAllowance();
if (value < MIN_FC_BYTE_ALLOWANCE) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_BYTEALLOWANCE_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, Integer.valueOf(value), Integer.valueOf(MIN_FC_BYTE_ALLOWANCE)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_BYTEALLOWANCE_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_BYTE_ALLOWANCE)}));
}
float fvalue = params.getRechargeThreshold();
if (fvalue < MIN_FC_RECHARGE_THRESHOLD) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, new Float(fvalue), new Float(MIN_FC_RECHARGE_THRESHOLD)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MIN_FC_RECHARGE_THRESHOLD)}));
}
else if (fvalue > MAX_FC_RECHARGE_THRESHOLD) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, new Float(fvalue), new Float(MAX_FC_RECHARGE_THRESHOLD)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MAX_FC_RECHARGE_THRESHOLD)}));
}
value = params.getRechargeBlockMs();
if (value < MIN_FC_RECHARGE_BLOCK_MS) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, Integer.valueOf(value), Integer.valueOf(MIN_FC_RECHARGE_BLOCK_MS)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_RECHARGE_BLOCK_MS)}));
}
else if (value > MAX_FC_RECHARGE_BLOCK_MS) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, Integer.valueOf(value), Integer.valueOf(MAX_FC_RECHARGE_BLOCK_MS)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MAX_FC_RECHARGE_BLOCK_MS)}));
}
return params;
}
- @ConfigAttributeChecker(name=MEMBERSHIP_PORT_RANGE_NAME)
+ @ConfigAttributeChecker(name=MEMBERSHIP_PORT_RANGE)
protected int[] checkMembershipPortRange(int[] value) {
- minMaxCheck(MEMBERSHIP_PORT_RANGE_NAME, value[0],
+ minMaxCheck(MEMBERSHIP_PORT_RANGE, value[0],
DEFAULT_MEMBERSHIP_PORT_RANGE[0],
value[1]);
- minMaxCheck(MEMBERSHIP_PORT_RANGE_NAME, value[1],
+ minMaxCheck(MEMBERSHIP_PORT_RANGE, value[1],
value[0],
DEFAULT_MEMBERSHIP_PORT_RANGE[1]);
@@ -381,7 +381,7 @@ public abstract class AbstractDistributionConfig
// One for each, UDP, FD_SOCk protocols and Cache Server.
if (value[1] - value[0] < 2) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.
- toLocalizedString(new Object[] {MEMBERSHIP_PORT_RANGE_NAME, value[0]+"-"+value[1], Integer.valueOf(3)}));
+ toLocalizedString(new Object[] {MEMBERSHIP_PORT_RANGE, value[0]+"-"+value[1], Integer.valueOf(3)}));
}
return value;
}
@@ -393,25 +393,25 @@ public abstract class AbstractDistributionConfig
if (! (value.equals(CLIENT_CONFLATION_PROP_VALUE_DEFAULT) ||
value.equals(CLIENT_CONFLATION_PROP_VALUE_ON) ||
value.equals(CLIENT_CONFLATION_PROP_VALUE_OFF)) ) {
- throw new IllegalArgumentException("Could not set \"" + CLIENT_CONFLATION_PROP_NAME + "\" to \"" + value + "\" because its value is not recognized");
+ throw new IllegalArgumentException("Could not set \"" + CONFLATE_EVENTS + "\" to \"" + value + "\" because its value is not recognized");
}
return value;
}
- @ConfigAttributeChecker(name=SECURITY_PEER_AUTH_INIT_NAME)
+ @ConfigAttributeChecker(name=SECURITY_PEER_AUTH_INIT)
protected String checkSecurityPeerAuthInit(String value) {
if (value != null && value.length() > 0 && getMcastPort() != 0) {
String mcastInfo = MCAST_PORT + "[" + getMcastPort() + "]";
throw new IllegalArgumentException(
LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED
.toLocalizedString(new Object[] {
- SECURITY_PEER_AUTH_INIT_NAME, value, mcastInfo }));
+ SECURITY_PEER_AUTH_INIT, value, mcastInfo }));
}
return value;
}
- @ConfigAttributeChecker(name=SECURITY_PEER_AUTHENTICATOR_NAME)
+ @ConfigAttributeChecker(name=SECURITY_PEER_AUTHENTICATOR)
protected String checkSecurityPeerAuthenticator(String value) {
if (value != null && value.length() > 0 && getMcastPort() != 0) {
String mcastInfo = MCAST_PORT + "[" + getMcastPort() + "]";
@@ -419,7 +419,7 @@ public abstract class AbstractDistributionConfig
LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED
.toLocalizedString(
new Object[] {
- SECURITY_PEER_AUTHENTICATOR_NAME,
+ SECURITY_PEER_AUTHENTICATOR,
value,
mcastInfo}));
}
@@ -427,13 +427,13 @@ public abstract class AbstractDistributionConfig
}
- @ConfigAttributeChecker(name=SECURITY_LOG_LEVEL_NAME)
+ @ConfigAttributeChecker(name=SECURITY_LOG_LEVEL)
protected int checkSecurityLogLevel(int value) {
if (value < MIN_LOG_LEVEL) {
throw new IllegalArgumentException(
LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(
new Object[] {
- SECURITY_LOG_LEVEL_NAME,
+ SECURITY_LOG_LEVEL,
LogWriterImpl.levelToString(value),
LogWriterImpl.levelToString(MIN_LOG_LEVEL)}));
}
@@ -441,7 +441,7 @@ public abstract class AbstractDistributionConfig
throw new IllegalArgumentException(
LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(
new Object[] {
- SECURITY_LOG_LEVEL_NAME,
+ SECURITY_LOG_LEVEL,
LogWriterImpl.levelToString(value),
LogWriterImpl.levelToString(MAX_LOG_LEVEL)}));
}
@@ -449,7 +449,7 @@ public abstract class AbstractDistributionConfig
}
- @ConfigAttributeChecker(name=MEMCACHED_PROTOCOL_NAME)
+ @ConfigAttributeChecker(name=MEMCACHED_PROTOCOL)
protected String checkMemcachedProtocol(String protocol) {
if (protocol == null
|| (!protocol.equalsIgnoreCase(GemFireMemcachedServer.Protocol.ASCII.name()) &&
@@ -464,7 +464,7 @@ public abstract class AbstractDistributionConfig
return false;
}
- @ConfigAttributeChecker(name=MEMCACHED_BIND_ADDRESS_NAME)
+ @ConfigAttributeChecker(name=MEMCACHED_BIND_ADDRESS)
protected String checkMemcachedBindAddress(String value) {
if (value != null && value.length() > 0 &&
!SocketCreator.isLocalHost(value)) {
@@ -476,7 +476,7 @@ public abstract class AbstractDistributionConfig
return value;
}
- @ConfigAttributeChecker(name=REDIS_BIND_ADDRESS_NAME)
+ @ConfigAttributeChecker(name=REDIS_BIND_ADDRESS)
protected String checkRedisBindAddress(String value) {
if (value != null && value.length() > 0 &&
!SocketCreator.isLocalHost(value)) {
@@ -492,7 +492,7 @@ public abstract class AbstractDistributionConfig
@Override
protected void checkAttributeName(String attName) {
- if(!attName.startsWith(SECURITY_PREFIX_NAME) && !attName.startsWith(USERDEFINED_PREFIX_NAME)
+ if(!attName.startsWith(SECURITY_PREFIX) && !attName.startsWith(USERDEFINED_PREFIX_NAME)
&& !attName.startsWith(SSL_SYSTEM_PROPS_NAME) && !attName.startsWith(SYS_PROP_NAME)) {
super.checkAttributeName(attName);
}
@@ -518,13 +518,13 @@ public abstract class AbstractDistributionConfig
}
// special case: log-level and security-log-level attributes are String type, but the setter accepts int
- if(attName.equalsIgnoreCase(LOG_LEVEL_NAME) || attName.equalsIgnoreCase(SECURITY_LOG_LEVEL_NAME)){
+ if(attName.equalsIgnoreCase(LOG_LEVEL) || attName.equalsIgnoreCase(SECURITY_LOG_LEVEL)){
if(attValue instanceof String) {
attValue = LogWriterImpl.levelNameToCode((String) attValue);
}
}
- if (attName.startsWith(SECURITY_PREFIX_NAME)) {
+ if (attName.startsWith(SECURITY_PREFIX)) {
this.setSecurity(attName,attValue.toString());
}
@@ -536,7 +536,7 @@ public abstract class AbstractDistributionConfig
if (setter == null) {
// if we cann't find the defined setter, but the attributeName starts with these special characters
// since we already set it in the respecitive properties above, we need to set the source then return
- if (attName.startsWith(SECURITY_PREFIX_NAME) ||
+ if (attName.startsWith(SECURITY_PREFIX) ||
attName.startsWith(SSL_SYSTEM_PROPS_NAME) ||
attName.startsWith(SYS_PROP_NAME)) {
getAttSourceMap().put(attName, source);
@@ -570,17 +570,17 @@ public abstract class AbstractDistributionConfig
checkAttributeName(attName);
// special case:
- if (attName.equalsIgnoreCase(LOG_LEVEL_NAME)) {
+ if (attName.equalsIgnoreCase(LOG_LEVEL)) {
return LogWriterImpl.levelToString(this.getLogLevel());
}
- if (attName.equalsIgnoreCase(SECURITY_LOG_LEVEL_NAME)) {
+ if (attName.equalsIgnoreCase(SECURITY_LOG_LEVEL)) {
return LogWriterImpl.levelToString(this.getSecurityLogLevel());
}
Method getter = getters.get(attName);
if(getter==null) {
- if (attName.startsWith(SECURITY_PREFIX_NAME)) {
+ if (attName.startsWith(SECURITY_PREFIX)) {
return this.getSecurity(attName);
}
throw new InternalGemFireException(LocalizedStrings.AbstractDistributionConfig_UNHANDLED_ATTRIBUTE_NAME_0.toLocalizedString(attName));
@@ -619,7 +619,7 @@ public abstract class AbstractDistributionConfig
* @return an empty list
*/
public List<String> getModifiableAttributes(){
- String[] modifiables = {HTTP_SERVICE_PORT_NAME,JMX_MANAGER_HTTP_PORT_NAME};
+ String[] modifiables = {HTTP_SERVICE_PORT,JMX_MANAGER_HTTP_PORT_NAME};
return Arrays.asList(modifiables);
};
@@ -641,7 +641,7 @@ public abstract class AbstractDistributionConfig
public static Class _getAttributeType(String attName) {
ConfigAttribute ca = attributes.get(attName);
if(ca==null){
- if(attName.startsWith(SECURITY_PREFIX_NAME) || attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME) ){
+ if(attName.startsWith(SECURITY_PREFIX) || attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME) ){
return String.class;
}
throw new InternalGemFireException(LocalizedStrings.AbstractDistributionConfig_UNHANDLED_ATTRIBUTE_NAME_0.toLocalizedString(attName));
@@ -653,58 +653,58 @@ public abstract class AbstractDistributionConfig
static {
Map<String, String> m = new HashMap<String, String>();
- m.put(ACK_WAIT_THRESHOLD_NAME,
+ m.put(ACK_WAIT_THRESHOLD,
LocalizedStrings.AbstractDistributionConfig_DEFAULT_ACK_WAIT_THRESHOLD_0_1_2
.toLocalizedString( new Object[] {
Integer.valueOf(DEFAULT_ACK_WAIT_THRESHOLD),
Integer.valueOf(MIN_ACK_WAIT_THRESHOLD),
Integer.valueOf(MIN_ACK_WAIT_THRESHOLD)}));
- m.put(ARCHIVE_FILE_SIZE_LIMIT_NAME,
+ m.put(ARCHIVE_FILE_SIZE_LIMIT,
LocalizedStrings.AbstractDistributionConfig_ARCHIVE_FILE_SIZE_LIMIT_NAME
.toLocalizedString());
- m.put(ACK_SEVERE_ALERT_THRESHOLD_NAME,
+ m.put(ACK_SEVERE_ALERT_THRESHOLD,
LocalizedStrings.AbstractDistributionConfig_ACK_SEVERE_ALERT_THRESHOLD_NAME
.toLocalizedString(
- new Object[] { ACK_WAIT_THRESHOLD_NAME,
+ new Object[] { ACK_WAIT_THRESHOLD,
Integer.valueOf(DEFAULT_ACK_SEVERE_ALERT_THRESHOLD),
Integer.valueOf(MIN_ACK_SEVERE_ALERT_THRESHOLD),
Integer.valueOf(MAX_ACK_SEVERE_ALERT_THRESHOLD)}));
- m.put(ARCHIVE_DISK_SPACE_LIMIT_NAME,
+ m.put(ARCHIVE_DISK_SPACE_LIMIT,
LocalizedStrings.AbstractDistributionConfig_ARCHIVE_DISK_SPACE_LIMIT_NAME
.toLocalizedString());
- m.put(CACHE_XML_FILE_NAME,
+ m.put(CACHE_XML_FILE,
LocalizedStrings.AbstractDistributionConfig_CACHE_XML_FILE_NAME_0
.toLocalizedString( DEFAULT_CACHE_XML_FILE ));
- m.put(DISABLE_TCP_NAME,
+ m.put(DISABLE_TCP,
LocalizedStrings.AbstractDistributionConfig_DISABLE_TCP_NAME_0
.toLocalizedString(Boolean.valueOf(DEFAULT_DISABLE_TCP)));
- m.put(ENABLE_TIME_STATISTICS_NAME,
+ m.put(ENABLE_TIME_STATISTICS,
LocalizedStrings.AbstractDistributionConfig_ENABLE_TIME_STATISTICS_NAME
.toLocalizedString());
- m.put(DEPLOY_WORKING_DIR,
+ m.put(SystemConfigurationProperties.DEPLOY_WORKING_DIR,
LocalizedStrings.AbstractDistributionConfig_DEPLOY_WORKING_DIR_0
.toLocalizedString(DEFAULT_DEPLOY_WORKING_DIR));
- m.put(LOG_FILE_NAME,
+ m.put(LOG_FILE,
LocalizedStrings.AbstractDistributionConfig_LOG_FILE_NAME_0
.toLocalizedString(DEFAULT_LOG_FILE));
- m.put(LOG_LEVEL_NAME,
+ m.put(LOG_LEVEL,
LocalizedStrings.AbstractDistributionConfig_LOG_LEVEL_NAME_0_1
.toLocalizedString(new Object[] { LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL), LogWriterImpl.allowedLogLevels()}));
- m.put(LOG_FILE_SIZE_LIMIT_NAME,
+ m.put(LOG_FILE_SIZE_LIMIT,
LocalizedStrings.AbstractDistributionConfig_LOG_FILE_SIZE_LIMIT_NAME
.toLocalizedString());
- m.put(LOG_DISK_SPACE_LIMIT_NAME,
+ m.put(LOG_DISK_SPACE_LIMIT,
LocalizedStrings.AbstractDistributionConfig_LOG_DISK_SPACE_LIMIT_NAME
.toLocalizedString());
@@ -743,20 +743,20 @@ public abstract class AbstractDistributionConfig
Integer.valueOf(MIN_MCAST_TTL),
Integer.valueOf(MAX_MCAST_TTL)}));
- m.put(MCAST_SEND_BUFFER_SIZE_NAME,
+ m.put(MCAST_SEND_BUFFER_SIZE,
LocalizedStrings.AbstractDistributionConfig_MCAST_SEND_BUFFER_SIZE_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_MCAST_SEND_BUFFER_SIZE)));
- m.put(MCAST_RECV_BUFFER_SIZE_NAME,
+ m.put(MCAST_RECV_BUFFER_SIZE,
LocalizedStrings.AbstractDistributionConfig_MCAST_RECV_BUFFER_SIZE_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_MCAST_RECV_BUFFER_SIZE)));
- m.put(MCAST_FLOW_CONTROL_NAME,
+ m.put(MCAST_FLOW_CONTROL,
LocalizedStrings.AbstractDistributionConfig_MCAST_FLOW_CONTROL_NAME_0
.toLocalizedString(DEFAULT_MCAST_FLOW_CONTROL));
- m.put(MEMBER_TIMEOUT_NAME,
- LocalizedStrings.AbstractDistributionConfig_MEMBER_TIMEOUT_NAME_0
+ m.put(MEMBER_TIMEOUT,
+ LocalizedStrings.AbstractDistributionConfig_MEMBER_TIMEOUT_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_MEMBER_TIMEOUT)));
// for some reason the default port range is null under some circumstances
@@ -764,40 +764,40 @@ public abstract class AbstractDistributionConfig
String srange = range==null? "not available" : "" + range[0] + "-" + range[1];
String msg = LocalizedStrings.AbstractDistributionConfig_MEMBERSHIP_PORT_RANGE_NAME_0
.toLocalizedString(srange);
- m.put(MEMBERSHIP_PORT_RANGE_NAME,
+ m.put(MEMBERSHIP_PORT_RANGE,
msg);
- m.put(UDP_SEND_BUFFER_SIZE_NAME,
+ m.put(UDP_SEND_BUFFER_SIZE,
LocalizedStrings.AbstractDistributionConfig_UDP_SEND_BUFFER_SIZE_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_UDP_SEND_BUFFER_SIZE)));
- m.put(UDP_RECV_BUFFER_SIZE_NAME,
+ m.put(UDP_RECV_BUFFER_SIZE,
LocalizedStrings.AbstractDistributionConfig_UDP_RECV_BUFFER_SIZE_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_UDP_RECV_BUFFER_SIZE)));
- m.put(UDP_FRAGMENT_SIZE_NAME,
+ m.put(UDP_FRAGMENT_SIZE,
LocalizedStrings.AbstractDistributionConfig_UDP_FRAGMENT_SIZE_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_UDP_FRAGMENT_SIZE)));
- m.put(SOCKET_LEASE_TIME_NAME,
+ m.put(SOCKET_LEASE_TIME,
LocalizedStrings.AbstractDistributionConfig_SOCKET_LEASE_TIME_NAME_0_1_2
.toLocalizedString(new Object[] {
Integer.valueOf(DEFAULT_SOCKET_LEASE_TIME),
Integer.valueOf(MIN_SOCKET_LEASE_TIME),
Integer.valueOf(MAX_SOCKET_LEASE_TIME)}));
- m.put(SOCKET_BUFFER_SIZE_NAME,
+ m.put(SOCKET_BUFFER_SIZE,
LocalizedStrings.AbstractDistributionConfig_SOCKET_BUFFER_SIZE_NAME_0_1_2
.toLocalizedString(new Object[] {
Integer.valueOf(DEFAULT_SOCKET_BUFFER_SIZE),
Integer.valueOf(MIN_SOCKET_BUFFER_SIZE),
Integer.valueOf(MAX_SOCKET_BUFFER_SIZE)}));
- m.put(CONSERVE_SOCKETS_NAME,
+ m.put(CONSERVE_SOCKETS,
LocalizedStrings.AbstractDistributionConfig_CONSERVE_SOCKETS_NAME_0
.toLocalizedString(Boolean.valueOf(DEFAULT_CONSERVE_SOCKETS)));
- m.put(ROLES_NAME,
+ m.put(ROLES,
LocalizedStrings.AbstractDistributionConfig_ROLES_NAME_0
.toLocalizedString(DEFAULT_ROLES));
@@ -813,76 +813,76 @@ public abstract class AbstractDistributionConfig
" Multiple members in the same distributed system can not have the same name." +
" Defaults to \"\".");
- m.put(STATISTIC_ARCHIVE_FILE_NAME,
+ m.put(STATISTIC_ARCHIVE_FILE,
LocalizedStrings.AbstractDistributionConfig_STATISTIC_ARCHIVE_FILE_NAME_0
.toLocalizedString(DEFAULT_STATISTIC_ARCHIVE_FILE));
- m.put(STATISTIC_SAMPLE_RATE_NAME,
+ m.put(STATISTIC_SAMPLE_RATE,
LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLE_RATE_NAME_0_1_2
.toLocalizedString(new Object[] {
Integer.valueOf(DEFAULT_STATISTIC_SAMPLE_RATE),
Integer.valueOf(MIN_STATISTIC_SAMPLE_RATE),
Integer.valueOf(MAX_STATISTIC_SAMPLE_RATE)}));
- m.put(STATISTIC_SAMPLING_ENABLED_NAME,
+ m.put(STATISTIC_SAMPLING_ENABLED,
LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLING_ENABLED_NAME_0
.toLocalizedString(
Boolean.valueOf(DEFAULT_STATISTIC_SAMPLING_ENABLED)));
- m.put(SSL_ENABLED_NAME,
+ m.put(SSL_ENABLED,
LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
.toLocalizedString(
Boolean.valueOf(DEFAULT_SSL_ENABLED)));
- m.put(SSL_PROTOCOLS_NAME,
+ m.put(SSL_PROTOCOLS,
LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0
.toLocalizedString(DEFAULT_SSL_PROTOCOLS));
- m.put(SSL_CIPHERS_NAME,
+ m.put(SSL_CIPHERS,
LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0
.toLocalizedString(DEFAULT_SSL_CIPHERS));
- m.put(SSL_REQUIRE_AUTHENTICATION_NAME,
+ m.put(SSL_REQUIRE_AUTHENTICATION,
LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME
.toLocalizedString(Boolean.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION)));
- m.put(CLUSTER_SSL_ENABLED_NAME,
+ m.put(CLUSTER_SSL_ENABLED,
LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
.toLocalizedString(
Boolean.valueOf(DEFAULT_CLUSTER_SSL_ENABLED)));
- m.put(CLUSTER_SSL_PROTOCOLS_NAME,
+ m.put(CLUSTER_SSL_PROTOCOLS,
LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0
.toLocalizedString(DEFAULT_CLUSTER_SSL_PROTOCOLS));
- m.put(CLUSTER_SSL_CIPHERS_NAME,
+ m.put(CLUSTER_SSL_CIPHERS,
LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0
.toLocalizedString(DEFAULT_CLUSTER_SSL_CIPHERS));
- m.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME,
+ m.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION,
LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME
.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION)));
- m.put(CLUSTER_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing an distributed member's own certificate and private key.");
+ m.put(CLUSTER_SSL_KEYSTORE,"Location of the Java keystore file containing an distributed member's own certificate and private key.");
- m.put(CLUSTER_SSL_KEYSTORE_TYPE_NAME,
+ m.put(CLUSTER_SSL_KEYSTORE_TYPE,
"For Java keystore file format, this property has the value jks (or JKS).");
- m.put(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+ m.put(CLUSTER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
- m.put(CLUSTER_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by distributed member (trust store).");
+ m.put(CLUSTER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by distributed member (trust store).");
- m.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+ m.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
- m.put(MAX_WAIT_TIME_FOR_RECONNECT_NAME,
+ m.put(MAX_WAIT_TIME_RECONNECT,
LocalizedStrings.AbstractDistributionConfig_MAX_WAIT_TIME_FOR_RECONNECT
.toLocalizedString());
- m.put(MAX_NUM_RECONNECT_TRIES,
+ m.put(MAX_NUM_RECONNECT_TRIES,
LocalizedStrings.AbstractDistributionConfig_MAX_NUM_RECONNECT_TRIES
.toLocalizedString());
- m.put(ASYNC_DISTRIBUTION_TIMEOUT_NAME,
+ m.put(ASYNC_DISTRIBUTION_TIMEOUT,
LocalizedStrings.AbstractDistributionConfig_ASYNC_DISTRIBUTION_TIMEOUT_NAME_0_1_2
.toLocalizedString( new Object[] {
Integer.valueOf(DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT),
@@ -890,14 +890,14 @@ public abstract class AbstractDistributionConfig
Integer.valueOf(MAX_ASYNC_DISTRIBUTION_TIMEOUT)}));
- m.put(ASYNC_QUEUE_TIMEOUT_NAME,
+ m.put(ASYNC_QUEUE_TIMEOUT,
LocalizedStrings.AbstractDistributionConfig_ASYNC_QUEUE_TIMEOUT_NAME_0_1_2
.toLocalizedString( new Object[] {
Integer.valueOf(DEFAULT_ASYNC_QUEUE_TIMEOUT),
Integer.valueOf(MIN_ASYNC_QUEUE_TIMEOUT),
Integer.valueOf(MAX_ASYNC_QUEUE_TIMEOUT)}));
- m.put(ASYNC_MAX_QUEUE_SIZE_NAME,
+ m.put(ASYNC_MAX_QUEUE_SIZE,
LocalizedStrings.AbstractDistributionConfig_ASYNC_MAX_QUEUE_SIZE_NAME_0_1_2
.toLocalizedString( new Object[] {
Integer.valueOf(DEFAULT_ASYNC_MAX_QUEUE_SIZE),
@@ -908,65 +908,65 @@ public abstract class AbstractDistributionConfig
LocalizedStrings.AbstractDistributionConfig_START_LOCATOR_NAME
.toLocalizedString());
- m.put(DURABLE_CLIENT_ID_NAME,
+ m.put(DURABLE_CLIENT_ID,
LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_ID_NAME_0
.toLocalizedString(DEFAULT_DURABLE_CLIENT_ID));
- m.put(CLIENT_CONFLATION_PROP_NAME,
+ m.put(CONFLATE_EVENTS,
LocalizedStrings.AbstractDistributionConfig_CLIENT_CONFLATION_PROP_NAME
.toLocalizedString());
- m.put(DURABLE_CLIENT_TIMEOUT_NAME,
+ m.put(DURABLE_CLIENT_TIMEOUT,
LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_TIMEOUT_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_DURABLE_CLIENT_TIMEOUT)));
- m.put(SECURITY_CLIENT_AUTH_INIT_NAME,
+ m.put(SECURITY_CLIENT_AUTH_INIT,
LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTH_INIT_NAME_0
.toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTH_INIT));
- m.put(ENABLE_NETWORK_PARTITION_DETECTION_NAME, "Whether network partitioning detection is enabled");
+ m.put(ENABLE_NETWORK_PARTITION_DETECTION, "Whether network partitioning detection is enabled");
- m.put(DISABLE_AUTO_RECONNECT_NAME, "Whether auto reconnect is attempted after a network partition");
+ m.put(DISABLE_AUTO_RECONNECT, "Whether auto reconnect is attempted after a network partition");
- m.put(SECURITY_CLIENT_AUTHENTICATOR_NAME,
+ m.put(SECURITY_CLIENT_AUTHENTICATOR,
LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTHENTICATOR_NAME_0
.toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTHENTICATOR));
- m.put(SECURITY_CLIENT_DHALGO_NAME,
+ m.put(SECURITY_CLIENT_DHALGO,
LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_DHALGO_NAME_0
.toLocalizedString(DEFAULT_SECURITY_CLIENT_DHALGO));
- m.put(SECURITY_PEER_AUTH_INIT_NAME,
+ m.put(SECURITY_PEER_AUTH_INIT,
LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTH_INIT_NAME_0
.toLocalizedString(DEFAULT_SECURITY_PEER_AUTH_INIT));
- m.put(SECURITY_PEER_AUTHENTICATOR_NAME,
+ m.put(SECURITY_PEER_AUTHENTICATOR,
LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTHENTICATOR_NAME_0
.toLocalizedString(DEFAULT_SECURITY_PEER_AUTHENTICATOR));
- m.put(SECURITY_CLIENT_ACCESSOR_NAME,
+ m.put(SECURITY_CLIENT_ACCESSOR,
LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_NAME_0
.toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR));
- m.put(SECURITY_CLIENT_ACCESSOR_PP_NAME,
+ m.put(SECURITY_CLIENT_ACCESSOR_PP,
LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_PP_NAME_0
.toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR_PP));
- m.put(SECURITY_LOG_LEVEL_NAME,
+ m.put(SECURITY_LOG_LEVEL,
LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_LEVEL_NAME_0_1
.toLocalizedString( new Object[] {
LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL),
LogWriterImpl.allowedLogLevels()}));
- m.put(SECURITY_LOG_FILE_NAME,
+ m.put(SECURITY_LOG_FILE,
LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_FILE_NAME_0
.toLocalizedString(DEFAULT_SECURITY_LOG_FILE));
- m.put(SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME,
+ m.put(SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME,
LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_SECURITY_PEER_VERIFYMEMBER_TIMEOUT)));
- m.put(SECURITY_PREFIX_NAME,
+ m.put(SECURITY_PREFIX,
LocalizedStrings.AbstractDistributionConfig_SECURITY_PREFIX_NAME
.toLocalizedString());
@@ -974,156 +974,156 @@ public abstract class AbstractDistributionConfig
LocalizedStrings.AbstractDistributionConfig_USERDEFINED_PREFIX_NAME
.toLocalizedString());
- m.put(REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME,
+ m.put(REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME,
LocalizedStrings.AbstractDistributionConfig_REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME_0
.toLocalizedString(DEFAULT_REMOVE_UNRESPONSIVE_CLIENT));
m.put(DELTA_PROPAGATION_PROP_NAME, "Whether delta propagation is enabled");
- m.put(REMOTE_LOCATORS_NAME,
+ m.put(REMOTE_LOCATORS,
LocalizedStrings.AbstractDistributionConfig_REMOTE_DISTRIBUTED_SYSTEMS_NAME_0
.toLocalizedString(DEFAULT_REMOTE_LOCATORS));
- m.put(DISTRIBUTED_SYSTEM_ID_NAME, "An id that uniquely idenitifies this distributed system. " +
+ m.put(DISTRIBUTED_SYSTEM_ID, "An id that uniquely idenitifies this distributed system. " +
"Required when using portable data exchange objects and the WAN." +
"Must be the same on each member in this distributed system if set.");
m.put(ENFORCE_UNIQUE_HOST_NAME, "Whether to require partitioned regions to put " +
"redundant copies of data on different physical machines");
- m.put(REDUNDANCY_ZONE_NAME, "The zone that this member is in. When this is set, " +
+ m.put(REDUNDANCY_ZONE, "The zone that this member is in. When this is set, " +
"partitioned regions will not put two copies of the same data in the same zone.");
- m.put(GROUPS_NAME, "A comma separated list of all the groups this member belongs to." +
+ m.put(GROUPS, "A comma separated list of all the groups this member belongs to." +
" Defaults to \"\".");
- m.put(USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
+ m.put(SystemConfigurationProperties.USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
- m.put(JMX_MANAGER_NAME, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
- m.put(JMX_MANAGER_START_NAME, "If true then the jmx manager will be started when the cache is created. Defaults to false.");
- m.put(JMX_MANAGER_SSL_NAME, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
- m.put(JMX_MANAGER_SSL_ENABLED_NAME, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
- m.put(JMX_MANAGER_SSL_CIPHERS_NAME, "List of available SSL cipher suites that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_CIPHERS+"\" meaning your provider''s defaults.");
- m.put(JMX_MANAGER_SSL_PROTOCOLS_NAME, "List of available SSL protocols that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_PROTOCOLS+"\" meaning defaults of your provider.");
- m.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME, "If set to false, ciphers and protocols that permit anonymous JMX Clients are allowed. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION+"\".");
- m.put(JMX_MANAGER_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing jmx manager's own certificate and private key.");
- m.put(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME, "For Java keystore file format, this property has the value jks (or JKS).");
- m.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
- m.put(JMX_MANAGER_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by jmx manager.");
- m.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+ m.put(JMX_MANAGER, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
+ m.put(JMX_MANAGER_START, "If true then the jmx manager will be started when the cache is created. Defaults to false.");
+ m.put(JMX_MANAGER_SSL, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
+ m.put(JMX_MANAGER_SSL_ENABLED, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
+ m.put(JMX_MANAGER_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_CIPHERS+"\" meaning your provider''s defaults.");
+ m.put(JMX_MANAGER_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_PROTOCOLS+"\" meaning defaults of your provider.");
+ m.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, "If set to false, ciphers and protocols that permit anonymous JMX Clients are allowed. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION+"\".");
+ m.put(JMX_MANAGER_SSL_KEYSTORE,"Location of the Java keystore file containing jmx manager's own certificate and private key.");
+ m.put(JMX_MANAGER_SSL_KEYSTORE_TYPE, "For Java keystore file format, this property has the value jks (or JKS).");
+ m.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
+ m.put(JMX_MANAGER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by jmx manager.");
+ m.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
- m.put(JMX_MANAGER_PORT_NAME, "The port the jmx manager will listen on. Default is \"" + DEFAULT_JMX_MANAGER_PORT + "\". Set to zero to disable GemFire's creation of a jmx listening port.");
- m.put(JMX_MANAGER_BIND_ADDRESS_NAME, "The address the jmx manager will listen on for remote connections. Default is \"\" which causes the jmx manager to listen on the host's default address. This property is ignored if jmx-manager-port is \"0\".");
- m.put(JMX_MANAGER_HOSTNAME_FOR_CLIENTS_NAME, "The hostname that will be given to clients when they ask a locator for the location of this jmx manager. Default is \"\" which causes the locator to report the jmx manager's actual ip address as its location. This property is ignored if jmx-manager-port is \"0\".");
- m.put(JMX_MANAGER_PASSWORD_FILE_NAME, "The name of the file the jmx manager will use to only allow authenticated clients to connect. Default is \"\" which causes the jmx manager to allow all clients to connect. This property is ignored if jmx-manager-port is \"0\".");
- m.put(JMX_MANAGER_ACCESS_FILE_NAME, "The name of the file the jmx manager will use to define the access level of authenticated clients. Default is \"\" which causes the jmx manager to allow all clients all access. This property is ignored if jmx-manager-port is \"0\".");
- m.put(JMX_MANAGER_HTTP_PORT_NAME, "By default when a jmx-manager is started it will also start an http server on this port. This server is used by the GemFire Pulse application. Setting this property to zero disables the http server. It defaults to 8080. Ignored if jmx-manager is false.");
- m.put(JMX_MANAGER_UPDATE_RATE_NAME, "The rate in milliseconds at which this member will send updates to each jmx manager. Default is " + DEFAULT_JMX_MANAGER_UPDATE_RATE + ". Values must be in the range " + MIN_JMX_MANAGER_UPDATE_RATE + ".." + MAX_JMX_MANAGER_UPDATE_RATE + ".");
- m.put(MEMCACHED_PORT_NAME, "The port GemFireMemcachedServer will listen on. Default is 0. Set to zero to disable GemFireMemcachedServer.");
- m.put(MEMCACHED_PROTOCOL_NAME, "The protocol that GemFireMemcachedServer understands. Default is ASCII. Values may be ASCII or BINARY");
- m.put(MEMCACHED_BIND_ADDRESS_NAME, "The address the GemFireMemcachedServer will listen on for remote connections. Default is \"\" which causes the GemFireMemcachedServer to listen on the host's default address. This property is ignored if memcached-port is \"0\".");
- m.put(REDIS_PORT_NAME, "The port GemFireRedisServer will listen on. Default is 0. Set to zero to disable GemFireRedisServer.");
- m.put(REDIS_BIND_ADDRESS_NAME, "The address the GemFireRedisServer will listen on for remote connections. Default is \"\" which causes the GemFireRedisServer to listen on the host's default address. This property is ignored if redis-port is \"0\".");
- m.put(REDIS_PASSWORD_NAME, "The password which client of GemFireRedisServer must use to authenticate themselves. The default is none and no authentication will be required.");
- m.put(ENABLE_CLUSTER_CONFIGURATION_NAME, LocalizedStrings.AbstractDistributionConfig_ENABLE_SHARED_CONFIGURATION.toLocalizedString());
- m.put(USE_CLUSTER_CONFIGURATION_NAME, LocalizedStrings.AbstractDistributionConfig_USE_SHARED_CONFIGURATION.toLocalizedString());
- m.put(LOAD_CLUSTER_CONFIG_FROM_DIR_NAME, LocalizedStrings.AbstractDistributionConfig_LOAD_SHARED_CONFIGURATION_FROM_DIR.toLocalizedString(SharedConfiguration.CLUSTER_CONFIG_ARTIFACTS_DIR_NAME));
+ m.put(JMX_MANAGER_PORT, "The port the jmx manager will listen on. Default is \"" + DEFAULT_JMX_MANAGER_PORT + "\". Set to zero to disable GemFire's creation of a jmx listening port.");
+ m.put(JMX_MANAGER_BIND_ADDRESS, "The address the jmx manager will listen on for remote connections. Default is \"\" which causes the jmx manager to listen on the host's default address. This property is ignored if jmx-manager-port is \"0\".");
+ m.put(JMX_MANAGER_HOSTNAME_FOR_CLIENTS, "The hostname that will be given to clients when they ask a locator for the location of this jmx manager. Default is \"\" which causes the locator to report the jmx manager's actual ip address as its location. This property is ignored if jmx-manager-port is \"0\".");
+ m.put(JMX_MANAGER_PASSWORD_FILE, "The name of the file the jmx manager will use to only allow authenticated clients to connect. Default is \"\" which causes the jmx manager to allow all clients to connect. This property is ignored if jmx-manager-port is \"0\".");
+ m.put(JMX_MANAGER_ACCESS_FILE, "The name of the file the jmx manager will use to define the access level of authenticated clients. Default is \"\" which causes the jmx manager to allow all clients all access. This property is ignored if jmx-manager-port is \"0\".");
+ m.put(JMX_MANAGER_HTTP_PORT, "By default when a jmx-manager is started it will also start an http server on this port. This server is used by the GemFire Pulse application. Setting this property to zero disables the http server. It defaults to 8080. Ignored if jmx-manager is false.");
+ m.put(JMX_MANAGER_UPDATE_RATE, "The rate in milliseconds at which this member will send updates to each jmx manager. Default is " + DEFAULT_JMX_MANAGER_UPDATE_RATE + ". Values must be in the range " + MIN_JMX_MANAGER_UPDATE_RATE + ".." + MAX_JMX_MANAGER_UPDATE_RATE + ".");
+ m.put(MEMCACHED_PORT, "The port GemFireMemcachedServer will listen on. Default is 0. Set to zero to disable GemFireMemcachedServer.");
+ m.put(MEMCACHED_PROTOCOL, "The protocol that GemFireMemcachedServer understands. Default is ASCII. Values may be ASCII or BINARY");
+ m.put(MEMCACHED_BIND_ADDRESS, "The address the GemFireMemcachedServer will listen on for remote connections. Default is \"\" which causes the GemFireMemcachedServer to listen on the host's default address. This property is ignored if memcached-port is \"0\".");
+ m.put(REDIS_PORT, "The port GemFireRedisServer will listen on. Default is 0. Set to zero to disable GemFireRedisServer.");
+ m.put(REDIS_BIND_ADDRESS, "The address the GemFireRedisServer will listen on for remote connections. Default is \"\" which causes the GemFireRedisServer to listen on the host's default address. This property is ignored if redis-port is \"0\".");
+ m.put(REDIS_PASSWORD, "The password which client of GemFireRedisServer must use to authenticate themselves. The default is none and no authentication will be required.");
+ m.put(ENABLE_CLUSTER_CONFIGURATION, LocalizedStrings.AbstractDistributionConfig_ENABLE_SHARED_CONFIGURATION.toLocalizedString());
+ m.put(USE_CLUSTER_CONFIGURATION, LocalizedStrings.AbstractDistributionConfig_USE_SHARED_CONFIGURATION.toLocalizedString());
+ m.put(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, LocalizedStrings.AbstractDistributionConfig_LOAD_SHARED_CONFIGURATION_FROM_DIR.toLocalizedString(SharedConfiguration.CLUSTER_CONFIG_ARTIFACTS_DIR_NAME));
m.put(CLUSTER_CONFIGURATION_DIR, LocalizedStrings.AbstractDistributionConfig_CLUSTER_CONFIGURATION_DIR.toLocalizedString());
m.put(
- SERVER_SSL_ENABLED_NAME,
+ SERVER_SSL_ENABLED,
"If true then the cache server will only allow SSL clients to connect. Defaults to false.");
m.put(
- SERVER_SSL_CIPHERS_NAME,
+ SERVER_SSL_CIPHERS,
"List of available SSL cipher suites that are to be enabled for CacheServer. Defaults to \""
+ DEFAULT_SERVER_SSL_CIPHERS
+ "\" meaning your provider''s defaults.");
m.put(
- SERVER_SSL_PROTOCOLS_NAME,
+ SERVER_SSL_PROTOCOLS,
"List of available SSL protocols that are to be enabled for CacheServer. Defaults to \""
+ DEFAULT_SERVER_SSL_PROTOCOLS
+ "\" meaning defaults of your provider.");
m.put(
- SERVER_SSL_REQUIRE_AUTHENTICATION_NAME,
+ SERVER_SSL_REQUIRE_AUTHENTICATION,
"If set to false, ciphers and protocols that permit anonymous Clients are allowed. Defaults to \""
+ DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION + "\".");
- m.put(SERVER_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing server's or client's own certificate and private key.");
+ m.put(SERVER_SSL_KEYSTORE,"Location of the Java keystore file containing server's or client's own certificate and private key.");
- m.put(SERVER_SSL_KEYSTORE_TYPE_NAME,
+ m.put(SERVER_SSL_KEYSTORE_TYPE,
"For Java keystore file format, this property has the value jks (or JKS).");
- m.put(SERVER_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
+ m.put(SERVER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
- m.put(SERVER_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by server or client(trust store).");
+ m.put(SERVER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by server or client(trust store).");
- m.put(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+ m.put(SERVER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
m.put(
- GATEWAY_SSL_ENABLED_NAME,
+ GATEWAY_SSL_ENABLED,
"If true then the gateway receiver will only allow SSL gateway sender to connect. Defaults to false.");
m.put(
- GATEWAY_SSL_CIPHERS_NAME,
+ GATEWAY_SSL_CIPHERS,
"List of available SSL cipher suites that are to be enabled for Gateway Receiver. Defaults to \""
+ DEFAULT_GATEWAY_SSL_CIPHERS
+ "\" meaning your provider''s defaults.");
m.put(
- GATEWAY_SSL_PROTOCOLS_NAME,
+ GATEWAY_SSL_PROTOCOLS,
"List of available SSL protocols that are to be enabled for Gateway Receiver. Defaults to \""
+ DEFAULT_GATEWAY_SSL_PROTOCOLS
+ "\" meaning defaults of your provider.");
m.put(
- GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME,
+ GATEWAY_SSL_REQUIRE_AUTHENTICATION,
"If set to false, ciphers and protocols that permit anonymous gateway senders are allowed. Defaults to \""
+ DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION + "\".");
- m.put(GATEWAY_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing gateway's own certificate and private key.");
+ m.put(GATEWAY_SSL_KEYSTORE,"Location of the Java keystore file containing gateway's own certificate and private key.");
- m.put(GATEWAY_SSL_KEYSTORE_TYPE_NAME,
+ m.put(GATEWAY_SSL_KEYSTORE_TYPE,
"For Java keystore file format, this property has the value jks (or JKS).");
- m.put(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+ m.put(GATEWAY_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
- m.put(GATEWAY_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by gateway.");
+ m.put(GATEWAY_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by gateway.");
- m.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+ m.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
- m.put(HTTP_SERVICE_PORT_NAME, "If non zero, then the gemfire developer REST service will be deployed and started when the cache is created. Default value is 0.");
- m.put(HTTP_SERVICE_BIND_ADDRESS_NAME, "The address where gemfire developer REST service will listen for remote REST connections. Default is \"\" which causes the Rest service to listen on the host's default address.");
+ m.put(HTTP_SERVICE_PORT, "If non zero, then the gemfire developer REST service will be deployed and started when the cache is created. Default value is 0.");
+ m.put(HTTP_SERVICE_BIND_ADDRESS, "The address where gemfire developer REST service will listen for remote REST connections. Default is \"\" which causes the Rest service to listen on the host's default address.");
m.put(
- HTTP_SERVICE_SSL_ENABLED_NAME,
+ HTTP_SERVICE_SSL_ENABLED,
"If true then the http service like REST dev api and Pulse will only allow SSL enabled clients to connect. Defaults to false.");
m.put(
- HTTP_SERVICE_SSL_CIPHERS_NAME,
+ HTTP_SERVICE_SSL_CIPHERS,
"List of available SSL cipher suites that are to be enabled for Http Service. Defaults to \""
+ DEFAULT_HTTP_SERVICE_SSL_CIPHERS
+ "\" meaning your provider''s defaults.");
m.put(
- HTTP_SERVICE_SSL_PROTOCOLS_NAME,
+ HTTP_SERVICE_SSL_PROTOCOLS,
"List of available SSL protocols that are to be enabled for Http Service. Defaults to \""
+ DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS
+ "\" meaning defaults of your provider.");
m.put(
- HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME,
+ HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION,
"If set to false, ciphers and protocols that permit anonymous http clients are allowed. Defaults to \""
+ DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION + "\".");
- m.put(HTTP_SERVICE_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing Http Service's own certificate and private key.");
+ m.put(HTTP_SERVICE_SSL_KEYSTORE,"Location of the Java keystore file containing Http Service's own certificate and private key.");
- m.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME,
+ m.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE,
"For Java keystore file format, this property has the value jks (or JKS).");
- m.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+ m.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
- m.put(HTTP_SERVICE_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by Http Service.");
+ m.put(HTTP_SERVICE_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by Http Service.");
- m.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+ m.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
- m.put(START_DEV_REST_API_NAME, "If true then the developer(API) REST service will be started when the cache is created. Defaults to false.");
- m.put(OFF_HEAP_MEMORY_SIZE_NAME, LocalizedStrings.AbstractDistributionConfig_OFF_HEAP_MEMORY_SIZE_0.toLocalizedString(DEFAULT_OFF_HEAP_MEMORY_SIZE));
- m.put(LOCK_MEMORY_NAME, LocalizedStrings.AbstractDistributionConfig_LOCK_MEMORY.toLocalizedString(DEFAULT_LOCK_MEMORY));
- m.put(DISTRIBUTED_TRANSACTIONS_NAME, "Flag to indicate whether all transactions including JTA should be distributed transactions. Default is false, meaning colocated transactions.");
+ m.put(START_DEV_REST_API, "If true then the developer(API) REST service will be started when the cache is created. Defaults to false.");
+ m.put(OFF_HEAP_MEMORY_SIZE, LocalizedStrings.AbstractDistributionConfig_OFF_HEAP_MEMORY_SIZE_0.toLocalizedString(DEFAULT_OFF_HEAP_MEMORY_SIZE));
+ m.put(LOCK_MEMORY, LocalizedStrings.AbstractDistributionConfig_LOCK_MEMORY.toLocalizedString(DEFAULT_LOCK_MEMORY));
+ m.put(DISTRIBUTED_TRANSACTIONS, "Flag to indicate whether all transactions including JTA should be distributed transactions. Default is false, meaning colocated transactions.");
- m.put(SECURITY_SHIRO_INIT_NAME, "The name of the shiro configuration file in the classpath, e.g. shiro.ini");
+ m.put(SECURITY_SHIRO_INIT, "The name of the shiro configuration file in the classpath, e.g. shiro.ini");
dcAttDescriptions = Collections.unmodifiableMap(m);
[23/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
index 3a03cea..f5e7f8d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
@@ -36,7 +36,7 @@ import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index 2b10bdc..5f8080b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -34,8 +34,8 @@ import java.util.HashMap;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class CopyOnReadIndexDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
index df11c6d..108ea47 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
import java.util.HashMap;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
index a64180e..839f81b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
@@ -37,7 +37,7 @@ import org.junit.experimental.categories.Category;
import java.util.Collection;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index 1764849..3ee2a99 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -34,7 +34,7 @@ import java.net.URISyntaxException;
import java.util.Collection;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
index 6d030af..e14df54 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
@@ -32,7 +32,7 @@ import org.junit.experimental.categories.Category;
import java.util.ArrayList;
import java.util.List;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index a0b6e65..bb25ccd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index 3e91e66..0929567 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.Map;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
index 800c8f9..e2867c2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
@@ -26,7 +26,6 @@ import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType;
import com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Before;
import org.junit.Test;
@@ -38,7 +37,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
index 381e3ee..da35bef 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.snapshot;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.examples.snapshot.MyObject;
import com.gemstone.gemfire.cache.Cache;
@@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
public class SnapshotTestCase {
protected File store;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
index 045d82e..49a6ce6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
@@ -38,7 +38,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
index d7dd994..60790f9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
index 93a94cd..a53d62a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
index 7a4f87c..74a8b2b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
@@ -34,8 +34,8 @@ import org.junit.experimental.categories.Category;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.jayway.awaitility.Awaitility.with;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
index 56ee019..212c5a8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.cache30;
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.InternalLogWriter;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
@@ -27,7 +26,7 @@ import java.io.*;
import java.util.Properties;
import java.util.regex.Pattern;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test to make sure cache close is working.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
index 80e5da9..c133d5c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class CacheRegionsReliablityStatsCheckDUnitTest extends CacheTestCase {
public CacheRegionsReliablityStatsCheckDUnitTest(String name) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
index b9893d2..a6705ee 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
@@ -32,7 +32,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the declarative caching functionality introduced in GemFire
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
index 3a2ee73..be4c657 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index 9869e2e..7e0d552 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.util.test.TestUtil;
import java.io.*;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class CacheXmlTestCase extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 5fc0813..27205c4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -48,8 +48,8 @@ import java.net.Socket;
import java.util.*;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests the ClientMembership API including ClientMembershipListener.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index b9614cc..b6cffa0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -27,8 +27,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* Tests the client register interest
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index d38c83f..80f932e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache30;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.client.ClientCache;
@@ -24,7 +24,6 @@ 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.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 6253bad..366acf1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Distributed Ack Overflow Region with ConcurrencyChecksEnabled and OffHeap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index ebafa99..905cafc 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
index 5802d76..877c611 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -22,7 +22,6 @@ package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.internal.DistributionAdvisor;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.distributed.internal.membership.NetMember;
@@ -40,7 +39,7 @@ import java.net.UnknownHostException;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 505b1eb..e766a49 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index 2cd4961..1587179 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache30;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.test.dunit.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
index 7033533..89b32d5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Distributed Ack Region with OffHeap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index e7aaf0c..a2bee79 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -18,8 +18,6 @@ package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.CachedDeserializableFactory;
@@ -33,7 +31,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
index 969349f..35660a6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index 1ec0d65..9980e56 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index 83e2df3..73f5201 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Distributed NoAck Region with OffHeap memory.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
index d1e53f7..deefac4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
@@ -21,7 +21,6 @@
package com.gemstone.gemfire.cache30;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.RegionClearedException;
import com.gemstone.gemfire.internal.cache.RegionEntry;
@@ -35,7 +34,7 @@ import org.junit.Ignore;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This test is only for GLOBAL REPLICATE Regions. Tests are
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index 2bc57d6..0c7b17d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Global Region with ConcurrencyChecksEnabled and OffHeap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index 8d660f3..6f06758 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Global Region with OffHeap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index 90f2931..dd49966 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the basic functionality of the lru eviction
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
index 04165fc..b487ac7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests Partitioned Region with OffHeap memory.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
index 679a6be..7a98188 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test to make sure message queuing works.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index 18dab44..a3ad8f5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedMember;
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.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.ReconnectListener;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
@@ -48,7 +47,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@SuppressWarnings("serial")
public class ReconnectDUnitTest extends CacheTestCase
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
index 54bc4a4..fc088ee 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the functionality of the {@link RegionRoleListener} class.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index 21e77d8..bf5c2c8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -35,7 +35,7 @@ import java.io.ByteArrayOutputStream;
import java.util.*;
import java.util.concurrent.locks.Lock;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests region reliability defined by MembershipAttributes.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
index 385b79b..3163fd3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the functionality of the {@link RequiredRoles} class.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
index 02d89ac..06e25d0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the performance of Regions when Roles are assigned.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
index 79d90d4..2453c85 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.Region.Entry;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.internal.DM;
import com.gemstone.gemfire.distributed.internal.DMStats;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.tcp.Connection;
import com.gemstone.gemfire.test.dunit.*;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
@@ -35,7 +34,7 @@ import java.util.LinkedList;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Test to make sure slow receiver queuing is working
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
index ba5a04d..8909511 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
@@ -54,7 +54,7 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
//import com.gemstone.gemfire.internal.cache.locks.TXLockId;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
index 555d01b..8d77205 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
@@ -30,7 +30,7 @@ import java.io.FileWriter;
import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThat;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Integration tests for AbstractLauncher class. These tests require file system I/O.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
index 128e1df..552aec1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
@@ -40,7 +40,7 @@ import java.util.Properties;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
index 9d4a169..298c3d6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
@@ -27,7 +27,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The AbstractLauncherTest class is a test suite of unit tests testing the contract and functionality
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
index 0df2019..6519d44 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
@@ -29,7 +29,7 @@ import org.junit.rules.TemporaryFolder;
import java.util.concurrent.Callable;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 3f13597..3b6ad55 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -34,7 +34,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
index 6fb1702..0ac4ac8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.distributed;
import java.io.PrintStream;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This program is used to measure the amount of time it takes to
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
index 1d8bb7d..c61fbfc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
@@ -46,7 +46,7 @@ import java.util.Enumeration;
import java.util.Properties;
import java.util.concurrent.TimeoutException;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
index 57bc30c..79e19ab 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
@@ -41,7 +41,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
index acc3b75..8c5afbe 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
@@ -32,8 +32,8 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.Callable;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 77abf1d..3e153e0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -49,7 +49,7 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the ability of the {@link Locator} API to start and stop
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
index 6d34bed..64d938c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
@@ -49,7 +49,7 @@ import java.net.InetAddress;
import java.util.*;
import java.util.function.IntSupplier;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static org.junit.Assert.*;
@@ -163,7 +163,7 @@ public class LocatorJUnitTest {
public void testServerOnly() throws Exception {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
locator = Locator.startLocatorAndDS(port, tmpFile, null, props, false, true, null);
assertFalse(locator.isPeerLocator());
assertTrue(locator.isServerLocator());
@@ -175,7 +175,7 @@ public class LocatorJUnitTest {
public void testBothPeerAndServer() throws Exception {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
locator = Locator.startLocatorAndDS(port, tmpFile, null, props);
assertTrue(locator.isPeerLocator());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
index f5f43f4..d78b91b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
@@ -39,7 +39,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti
import static com.googlecode.catchexception.apis.BDDCatchException.when;
import static org.assertj.core.api.BDDAssertions.assertThat;
import static org.assertj.core.api.BDDAssertions.then;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Integration tests for LocatorLauncher. These tests require file system I/O.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index ff8ca6f..76f09b8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.distributed;
import com.gemstone.gemfire.distributed.AbstractLauncher.Status;
import com.gemstone.gemfire.distributed.LocatorLauncher.Builder;
import com.gemstone.gemfire.distributed.LocatorLauncher.LocatorState;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.*;
import com.gemstone.gemfire.internal.process.ProcessControllerFactory;
@@ -40,7 +39,7 @@ import java.lang.management.ManagementFactory;
import java.net.BindException;
import java.net.InetAddress;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
index d222ca5..7cb405b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
@@ -51,7 +51,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
index 0e87ae0..b10bbeb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
@@ -32,7 +32,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The LocatorLauncherTest class is a test suite of test cases for testing the contract and functionality of
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
index 0dee924..55fc69b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.distributed;
import com.gemstone.gemfire.distributed.internal.DM;
-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.distributed.internal.membership.InternalRole;
@@ -29,7 +28,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the setting of Roles in a DistributedSystem
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
index da7d4e4..05be3d8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
@@ -38,7 +38,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti
import static com.googlecode.catchexception.apis.BDDCatchException.when;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.BDDAssertions.then;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Integration tests for ServerLauncher class. These tests may require file system and/or network I/O.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
index a30c85f..6b73898 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.distributed;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.AbstractLauncher.Status;
import com.gemstone.gemfire.distributed.ServerLauncher.Builder;
import com.gemstone.gemfire.distributed.ServerLauncher.ServerState;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.GemFireVersion;
@@ -50,7 +49,7 @@ import java.lang.management.ManagementFactory;
import java.net.BindException;
import java.net.InetAddress;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
@@ -416,7 +415,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setForce(true)
.setMemberName(getUniqueName())
.setRedirectOutput(true)
- .set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
+ .set(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "0");
assertTrue(builder.getForce());
this.launcher = builder.build();
@@ -697,7 +696,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
.setMemberName(getUniqueName())
.setRedirectOutput(true)
.set(logLevel, "config")
- .set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
+ .set(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "0");
assertFalse(builder.getForce());
this.launcher = builder.build();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
index a3508d3..183851f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
@@ -47,7 +47,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
@@ -1299,8 +1299,8 @@ public class ServerLauncherRemoteIntegrationTest extends AbstractServerLauncherR
@Override
protected List<String> getJvmArguments() {
final List<String> jvmArguments = new ArrayList<String>();
- jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.LOG_LEVEL+"=config");
- jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.MCAST_PORT+"=0");
+ jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + DistributedSystemConfigProperties.LOG_LEVEL+"=config");
+ jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + DistributedSystemConfigProperties.MCAST_PORT+"=0");
return jvmArguments;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
index 0d1f4f3..c2036c7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
@@ -45,7 +45,7 @@ import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The ServerLauncherTest class is a test suite of unit tests testing the contract, functionality and invariants
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
index e40d287..5b61d76 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
index 1da0de4..9aee361 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
@@ -27,7 +27,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class Bug40751DUnitTest extends CacheTestCase {
@@ -100,7 +100,7 @@ public class Bug40751DUnitTest extends CacheTestCase {
Properties props = new Properties();
System.setProperty("p2p.oldIO", "true");
props.setProperty(CONSERVE_SOCKETS, "true");
- // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "12333");
+ // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "12333");
// props.setProperty(DistributionConfig.DISABLE_TCP_NAME, "true");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index 97c3a63..10ebdaf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.distributed.internal;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 2c5391d..d94dab1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.distributed.internal;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.UnmodifiableException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
index b6eb757..39a50b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.admin.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
import com.gemstone.gemfire.distributed.internal.membership.NetView;
@@ -36,7 +35,7 @@ import org.junit.Assert;
import java.net.InetAddress;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This class tests the functionality of the {@link
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index 442c3d7..e1e38d3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.distributed.internal;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.Config;
import com.gemstone.gemfire.internal.ConfigSource;
@@ -38,7 +37,7 @@ import java.util.Enumeration;
import java.util.Properties;
import java.util.logging.Level;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
index b422d55..bcc4041 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
@@ -23,7 +23,7 @@ import util.TestException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
/**
* A little class for testing the local DistributionManager
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
index e7b225b..c0aa6c5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
@@ -34,7 +34,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class ProductUseLogDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
index 94b153b..a936dd1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
@@ -27,8 +27,8 @@ import org.junit.experimental.categories.Category;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
@Category(IntegrationTest.class)
public class DLockReentrantLockJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
index 5291181..d13f476 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
@@ -40,7 +40,7 @@ import java.io.File;
import java.net.InetAddress;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
index ee430f1..3d88acd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
@@ -39,7 +39,7 @@ import java.util.Properties;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category({ UnitTest.class, SecurityTest.class })
public class GMSAuthenticatorJUnitTest {
[19/55] [abbrv] incubator-geode git commit: GEODE-1377: Renaming
SystemConfigurationProperties to DistributedSystemConfigProperties
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
index 1bf75b8..fdf1f7c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
@@ -41,7 +41,7 @@ import java.io.FileNotFoundException;
import java.util.Properties;
import java.util.Scanner;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
index 8f2a6f9..78ee588 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.logging;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -36,8 +36,8 @@ import java.io.File;
import java.io.FileInputStream;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
index ee43682..886c2ac 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
@@ -29,7 +29,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests performance of logging when level is OFF.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index f9eed64..6a3cf07 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -39,7 +39,7 @@ import org.junit.rules.TestName;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.logging.log4j.custom.CustomConfiguration.*;
import static org.assertj.core.api.Assertions.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
index b08c860..43a8d4b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.util.ObjectSizer;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.*;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Test;
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
import java.util.UUID;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -40,7 +40,7 @@ public class InlineKeyJUnitTest {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "1m");
+ props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "1m");
GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).create();
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
index 12f6d9b..78aed21 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.offheap;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.query.*;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
@@ -29,8 +29,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -48,7 +48,7 @@ public class OffHeapIndexJUnitTest {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "100m");
+ props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "100m");
this.gfc = (GemFireCacheImpl) new CacheFactory(props).create();
}
@After
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
index 70c709f..f25b884 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.compression.Compressor;
import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.cache.*;
import com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier;
import com.gemstone.gemfire.internal.offheap.annotations.Released;
@@ -40,8 +40,8 @@ import java.util.Arrays;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
@@ -64,7 +64,7 @@ public abstract class OffHeapRegionBase {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
+ props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).setPdxPersistent(isPersistent).create();
unconfigureOffHeapStorage();
return result;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
index e7fc8b7..ba1b8d3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.HeapDataOutputStream;
import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -37,8 +37,8 @@ import java.io.Serializable;
import java.sql.Timestamp;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.*;
/**
@@ -64,7 +64,7 @@ public class OffHeapValidationJUnitTest {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
+ props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).create();
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index f8c3d1a..43406d3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.cache.DistributedRegion;
@@ -43,7 +42,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.jayway.awaitility.Awaitility.with;
import static org.hamcrest.CoreMatchers.equalTo;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
index fcd1448..eced418 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
@@ -17,15 +17,15 @@
package com.gemstone.gemfire.internal.offheap;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Test;
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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
@@ -37,7 +37,7 @@ public class TxReleasesOffHeapOnCloseJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "1m");
+ props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "1m");
cache = new CacheFactory(props).create();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 3482f20..09cf61a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.statistics;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.*;
import com.gemstone.gemfire.cache.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
index eb2201f..69a3c26 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
@@ -31,7 +31,7 @@ import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.atomic.AtomicReference;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
index ea927cc..e5aa0fe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
@@ -24,7 +24,7 @@ import org.junit.experimental.categories.Category;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
@SuppressWarnings({ "rawtypes", "unchecked" })
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
index 59c36f5..9d314dd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
@@ -35,7 +35,7 @@ import static com.jayway.awaitility.Awaitility.to;
import static com.jayway.awaitility.Awaitility.waitAtMost;
import static org.hamcrest.Matchers.equalTo;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* This class checks and verifies various data and operations exposed through
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index d0ffdd0..1d7a5a0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -23,7 +23,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.DistributedMember;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
@@ -34,7 +33,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Client health stats check
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
index 15c1b50..cbf9be4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
@@ -16,13 +16,12 @@
*/
package com.gemstone.gemfire.management;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.query.data.Position;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.management.internal.ManagementConstants;
import com.gemstone.gemfire.management.internal.beans.QueryDataFunction;
@@ -45,7 +44,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index 6e45705..6230119 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
@@ -31,7 +31,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index a4a2ed2..08167ab 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -16,13 +16,12 @@
*/
package com.gemstone.gemfire.management;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedMember;
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.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.statistics.SampleCollector;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
index 1bcdb36..d8f0476 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
@@ -36,7 +36,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the off-heap additions to the RegionMXBean and MemberMXBean JMX interfaces.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
index 78e00db..288b31e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 583e48f..05c9119 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -27,7 +27,6 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DurableClientAttributes;
-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.tier.InternalClientMembership;
@@ -42,7 +41,7 @@ import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Tests the UniversalMembershipListenerAdapter.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
index 0b65874..da2610a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.management.bean.stats;
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.NanoTimer;
import com.gemstone.gemfire.internal.cache.CachePerfStats;
@@ -35,7 +34,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
index b1d8ba7..54b93e8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
@@ -16,11 +16,10 @@
*/
package com.gemstone.gemfire.management.bean.stats;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
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.NanoTimer;
import org.junit.After;
@@ -28,7 +27,7 @@ import org.junit.Before;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
index f7fc8ea..01acabf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.dunit.*;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
index 0111d6d..2a72c31 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.management.internal.cli;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.Rule;
@@ -30,7 +29,7 @@ import org.junit.rules.TestName;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index f9cfd0c..60e9268 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.internal.cli.CommandManager;
@@ -44,7 +43,7 @@ import java.util.regex.Pattern;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Base class for all the CLI/gfsh command dunit tests.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 47183af..dad9102 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
@@ -45,7 +44,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index f6013ec..d2f142d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -22,8 +22,6 @@ import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
import com.gemstone.gemfire.compression.SnappyCompressor;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -60,7 +58,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.jayway.awaitility.Awaitility.waitAtMost;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index f40675c..067847a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -17,8 +17,6 @@
package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
@@ -41,7 +39,7 @@ import java.io.IOException;
import java.util.Properties;
import java.util.regex.Pattern;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 09f51d0..b06754b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -21,8 +21,6 @@ import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
import com.gemstone.gemfire.compression.SnappyCompressor;
import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -48,7 +46,7 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index 09cd629..73b8818 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.management.DistributedRegionMXBean;
import com.gemstone.gemfire.management.ManagementService;
@@ -42,7 +41,7 @@ import java.util.Properties;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Dunit class for testing gemfire function commands : execute function, destroy function, list function
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 0ced468..3bbea2f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -56,7 +56,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Dunit class for testing gemfire data commands : get, put, remove, select, rebalance
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index ebfe3f0..3ba03a2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.management.DistributedRegionMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagerMXBean;
@@ -41,7 +40,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index 8683ef3..fadfa4d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
index 4ff0325..0e909c1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
@@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase.commandResultToString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index fc7aaab..4166499 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -19,8 +19,6 @@ package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.query.Index;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -40,7 +38,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
@Category(DistributedTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index 1aa21f8..411a80a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -35,7 +35,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertNotNull;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases testing the proper
@@ -123,7 +123,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas
private Properties createDistributedSystemProperties(final String gemfireName) {
final Properties distributedSystemProperties = new Properties();
- distributedSystemProperties.setProperty(SystemConfigurationProperties.LOG_LEVEL, getDUnitLogLevel());
+ distributedSystemProperties.setProperty(DistributedSystemConfigProperties.LOG_LEVEL, getDUnitLogLevel());
distributedSystemProperties.setProperty(NAME, gemfireName);
return distributedSystemProperties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index 2352113..91b8671 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -16,13 +16,11 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.RegionEntryContext;
import com.gemstone.gemfire.management.cli.Result.Status;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
@@ -39,7 +37,7 @@ 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.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 26b858e..61708a6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.query.Index;
import com.gemstone.gemfire.cache.query.IndexStatistics;
import com.gemstone.gemfire.cache.query.IndexType;
import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.lang.MutableIdentifiable;
import com.gemstone.gemfire.internal.lang.ObjectUtils;
import com.gemstone.gemfire.internal.lang.StringUtils;
@@ -44,7 +43,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the index-based GemFire shell
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index 7703a7b..e5dc688 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -19,8 +19,6 @@ package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.management.cli.Result;
@@ -41,7 +39,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index d675b14..44438f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -16,10 +16,9 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.lang.ThreadUtils;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 6bdf917..6d6e9ce 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
@@ -42,7 +41,7 @@ import java.util.Properties;
import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
import static com.gemstone.gemfire.test.dunit.Assert.fail;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* Dunit class for testing gemfire function commands : export logs
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index e53e6ea..c1877fe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -16,13 +16,11 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -48,8 +46,8 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.CopyOnWriteArrayList;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index 3b1f75e..c527809 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
import com.gemstone.gemfire.internal.ClassBuilder;
@@ -44,7 +43,7 @@ import java.io.IOException;
import java.util.Properties;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
import static com.gemstone.gemfire.management.internal.cli.CliUtil.getAllNormalMembers;
import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index e94aa5a..f7a17f2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.execute.Function;
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.distributed.DistributedLockService;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.deadlock.GemFireDeadlockDetector;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.management.cli.Result;
@@ -49,7 +48,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index 6bb228c..25b8b87 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -44,7 +44,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
@Category(DistributedTest.class)
public class ShowMetricsDUnitTest extends CliCommandTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 44600f6..6854cf2 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,10 +16,8 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.management.cli.Result.Status;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
@@ -35,7 +33,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.assertFalse;
import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 f97b21c..069e929 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,8 +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.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.internal.ClassBuilder;
import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.internal.FileUtil;
@@ -155,7 +154,7 @@ public class UserCommandsDUnitTest extends CliCommandTestBase {
});
Properties properties = new Properties();
- properties.setProperty(SystemConfigurationProperties.USER_COMMAND_PACKAGES, "junit.ucdunit");
+ properties.setProperty(DistributedSystemConfigProperties.USER_COMMAND_PACKAGES, "junit.ucdunit");
setUpJmxManagerOnVm0ThenConnect(properties);
CommandResult cmdResult = executeCommand("ucdunitcmd");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
index 6e55000..905fd16 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
import java.util.List;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index 06e5fbb..2dd880a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.DiskStoreFactory;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.DM;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
@@ -47,7 +46,7 @@ import java.io.IOException;
import java.net.InetAddress;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
index 97b56d3..1cef3d4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.management.internal.configuration;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
import com.gemstone.gemfire.test.dunit.VM;
@@ -39,7 +38,7 @@ import java.util.Arrays;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
import static com.gemstone.gemfire.test.dunit.Host.getHost;
import static com.jayway.awaitility.Awaitility.waitAtMost;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
index d2a05fc..7485e92 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
@@ -42,7 +42,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index cbe7c69..1ad2efd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -32,8 +32,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is for testing client IDs
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index 3f8d758..9b79b67 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -31,8 +31,8 @@ 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.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
/**
* This is for testing subscriptions
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 d54c68a..822dc47 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
@@ -37,7 +37,7 @@ import java.io.StringWriter;
import java.security.Principal;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class ExampleJSONAuthorization implements AccessControl, Authenticator {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
index 210bca1..dfd7763 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* this test and ShiroUtilWithIniFileJunitTest uses the same test body, but initialize the SecurityUtils differently.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
index be1f8f1..b3fb6e8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
/**
* this test and ShiroUtilCustomRealmJUunitTest uses the same test body, but initialize the SecurityUtils differently.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 8893a99..fcbf04e 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
@@ -44,7 +44,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class JSONAuthorization implements AccessControl, Authenticator {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
index e2e951f..b753c6e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
@@ -18,13 +18,11 @@ package com.gemstone.gemfire.management.internal.security;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import org.junit.rules.ExternalResource;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
public class JsonAuthorizationCacheStartRule extends ExternalResource {
private Cache cache;
[52/55] [abbrv] incubator-geode git commit: GEODE-1464: remove sqlf
code
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
index c4a8e27..fff9bab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
@@ -87,7 +87,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
protected static final int REQUIRES_NOTIFICATION_MASK = 0x8000;
private static final int HAS_CACHE_SERVER_MASK = 0x10000;
private static final int REQUIRES_OLD_VALUE_MASK = 0x20000;
- private static final int MEMBER_UNINITIALIZED_MASK = 0x40000;
+ // unused 0x40000;
private static final int PERSISTENCE_INITIALIZED_MASK = 0x80000;
//Important below mentioned bit masks are not available
/**
@@ -229,8 +229,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
CacheProfile prof = (CacheProfile)profile;
// if region in cache is not yet initialized, exclude
- if (!prof.regionInitialized // fix for bug 41102
- || prof.memberUnInitialized) {
+ if (!prof.regionInitialized) { // fix for bug 41102
return false;
}
@@ -269,10 +268,6 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
if (!cp.regionInitialized) {
return false;
}
- // if member is not yet initialized, exclude
- if (cp.memberUnInitialized) {
- return false;
- }
if (!cp.cachedOrAllEventsWithListener()) {
return false;
}
@@ -327,8 +322,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
public boolean include(Profile profile) {
assert profile instanceof CacheProfile;
CacheProfile cp = (CacheProfile)profile;
- if (cp.dataPolicy.withReplication() && cp.regionInitialized
- && !cp.memberUnInitialized) {
+ if (cp.dataPolicy.withReplication() && cp.regionInitialized) {
return true;
}
return false;
@@ -350,10 +344,6 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
if (!cp.regionInitialized) {
return false;
}
- // if member is not yet initialized, exclude
- if (cp.memberUnInitialized) {
- return false;
- }
DataPolicy dp = cp.dataPolicy;
return dp.withStorage();
}
@@ -544,14 +534,6 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
*/
public boolean regionInitialized;
- /**
- * True when member is still not ready to receive cache operations. Note
- * that {@link #regionInitialized} may be still true so other members can
- * proceed with GII etc. Currently used by SQLFabric to indicate that DDL
- * replay is in progress and so cache operations/functions should not be
- * routed to that node.
- */
- public boolean memberUnInitialized = false;
/**
* True when a members persistent store is initialized. Note that
@@ -615,7 +597,6 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
if (this.isGatewayEnabled) s |= IS_GATEWAY_ENABLED_MASK;
if (this.isPersistent) s |= PERSISTENT_MASK;
if (this.regionInitialized) s|= REGION_INITIALIZED_MASK;
- if (this.memberUnInitialized) s |= MEMBER_UNINITIALIZED_MASK;
if (this.persistentID != null) s|= PERSISTENT_ID_MASK;
if (this.hasCacheServer) s|= HAS_CACHE_SERVER_MASK;
if (this.requiresOldValueInEvents) s|= REQUIRES_OLD_VALUE_MASK;
@@ -693,7 +674,6 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
this.isGatewayEnabled = (s & IS_GATEWAY_ENABLED_MASK) != 0;
this.isPersistent = (s & PERSISTENT_MASK) != 0;
this.regionInitialized = ( (s & REGION_INITIALIZED_MASK) != 0 );
- this.memberUnInitialized = (s & MEMBER_UNINITIALIZED_MASK) != 0;
this.hasCacheServer = ( (s & HAS_CACHE_SERVER_MASK) != 0 );
this.requiresOldValueInEvents = ((s & REQUIRES_OLD_VALUE_MASK) != 0);
this.persistenceInitialized = (s & PERSISTENCE_INITIALIZED_MASK) != 0;
@@ -890,8 +870,6 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
sb.append("; scope=" + this.scope);
sb.append("; regionInitialized=").append(
String.valueOf(this.regionInitialized));
- sb.append("; memberUnInitialized=").append(
- String.valueOf(this.memberUnInitialized));
sb.append("; inRecovery=" + this.inRecovery);
sb.append("; subcription=" + this.subscriptionAttributes);
sb.append("; isPartitioned=" + this.isPartitioned);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
index bb595d1..e982e32 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
@@ -362,7 +362,7 @@ public class CacheServerLauncher {
}
// -J-Djava.awt.headless=true has been added for Mac platform where it
- // causes an icon to appear for sqlf launched procs
+ // causes an icon to appear for launched procs
// TODO: check which library/GemFire code causes awt to be touched
vmArgs.add("-Djava.awt.headless=true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
index 83b0a58..ae60056 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
@@ -39,13 +39,6 @@ public class CachedDeserializableFactory {
public static boolean STORE_ALL_VALUE_FORMS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "STORE_ALL_VALUE_FORMS");
/**
- * Currently GFE always wants a CachedDeserializable wrapper.
- */
- public static final boolean preferObject() {
- return false;
- }
-
- /**
* Creates and returns an instance of CachedDeserializable that contains the
* specified byte array.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
index b53ed31..012a77f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
@@ -47,61 +47,7 @@ public class ColocationHelper {
/** Logging mechanism for debugging */
private static final Logger logger = LogService.getLogger();
- /**
- * An utility method to retrieve colocated region name of a given partitioned
- * region without waiting on initialize
- *
- * @param partitionedRegion
- * @return colocated PartitionedRegion
- * @since GemFire cheetah
- */
- public static PartitionedRegion getColocatedRegionName(
- final PartitionedRegion partitionedRegion) {
- Assert.assertTrue(partitionedRegion != null); // precondition1
- String colocatedWith = partitionedRegion.getPartitionAttributes().getColocatedWith();
- if (colocatedWith == null) {
- // the region is not colocated with any region
- return null;
- }
- PartitionedRegion colocatedPR = partitionedRegion.getColocatedWithRegion();
- if (colocatedPR != null && !colocatedPR.isLocallyDestroyed
- && !colocatedPR.isDestroyed()) {
- return colocatedPR;
- }
- Region prRoot = PartitionedRegionHelper.getPRRoot(partitionedRegion
- .getCache());
- PartitionRegionConfig prConf = (PartitionRegionConfig)prRoot
- .get(getRegionIdentifier(colocatedWith));
- int prID = -1;
- try {
- if (prConf == null) {
- colocatedPR = getColocatedPR(partitionedRegion, colocatedWith);
- }
- else {
- prID = prConf.getPRId();
- colocatedPR = PartitionedRegion.getPRFromId(prID);
- if (colocatedPR == null && prID > 0) {
- // colocatedPR might have not called registerPartitionedRegion() yet, but since prID is valid,
- // we are able to get colocatedPR and do colocatedPR.waitOnBucketMetadataInitialization()
- colocatedPR = getColocatedPR(partitionedRegion, colocatedWith);
- }
- }
- }
- catch (PRLocallyDestroyedException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("PRLocallyDestroyedException : Region with prId=" + prID
- + " is locally destroyed on this node", e);
- }
- }
- return colocatedPR;
- }
- private static PartitionedRegion getColocatedPR(
- final PartitionedRegion partitionedRegion, final String colocatedWith) {
- PartitionedRegion colocatedPR = (PartitionedRegion) partitionedRegion
- .getCache().getPartitionedRegion(colocatedWith, false);
- assert colocatedPR != null;
- return colocatedPR;
- }
+
/** Whether to ignore missing parallel queues on restart
* if they are not attached to the region. See bug 50120. Mutable
* for tests.
@@ -517,17 +463,6 @@ public class ColocationHelper {
return prRegion;
}
-
- // Gemfirexd will skip initialization for PR, so just get region name without waitOnInitialize
- public static PartitionedRegion getLeaderRegionName(PartitionedRegion prRegion) {
- PartitionedRegion parentRegion;
-
- while((parentRegion = getColocatedRegionName(prRegion)) != null) {
- prRegion = parentRegion;
- }
-
- return prRegion;
- }
private static String getRegionIdentifier(String regionName) {
if (regionName.startsWith("/")) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyOperation.java
index e267190..5bfb3cc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyOperation.java
@@ -129,9 +129,6 @@ public class DestroyOperation extends DistributedCacheOperation
@Retained
protected final InternalCacheEvent createEvent(DistributedRegion rgn)
throws EntryNotFoundException {
- if (rgn.keyRequiresRegionContext()) {
- ((KeyWithRegionContext)this.key).setRegionContext(rgn);
- }
EntryEventImpl ev = createEntryEvent(rgn);
boolean evReturned = false;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
index e015460..5da0d9a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
@@ -85,13 +85,6 @@ public interface DiskEntry extends RegionEntry {
* @param context
*/
public void handleValueOverflow(RegionEntryContext context);
-
- /**
- * In some cases we need to do something just after we unset the value
- * from a DiskEntry that has been moved (i.e. overflowed) to disk.
- * @param context
- */
- public void afterValueOverflow(RegionEntryContext context);
/**
* Returns true if the DiskEntry value is equal to {@link Token#DESTROYED}, {@link Token#REMOVED_PHASE1}, or {@link Token#REMOVED_PHASE2}.
@@ -247,27 +240,6 @@ public interface DiskEntry extends RegionEntry {
}
}
}
-
- /**
- * Returns false if the entry is INVALID (or LOCAL_INVALID). Determines this
- * without faulting in the value from disk.
- *
- * @since GemFire 3.2.1
- */
- /* TODO prpersist - Do we need this method? It was added by the sqlf merge
- static boolean isValid(DiskEntry entry, DiskRegion dr) {
- synchronized (entry) {
- if (entry.isRecovered()) {
- // We have a recovered entry whose value is still on disk.
- // So take a peek at it without faulting it in.
- //long id = entry.getDiskId().getKeyId();
- //entry.getDiskId().setKeyId(-id);
- byte bits = dr.getBits(entry.getDiskId());
- //TODO Asif:Check if resetting is needed
- return !EntryBits.isInvalid(bits) && !EntryBits.isLocalInvalid(bits);
- }
- }
- }*/
static boolean isOverflowedToDisk(DiskEntry de, DiskRegion dr, DistributedRegion.DiskPosition dp,RegionEntryContext context) {
Object v = null;
@@ -372,10 +344,6 @@ public interface DiskEntry extends RegionEntry {
dr.releaseReadLock();
}
}
- final boolean isEagerDeserialize = entry.isEagerDeserialize();
- if (isEagerDeserialize) {
- entry.clearEagerDeserialize();
- }
if (Token.isRemovedFromDisk(v)) {
// fix for bug 31757
return false;
@@ -386,30 +354,15 @@ public interface DiskEntry extends RegionEntry {
entry.setSerialized(false);
entry.value = cd.getDeserializedForReading();
- //For SQLFire we prefer eager deserialized
-// if(v instanceof ByteSource) {
-// entry.setEagerDeserialize();
-// }
} else {
// don't serialize here if it is not already serialized
Object tmp = cd.getValue();
- //For SQLFire we prefer eager deserialized
-// if(v instanceof ByteSource) {
-// entry.setEagerDeserialize();
-// }
if (tmp instanceof byte[]) {
byte[] bb = (byte[])tmp;
entry.value = bb;
entry.setSerialized(true);
}
- else if (isEagerDeserialize && tmp instanceof byte[][]) {
- // optimize for byte[][] since it will need to be eagerly deserialized
- // for SQLFabric
- entry.value = tmp;
- entry.setEagerDeserialize();
- entry.setSerialized(true);
- }
else {
try {
HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
@@ -437,12 +390,6 @@ public interface DiskEntry extends RegionEntry {
entry.value = v;
entry.setSerialized(false);
}
- else if (isEagerDeserialize && v instanceof byte[][]) {
- // optimize for byte[][] since it will need to be eagerly deserialized
- // for SQLFabric
- entry.value = v;
- entry.setEagerDeserialize();
- }
else if (v == Token.INVALID) {
entry.setInvalid();
}
@@ -460,11 +407,7 @@ public interface DiskEntry extends RegionEntry {
return false;
}
}
- if (CachedDeserializableFactory.preferObject()) {
- entry.value = preparedValue;
- entry.setEagerDeserialize();
- }
- else {
+ {
try {
HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
BlobHelper.serializeTo(preparedValue, hdos);
@@ -833,9 +776,7 @@ public interface DiskEntry extends RegionEntry {
// to the file using the off-heap memory with no extra copying.
// So we give preference to getRawNewValue over getCachedSerializedNewValue
Object rawValue = null;
- if (!event.hasDelta()) {
- // We don't do this for the delta case because getRawNewValue returns delta
- // and we want to write the entire new value to disk.
+ {
rawValue = event.getRawNewValue();
if (wrapOffHeapReference(rawValue)) {
return new OffHeapValueWrapper((StoredObject) rawValue);
@@ -969,13 +910,8 @@ public interface DiskEntry extends RegionEntry {
// Second, do the stats done for the current recovered value
if (re.getRecoveredKeyId() < 0) {
if (!entry.isValueNull()) {
- try {
- entry.handleValueOverflow(region);
- entry.setValueWithContext(region, null); // fixes bug 41119
- }finally {
- entry.afterValueOverflow(region);
- }
-
+ entry.handleValueOverflow(region);
+ entry.setValueWithContext(region, null); // fixes bug 41119
}
dr.incNumOverflowOnDisk(1L);
dr.incNumOverflowBytesOnDisk(did.getValueLength());
@@ -989,11 +925,7 @@ public interface DiskEntry extends RegionEntry {
}
else {
//The new value in the entry needs to be set after the disk writing
- // has succeeded. If not , for GemFireXD , it is possible that other thread
- // may pick this transient value from region entry ( which for
- //offheap will eventually be released ) as index key,
- //given that this operation is bound to fail in case of
- //disk access exception.
+ // has succeeded.
//entry.setValueWithContext(region, newValue); // OFFHEAP newValue already prepared
@@ -1008,10 +940,7 @@ public interface DiskEntry extends RegionEntry {
if (dr.isBackup()) {
dr.testIsRecoveredAndClear(did); // fixes bug 41409
if (dr.isSync()) {
- //In case of compression the value is being set first
- // because atleast for now , GemFireXD does not support compression
- // if and when it does support, this needs to be taken care of else
- // we risk Bug 48965
+ //In case of compression the value is being set first
if (AbstractRegionEntry.isCompressible(dr, newValue)) {
entry.setValueWithContext(region, newValue); // OFFHEAP newValue already prepared
@@ -1134,12 +1063,8 @@ public interface DiskEntry extends RegionEntry {
false));
} else {
if (!oldValueWasNull) {
- try {
- entry.handleValueOverflow(context);
- entry.setValueWithContext(context,null); // fixes bug 41119
- }finally {
- entry.afterValueOverflow(context);
- }
+ entry.handleValueOverflow(context);
+ entry.setValueWithContext(context,null); // fixes bug 41119
}
}
if (entry instanceof LRUEntry) {
@@ -1218,11 +1143,6 @@ public interface DiskEntry extends RegionEntry {
boolean lruFaultedIn = false;
boolean done = false;
try {
- //Asif: If the entry is instance of LRU then DidkRegion cannot be null.
- //Since SqlFabric is accessing this method direcly & it passes the owning region,
- //if the region happens to be persistent PR type, the owning region passed is PR,
- // but it will have DiskRegion as null. SqlFabric takes care of passing owning region
- // as BucketRegion in case of Overflow type entry. This is fix for Bug # 41804
if ( entry instanceof LRUEntry && !dr.isSync() ) {
synchronized (entry) {
DiskId did = entry.getDiskId();
@@ -1391,10 +1311,8 @@ public interface DiskEntry extends RegionEntry {
* Sets the value in the entry.
* This is only called by the faultIn code once it has determined that
* the value is no longer in memory.
- * return the result will only be off-heap if the value is a sqlf ByteSource. Otherwise result will be on-heap.
* Caller must have "entry" synced.
*/
- @Retained
private static Object readValueFromDisk(DiskEntry entry, DiskRecoveryStore region) {
DiskRegionView dr = region.getDiskRegionView();
@@ -1407,16 +1325,8 @@ public interface DiskEntry extends RegionEntry {
synchronized (did) {
Object value = getValueFromDisk(dr, did, null);
if (value == null) return null;
- @Unretained Object preparedValue = setValueOnFaultIn(value, did, entry, dr, region);
- // For Sqlfire we want to return the offheap representation.
- // So we need to retain it for the caller to release.
- /*if (preparedValue instanceof ByteSource) {
- // This is the only case in which we return a retained off-heap ref.
- ((ByteSource)preparedValue).retain();
- return preparedValue;
- } else */{
- return value;
- }
+ setValueOnFaultIn(value, did, entry, dr, region);
+ return value;
}
} finally {
dr.releaseReadLock();
@@ -1464,16 +1374,7 @@ public interface DiskEntry extends RegionEntry {
static Object readRawValue(byte[] valueBytes, Version version,
ByteArrayDataInput in) {
- /*
- final StaticSystemCallbacks sysCb;
- if (version != null && (sysCb = GemFireCacheImpl.FactoryStatics
- .systemCallbacks) != null) {
- // may need to change serialized shape for SQLFire
- return sysCb.fromVersion(valueBytes, false, version, in);
- }
- else */ {
- return valueBytes;
- }
+ return valueBytes;
}
public static void incrementBucketStats(Object owner,
@@ -1521,12 +1422,6 @@ public interface DiskEntry extends RegionEntry {
did = entry.getDiskId();
}
- // Notify the SQLFire IndexManager if present
- /* final IndexUpdater indexUpdater = region.getIndexUpdater();
- if(indexUpdater != null && dr.isSync()) {
- indexUpdater.onOverflowToDisk(entry);
- }*/
-
int change = 0;
boolean scheduledAsyncHere = false;
dr.acquireReadLock();
@@ -1561,13 +1456,8 @@ public interface DiskEntry extends RegionEntry {
// do the stats when it is actually written to disk
} else {
region.updateSizeOnEvict(entry.getKey(), oldSize);
- //did.setValueSerializedSize(byteSizeOnDisk);
- try {
- entry.handleValueOverflow(region);
- entry.setValueWithContext(region,null);
- }finally {
- entry.afterValueOverflow(region);
- }
+ entry.handleValueOverflow(region);
+ entry.setValueWithContext(region,null);
movedValueToDisk = true;
change = ((LRUClockNode)entry).updateEntrySize(ccHelper);
}
@@ -1648,12 +1538,8 @@ public interface DiskEntry extends RegionEntry {
dr.incNumOverflowBytesOnDisk(did.getValueLength());
incrementBucketStats(region, 0/*InVM*/, 0/*OnDisk*/,
did.getValueLength());
- try {
- entry.handleValueOverflow(region);
- entry.setValueWithContext(region,null);
- }finally {
- entry.afterValueOverflow(region);
- }
+ entry.handleValueOverflow(region);
+ entry.setValueWithContext(region,null);
}
//See if we the entry we wrote to disk has the same tag
@@ -1769,12 +1655,8 @@ public interface DiskEntry extends RegionEntry {
dr.incNumOverflowBytesOnDisk(did.getValueLength());
incrementBucketStats(region, 0/*InVM*/, 0/*OnDisk*/,
did.getValueLength());
- try {
- entry.handleValueOverflow(region);
- entry.setValueWithContext(region,null);
- }finally {
- entry.afterValueOverflow(region);
- }
+ entry.handleValueOverflow(region);
+ entry.setValueWithContext(region,null);
}
} catch (RegionClearedException ignore) {
// no need to do the op since it was clobbered by a region clear
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
index 018a065..c6533a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
@@ -2435,8 +2435,6 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Additional flags for a disk region that are persisted in its meta-data.
- * Currently only few for GemFireXD added here but all other boolean flags also
- * be better moved here.
*
* @since GemFire 7.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
index a2092fd..3f511f0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
@@ -791,8 +791,6 @@ public class DiskRegion extends AbstractDiskRegion {
DiskId id = de.getDiskId();
if (id != null) {
synchronized (id) {
- // SQLFabric: give a chance to copy key from value bytes when key
- // is just a pointer to value row
re.setValueToNull(); // TODO why call _setValue twice in a row?
re.removePhase2();
id.unmarkForWriting();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
index 9bb148b..3e005cb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
@@ -83,18 +83,6 @@ public final class DiskWriteAttributesImpl implements DiskWriteAttributes
public static final String SYNCHRONOUS_PROPERTY = "synchronous";
/**
- * The property used to specify the base directory for Sql Fabric persistence
- * of Gateway Queues, Tables, Data Dictionary etc.
- */
- public static final String SYS_PERSISTENT_DIR = "sys-disk-dir";
-
- /**
- * The system property for {@link #SYS_PERSISTENT_DIR}.
- */
- public static final String SYS_PERSISTENT_DIR_PROP = "sqlfabric."
- + SYS_PERSISTENT_DIR;
-
- /**
* Default disk directory size in megabytes
*
* @since GemFire 5.1
@@ -477,83 +465,4 @@ public final class DiskWriteAttributesImpl implements DiskWriteAttributes
{
return DEFAULT_SYNC_DWA;
}
-
-
- // Asif: Sql Fabric related helper methods.
- // These static functions need to be moved to a better place.
- // preferably in sql Fabric source tree but since GatewayImpl is also
- // utilizing it, we have no option but to keep it here.
- public static String generateOverFlowDirName(String dirName) {
- dirName = generatePersistentDirName(dirName);
- final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if (cache == null) {
- throw new CacheClosedException(
- "DiskWriteAttributesImpl::generateOverFlowDirName: no cache found.");
- }
- /* [sumedh] no need of below since sys-disk-dir is VM specific anyways
- char fileSeparator = System.getProperty("file.separator").charAt(0);
- DistributedMember member = cache.getDistributedSystem()
- .getDistributedMember();
- String host = member.getHost();
- int pid = member.getProcessId();
- final StringBuilder temp = new StringBuilder(dirName);
- temp.append(fileSeparator);
- temp.append(host);
- temp.append('-');
- temp.append(pid);
- return temp.toString();
- */
- return dirName;
- }
-
- public static String generatePersistentDirName(String dirPath) {
- String baseDir = System.getProperty(SYS_PERSISTENT_DIR_PROP);
- if (baseDir == null) {
- //Kishor : TODO : Removing old wan related code
- //baseDir = GatewayQueueAttributes.DEFAULT_OVERFLOW_DIRECTORY;
- baseDir = ".";
- }
- if (dirPath != null) {
- File dirProvided = new File(dirPath);
- // Is the directory path absolute?
- // For Windows this will check for drive letter. However, we want
- // to allow for no drive letter so prepend the drive.
- boolean isAbsolute = dirProvided.isAbsolute();
- if (!isAbsolute) {
- String driveName;
- // get the current drive for Windows and prepend
- if ((dirPath.charAt(0) == '/' || dirPath.charAt(0) == '\\')
- && (driveName = getCurrentDriveName()) != null) {
- isAbsolute = true;
- dirPath = driveName + dirPath;
- }
- }
- if (!isAbsolute) {
- // relative path so resolve it relative to parent dir
- dirPath = new File(baseDir, dirPath).getAbsolutePath();
- }
- }
- else {
- dirPath = baseDir;
- }
- return dirPath;
- }
-
- /**
- * Get the drive name of current working directory for windows else return
- * null for non-Windows platform (somewhat of a hack -- see if something
- * cleaner can be done for this).
- */
- public static String getCurrentDriveName() {
- if (System.getProperty("os.name").startsWith("Windows")) {
- try {
- // get the current drive
- return new File(".").getCanonicalPath().substring(0, 2);
- } catch (IOException ex) {
- throw new IllegalArgumentException(
- "Failed in setting the overflow directory", ex);
- }
- }
- return null;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
index cafdb80..ed59108 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
@@ -447,7 +447,7 @@ public class DistTXState extends TXState {
postPutAll(dtop.getPutAllOperation(), versions, dtop.region);
} else {
result = putEntryOnRemote(dtop, false/* ifNew */,
- dtop.hasDelta()/* ifOld */, null/* expectedOldValue */,
+ false/* ifOld */, null/* expectedOldValue */,
false/* requireOldValue */, 0L/* lastModified */, true/*
* overwriteDestroyed
* *not*
@@ -572,7 +572,7 @@ public class DistTXState extends TXState {
@Released EntryEventImpl ev = PutAllPRMessage.getEventFromEntry(theRegion,
myId, myId, i, putallOp.putAllData, false, putallOp
.getBaseEvent().getContext(), false, !putallOp.getBaseEvent()
- .isGenerateCallbacks(), false);
+ .isGenerateCallbacks());
try {
// ev.setPutAllOperation(putallOp);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXStateOnCoordinator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXStateOnCoordinator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXStateOnCoordinator.java
index 33bec1c..436c637 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXStateOnCoordinator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXStateOnCoordinator.java
@@ -359,7 +359,7 @@ public final class DistTXStateOnCoordinator extends DistTXState implements
postPutAll(dtop.getPutAllOperation(), versions, dtop.region);
} else {
result = putEntry(dtop, false/* ifNew */,
- dtop.hasDelta()/* ifOld */, null/* expectedOldValue */,
+ false/* ifOld */, null/* expectedOldValue */,
false/* requireOldValue */, 0L/* lastModified */, true/*
* overwriteDestroyed
* *not*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
index 6b1073b..83d4c5a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
@@ -101,13 +101,6 @@ public abstract class DistributedCacheOperation {
public static final byte DESERIALIZATION_POLICY_NONE = (byte)0;
/**
- * Deserialization policy: deserialize eagerly (for Deltas)
- *
- * @since GemFire 5.7
- */
- public static final byte DESERIALIZATION_POLICY_EAGER = (byte)1;
-
- /**
* Deserialization policy: deserialize lazily (for all other objects)
*
* @since GemFire 5.7
@@ -115,14 +108,11 @@ public abstract class DistributedCacheOperation {
public static final byte DESERIALIZATION_POLICY_LAZY = (byte)2;
/**
- * @param deserializationPolicy must be one of the following: DESERIALIZATION_POLICY_NONE, DESERIALIZATION_POLICY_EAGER, DESERIALIZATION_POLICY_LAZY.
+ * @param deserializationPolicy must be one of the following: DESERIALIZATION_POLICY_NONE, DESERIALIZATION_POLICY_LAZY.
*/
public static void writeValue(final byte deserializationPolicy, final Object vObj, final byte[] vBytes, final DataOutput out) throws IOException {
if (vObj != null) {
- if (deserializationPolicy == DESERIALIZATION_POLICY_EAGER) {
- // for DESERIALIZATION_POLICY_EAGER avoid extra byte array serialization
- DataSerializer.writeObject(vObj, out);
- } else if (deserializationPolicy == DESERIALIZATION_POLICY_NONE) {
+ if (deserializationPolicy == DESERIALIZATION_POLICY_NONE) {
// We only have NONE with a vObj when vObj is off-heap and not serialized.
StoredObject so = (StoredObject) vObj;
assert !so.isSerialized();
@@ -131,14 +121,7 @@ public abstract class DistributedCacheOperation {
DataSerializer.writeObjectAsByteArray(vObj, out);
}
} else {
- if (deserializationPolicy == DESERIALIZATION_POLICY_EAGER) {
- // object is already in serialized form in the byte array.
- // So just write the bytes to the stream.
- // fromData will call readObject which will deserialize to object form.
- out.write(vBytes);
- } else {
- DataSerializer.writeByteArray(vBytes, out);
- }
+ DataSerializer.writeByteArray(vBytes, out);
}
}
// static values for oldValueIsObject
@@ -151,7 +134,6 @@ public abstract class DistributedCacheOperation {
*/
public static byte valueIsToDeserializationPolicy(boolean oldValueIsSerialized) {
if (!oldValueIsSerialized) return DESERIALIZATION_POLICY_NONE;
- if (CachedDeserializableFactory.preferObject()) return DESERIALIZATION_POLICY_EAGER;
return DESERIALIZATION_POLICY_LAZY;
}
@@ -180,8 +162,6 @@ public abstract class DistributedCacheOperation {
switch (policy) {
case DESERIALIZATION_POLICY_NONE:
return "NONE";
- case DESERIALIZATION_POLICY_EAGER:
- return "EAGER";
case DESERIALIZATION_POLICY_LAZY:
return "LAZY";
default:
@@ -863,8 +843,6 @@ public abstract class DistributedCacheOperation {
private final static int INHIBIT_NOTIFICATIONS_MASK = 0x400;
- protected final static short IS_PUT_DML = 0x100;
-
public boolean needsRouting;
protected String regionPath;
@@ -1364,9 +1342,6 @@ public abstract class DistributedCacheOperation {
}
if ((extBits & INHIBIT_NOTIFICATIONS_MASK) != 0) {
this.inhibitAllNotifications = true;
- if (this instanceof PutAllMessage) {
- ((PutAllMessage) this).setPutDML((extBits & IS_PUT_DML) != 0);
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
index 5d71ef2..e73ca35 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
@@ -51,7 +51,6 @@ import com.gemstone.gemfire.internal.DataSerializableFixedID;
import com.gemstone.gemfire.internal.InternalDataSerializer;
import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.cache.FilterRoutingInfo.FilterInfo;
-import com.gemstone.gemfire.internal.cache.delta.Delta;
import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier;
import com.gemstone.gemfire.internal.cache.partitioned.PutAllPRMessage;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
@@ -416,8 +415,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
* {@link PutAllPRMessage#toData(DataOutput)} <br>
* {@link RemotePutAllMessage#toData(DataOutput)} <br>
*/
- public final void toData(final DataOutput out,
- final boolean requiresRegionContext) throws IOException {
+ public final void toData(final DataOutput out) throws IOException {
Object key = this.key;
final Object v = this.value;
DataSerializer.writeObject(key, out);
@@ -856,7 +854,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
PutAllMessage msg = new PutAllMessage();
msg.eventId = event.getEventId();
msg.context = event.getContext();
- msg.setPutDML(event.isPutDML());
return msg;
}
@@ -870,7 +867,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
public PutAllPRMessage createPRMessagesNotifyOnly(int bucketId) {
final EntryEventImpl event = getBaseEvent();
PutAllPRMessage prMsg = new PutAllPRMessage(bucketId, putAllDataSize, true,
- event.isPossibleDuplicate(), !event.isGenerateCallbacks(), event.getCallbackArgument(), false /*isPutDML*/);
+ event.isPossibleDuplicate(), !event.isGenerateCallbacks(), event.getCallbackArgument());
if (event.getContext() != null) {
prMsg.setBridgeContext(event.getContext());
}
@@ -899,7 +896,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
PutAllPRMessage prMsg = (PutAllPRMessage)prMsgMap.get(bucketId);
if (prMsg == null) {
prMsg = new PutAllPRMessage(bucketId.intValue(), putAllDataSize, false,
- event.isPossibleDuplicate(), !event.isGenerateCallbacks(), event.getCallbackArgument(), event.isPutDML());
+ event.isPossibleDuplicate(), !event.isGenerateCallbacks(), event.getCallbackArgument());
prMsg.setTransactionDistributed(event.getRegion().getCache().getTxManager().isDistributed());
// set dpao's context(original sender) into each PutAllMsg
@@ -1076,8 +1073,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
protected EventID eventId = null;
- private transient boolean isPutDML = false;
-
protected static final short HAS_BRIDGE_CONTEXT = UNRESERVED_FLAGS_START;
protected static final short SKIP_CALLBACKS =
(short)(HAS_BRIDGE_CONTEXT << 1);
@@ -1132,13 +1127,10 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
* @param rgn
* the region the entry is put in
*/
- public void doEntryPut(PutAllEntryData entry, DistributedRegion rgn,
- boolean requiresRegionContext, boolean isPutDML) {
+ public void doEntryPut(PutAllEntryData entry, DistributedRegion rgn) {
@Released EntryEventImpl ev = PutAllMessage.createEntryEvent(entry, getSender(),
- this.context, rgn,
- requiresRegionContext, this.possibleDuplicate,
+ this.context, rgn, this.possibleDuplicate,
this.needsRouting, this.callbackArg, true, skipCallbacks);
- ev.setPutDML(isPutDML);
// we don't need to set old value here, because the msg is from remote. local old value will get from next step
try {
super.basicOperateOnRegion(ev, rgn);
@@ -1158,7 +1150,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
* @param sender
* @param context
* @param rgn
- * @param requiresRegionContext
* @param possibleDuplicate
* @param needsRouting
* @param callbackArg
@@ -1167,13 +1158,10 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
@Retained
public static EntryEventImpl createEntryEvent(PutAllEntryData entry,
InternalDistributedMember sender, ClientProxyMembershipID context,
- DistributedRegion rgn, boolean requiresRegionContext,
+ DistributedRegion rgn,
boolean possibleDuplicate, boolean needsRouting, Object callbackArg,
boolean originRemote, boolean skipCallbacks) {
final Object key = entry.getKey();
- if (requiresRegionContext) {
- ((KeyWithRegionContext)key).setRegionContext(rgn);
- }
EventID evId = entry.getEventID();
@Retained EntryEventImpl ev = EntryEventImpl.create(rgn, entry.getOp(),
key, null/* value */, callbackArg,
@@ -1225,14 +1213,13 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
rgn.syncBulkOp(new Runnable() {
public void run() {
- final boolean requiresRegionContext = rgn.keyRequiresRegionContext();
final boolean isDebugEnabled = logger.isDebugEnabled();
for (int i = 0; i < putAllDataSize; ++i) {
if (isDebugEnabled) {
logger.debug("putAll processing {} with {} sender={}", putAllData[i], putAllData[i].versionTag, sender);
}
putAllData[i].setSender(sender);
- doEntryPut(putAllData[i], rgn, requiresRegionContext, isPutDML);
+ doEntryPut(putAllData[i], rgn);
}
}
}, ev.getEventId());
@@ -1283,10 +1270,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
EntryVersionsList versionTags = new EntryVersionsList(putAllDataSize);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
- final boolean requiresRegionContext =
- (this.putAllData[0].key instanceof KeyWithRegionContext);
for (int i = 0; i < this.putAllDataSize; i++) {
if (!hasTags && putAllData[i].versionTag != null) {
hasTags = true;
@@ -1294,7 +1277,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
VersionTag<?> tag = putAllData[i].versionTag;
versionTags.add(tag);
putAllData[i].versionTag = null;
- this.putAllData[i].toData(out, requiresRegionContext);
+ this.putAllData[i].toData(out);
this.putAllData[i].versionTag = tag;
}
@@ -1342,11 +1325,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
Object valueObj = null;
Object v = entry.getValue();
byte deserializationPolicy;
- if (v instanceof Delta) {
- deserializationPolicy = DESERIALIZATION_POLICY_EAGER;
- valueObj = v;
- }
- else if (v instanceof CachedDeserializable) {
+ if (v instanceof CachedDeserializable) {
deserializationPolicy = DESERIALIZATION_POLICY_LAZY;
valueBytes = ((CachedDeserializable)v).getSerializedValue();
}
@@ -1360,18 +1339,5 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation
}
return Arrays.asList(ops);
}
-
- public void setPutDML(boolean val) {
- this.isPutDML = val;
- }
-
- @Override
- protected short computeCompressedExtBits(short bits) {
- bits = super.computeCompressedExtBits(bits);
- if (isPutDML) {
- bits |= IS_PUT_DML;
- }
- return bits;
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
index eed5268..b42a617 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
@@ -28,7 +28,6 @@ import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.cache.execute.ResultSender;
import com.gemstone.gemfire.cache.persistence.PersistentReplicatesOfflineException;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.distributed.DistributedLockService;
import com.gemstone.gemfire.distributed.DistributedMember;
@@ -1136,21 +1135,8 @@ public class DistributedRegion extends LocalRegion implements
getLockService(); // create lock service eagerly now
}
- final IndexUpdater indexUpdater = getIndexUpdater();
- boolean sqlfGIILockTaken = false;
- // this try block is to release the SQLF GII lock in finally
- // which should be done after bucket status will be set
- // properly in LocalRegion#initialize()
- try {
try {
try {
- // take the GII lock to avoid missing entries while updating the
- // index list for SQLFabric (#41330 and others)
- if (indexUpdater != null) {
- indexUpdater.lockForGII();
- sqlfGIILockTaken = true;
- }
-
PersistentMemberID persistentId = null;
boolean recoverFromDisk = isRecoveryNeeded();
DiskRegion dskRgn = getDiskRegion();
@@ -1194,11 +1180,6 @@ public class DistributedRegion extends LocalRegion implements
this.eventTracker.setInitialized();
}
}
- } finally {
- if (sqlfGIILockTaken) {
- indexUpdater.unlockForGII();
- }
- }
}
@Override
@@ -2273,13 +2254,6 @@ public class DistributedRegion extends LocalRegion implements
}
profile.serialNumber = getSerialNumber();
profile.regionInitialized = this.isInitialized();
- if (!this.isUsedForPartitionedRegionBucket()) {
- profile.memberUnInitialized = getCache().isUnInitializedMember(
- profile.getDistributedMember());
- }
- else {
- profile.memberUnInitialized = false;
- }
profile.persistentID = getPersistentID();
if(getPersistenceAdvisor() != null) {
profile.persistenceInitialized = getPersistenceAdvisor().isOnline();
@@ -2485,11 +2459,7 @@ public class DistributedRegion extends LocalRegion implements
}
if (preferCD) {
- if (event.hasDelta()) {
- result = event.getNewValue();
- } else {
result = event.getRawNewValueAsHeapObject();
- }
} else {
result = event.getNewValue();
}
@@ -3909,12 +3879,10 @@ public class DistributedRegion extends LocalRegion implements
/**
* Used to bootstrap txState.
* @param key
- * @return distributedRegions,
- * member with parimary bucket for partitionedRegions
+ * @return member with primary bucket for partitionedRegions
*/
@Override
public DistributedMember getOwnerForKey(KeyInfo key) {
- //Asif: fix for sqlfabric bug 42266
assert !this.isInternalRegion() || this.isMetaRegionWithTransactions();
if (!this.getAttributes().getDataPolicy().withStorage()
|| (this.concurrencyChecksEnabled && this.getAttributes()
@@ -4032,8 +4000,7 @@ public class DistributedRegion extends LocalRegion implements
if (this.randIndex < 0) {
this.randIndex = PartitionedRegion.rand.nextInt(numProfiles);
}
- if (cp.dataPolicy.withReplication() && cp.regionInitialized
- && !cp.memberUnInitialized) {
+ if (cp.dataPolicy.withReplication() && cp.regionInitialized) {
if (onlyPersistent && !cp.dataPolicy.withPersistence()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
index e51bedd..af54945 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -231,8 +231,6 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
}
}
// Send the reply if the operateOnPartitionedRegion returned true
- // Fix for hang in dunits on sqlfabric after merge.
- //ReplyMessage.send(getSender(), this.processorId, rex, dm);
sendReply(getSender(), this.processorId, dm, rex, null, 0, true, false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
index eabefdf..0390b29 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
@@ -380,8 +380,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
* {@link PutAllPRMessage#toData(DataOutput)} <br>
* {@link RemotePutAllMessage#toData(DataOutput)} <br>
*/
- public final void toData(final DataOutput out,
- final boolean requiresRegionContext) throws IOException {
+ public final void toData(final DataOutput out) throws IOException {
Object key = this.key;
DataSerializer.writeObject(key, out);
@@ -886,11 +885,9 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
* @param rgn
* the region the entry is removed from
*/
- public void doEntryRemove(RemoveAllEntryData entry, DistributedRegion rgn,
- boolean requiresRegionContext) {
+ public void doEntryRemove(RemoveAllEntryData entry, DistributedRegion rgn) {
@Released EntryEventImpl ev = RemoveAllMessage.createEntryEvent(entry, getSender(),
- this.context, rgn,
- requiresRegionContext, this.possibleDuplicate,
+ this.context, rgn, this.possibleDuplicate,
this.needsRouting, this.callbackArg, true, skipCallbacks);
// rgn.getLogWriterI18n().info(LocalizedStrings.DEBUG, "RemoveAllMessage.doEntryRemove sender=" + getSender() +
// " event="+ev);
@@ -922,7 +919,6 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
* @param sender
* @param context
* @param rgn
- * @param requiresRegionContext
* @param possibleDuplicate
* @param needsRouting
* @param callbackArg
@@ -931,13 +927,10 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
@Retained
public static EntryEventImpl createEntryEvent(RemoveAllEntryData entry,
InternalDistributedMember sender, ClientProxyMembershipID context,
- DistributedRegion rgn, boolean requiresRegionContext,
+ DistributedRegion rgn,
boolean possibleDuplicate, boolean needsRouting, Object callbackArg,
boolean originRemote, boolean skipCallbacks) {
final Object key = entry.getKey();
- if (requiresRegionContext) {
- ((KeyWithRegionContext)key).setRegionContext(rgn);
- }
EventID evId = entry.getEventID();
@Retained EntryEventImpl ev = EntryEventImpl.create(rgn, entry.getOp(),
key, null/* value */, callbackArg,
@@ -985,13 +978,12 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
rgn.syncBulkOp(new Runnable() {
public void run() {
- final boolean requiresRegionContext = rgn.keyRequiresRegionContext();
for (int i = 0; i < removeAllDataSize; ++i) {
if (logger.isTraceEnabled()) {
logger.trace("removeAll processing {} with {}", removeAllData[i], removeAllData[i].versionTag);
}
removeAllData[i].setSender(sender);
- doEntryRemove(removeAllData[i], rgn, requiresRegionContext);
+ doEntryRemove(removeAllData[i], rgn);
}
}
}, ev.getEventId());
@@ -1043,10 +1035,6 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
EntryVersionsList versionTags = new EntryVersionsList(removeAllDataSize);
boolean hasTags = false;
- // get the "keyRequiresRegionContext" flag from first element assuming
- // all key objects to be uniform
- final boolean requiresRegionContext =
- (this.removeAllData[0].key instanceof KeyWithRegionContext);
for (int i = 0; i < this.removeAllDataSize; i++) {
if (!hasTags && removeAllData[i].versionTag != null) {
hasTags = true;
@@ -1054,7 +1042,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
VersionTag<?> tag = removeAllData[i].versionTag;
versionTags.add(tag);
removeAllData[i].versionTag = null;
- this.removeAllData[i].toData(out, requiresRegionContext);
+ this.removeAllData[i].toData(out);
this.removeAllData[i].versionTag = tag;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryBits.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryBits.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryBits.java
index f95af60..a67a335 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryBits.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryBits.java
@@ -30,16 +30,6 @@ public abstract class EntryBits {
private static final byte TOMBSTONE = 0x40;
private static final byte WITH_VERSIONS = (byte)0x80; // oplog entry contains versions
- /**
- * Currently for SQLFabric to deserialize byte[][] eagerly in
- * InitialImageOperation. Can be made a general flag later for all kinds of
- * objects in CachedDeserializable whose serialization is not expensive but
- * that are pretty heavy so creating an intermediate byte[] is expensive.
- *
- * This is a transient bit that clashes with on-disk persisted bits.
- */
- private static final byte EAGER_DESERIALIZE = 0x20;
-
public static boolean isSerialized(byte b) {
return (b & SERIALIZED) != 0;
}
@@ -79,10 +69,6 @@ public abstract class EntryBits {
return (b & (INVALID|LOCAL_INVALID|TOMBSTONE)) == 0;
}
- public static boolean isEagerDeserialize(byte b) {
- return (b & EntryBits.EAGER_DESERIALIZE) != 0;
- }
-
public static byte setSerialized(byte b, boolean isSerialized) {
return isSerialized ? (byte)(b | SERIALIZED) : (byte)(b & ~SERIALIZED);
}
@@ -116,12 +102,4 @@ public abstract class EntryBits {
public static byte getPersistentBits(byte b) {
return (byte)(b & (SERIALIZED|INVALID|LOCAL_INVALID|TOMBSTONE|WITH_VERSIONS));
}
-
- public static byte setEagerDeserialize(byte b) {
- return (byte)(b | EntryBits.EAGER_DESERIALIZE);
- }
-
- public static byte clearEagerDeserialize(byte b) {
- return (byte)(b & ~EntryBits.EAGER_DESERIALIZE);
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
index 65b2c04..c4849be 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.*;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.query.IndexMaintenanceException;
import com.gemstone.gemfire.cache.query.QueryException;
-import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
import com.gemstone.gemfire.cache.query.internal.index.IndexProtocol;
import com.gemstone.gemfire.cache.query.internal.index.IndexUtils;
@@ -33,7 +32,6 @@ import com.gemstone.gemfire.distributed.internal.DistributionMessage;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.*;
import com.gemstone.gemfire.internal.cache.FilterRoutingInfo.FilterInfo;
-import com.gemstone.gemfire.internal.cache.delta.Delta;
import com.gemstone.gemfire.internal.cache.lru.Sizeable;
import com.gemstone.gemfire.internal.cache.partitioned.PartitionMessage;
import com.gemstone.gemfire.internal.cache.partitioned.PutMessage;
@@ -92,7 +90,6 @@ public class EntryEventImpl
private byte[] cachedSerializedNewValue = null;
@Retained(ENTRY_EVENT_OLD_VALUE)
private Object oldValue = null;
- protected Delta delta = null;
protected short eventFlags = 0x0000;
@@ -141,13 +138,6 @@ public class EntryEventImpl
protected ClientProxyMembershipID context = null;
/**
- * A custom context object that can be used for any other contextual
- * information. Currently used by SQL Fabric to pass around evaluated rows
- * from raw byte arrays and routing object.
- */
- private transient Object contextObj = null;
-
- /**
* this holds the bytes representing the change in value effected by this
* event. It is used when the value implements the Delta interface.
*/
@@ -165,8 +155,6 @@ public class EntryEventImpl
/** version tag for concurrency checks */
protected VersionTag versionTag;
- private transient boolean isPutDML = false;
-
/** boolean to indicate that the RegionEntry for this event has been evicted*/
private transient boolean isEvicted = false;
@@ -191,7 +179,7 @@ public class EntryEventImpl
this.txId = (TXId)DataSerializer.readObject(in);
if (in.readBoolean()) { // isDelta
- this.delta = (Delta)DataSerializer.readObject(in);
+ assert false : "isDelta should never be true";
}
else {
// OFFHEAP Currently values are never deserialized to off heap memory. If that changes then this code needs to change.
@@ -247,10 +235,7 @@ public class EntryEventImpl
this.op = op;
this.keyInfo = this.region.getKeyInfo(key, newVal, callbackArgument);
- if (newVal instanceof Delta) {
- this.delta = (Delta)newVal;
- }
- else if (!Token.isInvalid(newVal)) {
+ if (!Token.isInvalid(newVal)) {
basicSetNewValue(newVal);
}
@@ -299,7 +284,6 @@ public class EntryEventImpl
this.newValueBytes = other.newValueBytes;
this.cachedSerializedNewValue = other.cachedSerializedNewValue;
this.re = other.re;
- this.delta = other.delta;
if (setOldValue) {
retainAndSetOldValue(other.basicGetOldValue());
this.oldValueBytes = other.oldValueBytes;
@@ -781,25 +765,19 @@ public class EntryEventImpl
/**
* Like getRawNewValue except that if the result is an off-heap reference then copy it to the heap.
- * ALERT: If there is a Delta, returns that, not the (applied) new value.
* Note: to prevent the heap copy use getRawNewValue instead
*/
public final Object getRawNewValueAsHeapObject() {
- if (this.delta != null) {
- return this.delta;
- }
return OffHeapHelper.getHeapForm(OffHeapHelper.copyIfNeeded(basicGetNewValue()));
}
/**
- * If new value is a Delta return it.
- * Else if new value is off-heap return the StoredObject form (unretained OFF_HEAP_REFERENCE).
+ * If new value is off-heap return the StoredObject form (unretained OFF_HEAP_REFERENCE).
* Its refcount is not inced by this call and the returned object can only be safely used for the lifetime of the EntryEventImpl instance that returned the value.
* Else return the raw form.
*/
@Unretained(ENTRY_EVENT_NEW_VALUE)
public final Object getRawNewValue() {
- if (this.delta != null) return this.delta;
return basicGetNewValue();
}
@@ -808,39 +786,6 @@ public class EntryEventImpl
return basicGetNewValue();
}
- /**
- * Returns the delta that represents the new value; null if no delta.
- * @return the delta that represents the new value; null if no delta.
- */
- public final Delta getDeltaNewValue() {
- return this.delta;
- }
-
- /**
- * Applies the delta
- */
- private Object applyDeltaWithCopyOnRead(boolean doCopyOnRead) {
- //try {
- if (applyDelta(true)) {
- Object applied = basicGetNewValue();
- // if applyDelta returns true then newValue should not be off-heap
- assert !(applied instanceof StoredObject);
- if (applied == this.oldValue && doCopyOnRead) {
- applied = CopyHelper.copy(applied);
- }
- return applied;
- }
- //} catch (EntryNotFoundException ex) {
- // only (broken) product code has the opportunity to call this before
- // this.oldValue is set. If oldValue is not set yet, then
- // we most likely haven't synchronized on the region entry yet.
- // (If we have, then make sure oldValue is set before
- // calling this method).
- //throw new AssertionError("too early to call getNewValue");
- //}
- return null;
- }
-
@Released(ENTRY_EVENT_NEW_VALUE)
protected void basicSetNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object v) {
if (v == this.newValue) return;
@@ -1003,23 +948,6 @@ public class EntryEventImpl
public final Object getNewValue() {
boolean doCopyOnRead = getRegion().isCopyOnRead();
- try {
- if (applyDelta(true)) {
- @Unretained(ENTRY_EVENT_NEW_VALUE)
- Object applied = basicGetNewValue();
- if (applied == this.oldValue && doCopyOnRead) {
- applied = CopyHelper.copy(applied);
- }
- return applied;
- }
- } catch (EntryNotFoundException ex) {
- // only (broken) product code has the opportunity to call this before
- // this.oldValue is set. If oldValue is not set yet, then
- // we most likely haven't synchronized on the region entry yet.
- // (If we have, then make sure oldValue is set before
- // calling this method).
- throw new AssertionError("too early to call getNewValue");
- }
Object nv = basicGetNewValue();
if (nv != null) {
if (nv == Token.NOT_AVAILABLE) {
@@ -1055,44 +983,9 @@ public class EntryEventImpl
return StringUtils.forceToString(basicGetOldValue());
}
- protected boolean applyDelta(boolean throwOnNullOldValue)
- throws EntryNotFoundException {
- if (this.newValue != null || this.delta == null) {
- return false;
- }
- if (this.oldValue == null) {
- if (throwOnNullOldValue) {
- // !!!:ezoerner:20080611 It would be nice if the client got this
- // exception
- throw new EntryNotFoundException(
- "Cannot apply a delta without an existing value");
- }
- return false;
- }
- // swizzle BucketRegion in event for Delta.
- // !!!:ezoerner:20090602 this is way ugly; this whole class severely
- // needs refactoring
- LocalRegion originalRegion = this.region;
- try {
- if (originalRegion instanceof BucketRegion) {
- this.region = ((BucketRegion)this.region).getPartitionedRegion();
- }
- basicSetNewValue(this.delta.apply(this));
- } finally {
- this.region = originalRegion;
- }
- return true;
- }
-
/** Set a deserialized value */
public final void setNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object obj) {
- if (obj instanceof Delta) {
- this.delta = (Delta)obj;
- basicSetNewValue(null);
- }
- else {
- basicSetNewValue(obj);
- }
+ basicSetNewValue(obj);
}
public TransactionId getTransactionId()
@@ -1384,34 +1277,11 @@ public class EntryEventImpl
}
/**
- * If applyDelta is true then first attempt to apply a delta (if we have one) and return the value.
- * Else if new value is a Delta return it.
- * Else if new value is off-heap return the StoredObject form (unretained OFF_HEAP_REFERENCE).
- * Its refcount is not inced by this call and the returned object can only be safely used for the lifetime of the EntryEventImpl instance that returned the value.
- * Else return the raw form.
- */
- @Unretained(ENTRY_EVENT_NEW_VALUE)
- public final Object getRawNewValue(boolean applyDelta) {
- if (applyDelta) {
- boolean doCopyOnRead = getRegion().isCopyOnRead();
- Object newValueWithDelta = applyDeltaWithCopyOnRead(doCopyOnRead);
- if (newValueWithDelta != null) {
- return newValueWithDelta;
- }
- // if applyDelta is true and we have already applied the delta then
- // just return the applied value instead of the delta object.
- @Unretained(ENTRY_EVENT_NEW_VALUE)
- Object newValue = basicGetNewValue();
- if (newValue != null) return newValue;
- }
- return getRawNewValue();
- }
- /**
* Just like getRawNewValue(true) except if the raw new value is off-heap deserialize it.
*/
@Unretained(ENTRY_EVENT_NEW_VALUE)
public final Object getNewValueAsOffHeapDeserializedOrRaw() {
- Object result = getRawNewValue(true);
+ Object result = getRawNewValue();
if (result instanceof StoredObject) {
result = ((StoredObject) result).getDeserializedForReading();
}
@@ -1448,7 +1318,6 @@ public class EntryEventImpl
}
public final Object getDeserializedValue() {
- if (this.delta == null) {
final Object val = basicGetNewValue();
if (val instanceof CachedDeserializable) {
return ((CachedDeserializable)val).getDeserializedForReading();
@@ -1456,16 +1325,11 @@ public class EntryEventImpl
else {
return val;
}
- }
- else {
- return this.delta;
- }
}
public final byte[] getSerializedValue() {
if (this.newValueBytes == null) {
final Object val;
- if (this.delta == null) {
val = basicGetNewValue();
if (val instanceof byte[]) {
return (byte[])val;
@@ -1473,10 +1337,6 @@ public class EntryEventImpl
else if (val instanceof CachedDeserializable) {
return ((CachedDeserializable)val).getSerializedValue();
}
- }
- else {
- val = this.delta;
- }
try {
return CacheServerHelper.serialize(val);
} catch (IOException ioe) {
@@ -1508,11 +1368,6 @@ public class EntryEventImpl
if (isSynced) {
this.setSerializationDeferred(false);
}
- else if (obj == null && this.delta != null) {
- // defer serialization until setNewValueInRegion
- this.setSerializationDeferred(true);
- return;
- }
basicSetNewValue(getCachedDeserializable(obj, this));
}
@@ -1527,12 +1382,11 @@ public class EntryEventImpl
|| obj == Token.NOT_AVAILABLE
|| Token.isInvalidOrRemoved(obj)
// don't serialize delta object already serialized
- || obj instanceof com.gemstone.gemfire.Delta
- || obj instanceof Delta) { // internal delta
+ || obj instanceof com.gemstone.gemfire.Delta) { // internal delta
return obj;
}
final CachedDeserializable cd;
- // avoid unneeded serialization of byte[][] used by SQLFabric that
+ // avoid unneeded serialization of byte[][] that
// will end up being deserialized in any case (serialization is cheap
// for byte[][] anyways)
if (obj instanceof byte[][]) {
@@ -1567,18 +1421,7 @@ public class EntryEventImpl
public final void setSerializedNewValue(byte[] serializedValue) {
Object newVal = null;
if (serializedValue != null) {
- if (CachedDeserializableFactory.preferObject()) {
- newVal = deserialize(serializedValue);
- } else {
- newVal = CachedDeserializableFactory.create(serializedValue);
- }
- if (newVal instanceof Delta) {
- this.delta = (Delta)newVal;
- newVal = null;
- // We need the newValueBytes field and the newValue field to be in sync.
- // In the case of non-null delta set both fields to null.
- serializedValue = null;
- }
+ newVal = CachedDeserializableFactory.create(serializedValue);
}
this.newValueBytes = serializedValue;
basicSetNewValue(newVal);
@@ -1588,10 +1431,7 @@ public class EntryEventImpl
public void setSerializedOldValue(byte[] serializedOldValue){
this.oldValueBytes = serializedOldValue;
final Object ov;
- if (CachedDeserializableFactory.preferObject()) {
- ov = deserialize(serializedOldValue);
- }
- else if (serializedOldValue != null) {
+ if (serializedOldValue != null) {
ov = CachedDeserializableFactory.create(serializedOldValue);
}
else {
@@ -1705,12 +1545,6 @@ public class EntryEventImpl
// put in newValue
- if (applyDelta(this.op.isCreate())) {
- if (this.isSerializationDeferred()) {
- makeSerializedNewValue(true);
- }
- }
-
// If event contains new value, then it may mean that the delta bytes should
// not be applied. This is possible if the event originated locally.
if (this.deltaBytes != null && this.newValue == null) {
@@ -1749,7 +1583,7 @@ public class EntryEventImpl
basicSetNewValue(v);
}
- Object preparedV = reentry.prepareValueForCache(this.region, v, this, this.hasDelta());
+ Object preparedV = reentry.prepareValueForCache(this.region, v, this, false);
if (preparedV != v) {
v = preparedV;
if (v instanceof StoredObject) {
@@ -1790,29 +1624,9 @@ public class EntryEventImpl
}
}
}
- final IndexUpdater indexUpdater = this.region.getIndexUpdater();
- if (indexUpdater != null) {
- final LocalRegion indexRegion;
- if (owner != null) {
- indexRegion = owner;
- }
- else {
- indexRegion = this.region;
- }
- try {
- indexUpdater.onEvent(indexRegion, this, reentry);
- calledSetValue = true;
- reentry.setValueWithTombstoneCheck(v, this); // already called prepareValueForCache
- success = true;
- } finally {
- indexUpdater.postEvent(indexRegion, this, reentry, success);
- }
- }
- else {
- calledSetValue = true;
- reentry.setValueWithTombstoneCheck(v, this); // already called prepareValueForCache
- success = true;
- }
+ calledSetValue = true;
+ reentry.setValueWithTombstoneCheck(v, this); // already called prepareValueForCache
+ success = true;
} finally {
if (!success && reentry instanceof OffHeapRegionEntry && v instanceof StoredObject) {
OffHeapRegionEntryHelper.releaseEntry((OffHeapRegionEntry)reentry, (StoredObject)v);
@@ -1950,8 +1764,6 @@ public class EntryEventImpl
// there must be a nearSidePendingValue
processDeltaBytes(tx.getNearSidePendingValue());
v = basicGetNewValue();
- } else if (this.delta != null) {
- v = this.delta;
} else {
v = isLocalInvalid() ? Token.LOCAL_INVALID : Token.INVALID;
}
@@ -2053,12 +1865,6 @@ public class EntryEventImpl
/** Return true if new value available */
public boolean hasNewValue() {
Object tmp = this.newValue;
- if (tmp == null && hasDelta()) {
- // ???:ezoerner:20080611 what if applying the delta would produce
- // null or (strangely) NOT_AVAILABLE.. do we need to apply it here to
- // find out?
- return true;
- }
return tmp != null && tmp != Token.NOT_AVAILABLE;
}
@@ -2069,16 +1875,6 @@ public class EntryEventImpl
return this.oldValue instanceof Token;
}
- /**
- * This should only be used in case of internal delta and <B>not for Delta of
- * Delta Propagation feature</B>.
- *
- * @return boolean
- */
- public boolean hasDelta() {
- return (this.delta != null);
- }
-
public boolean isOldValueAvailable() {
if (isOriginRemote() && this.region.isProxy()) {
return false;
@@ -2297,12 +2093,8 @@ public class EntryEventImpl
DataSerializer.writeObject(this.txId, out);
{
- boolean isDelta = this.delta != null;
- out.writeBoolean(isDelta);
- if (isDelta) {
- DataSerializer.writeObject(this.delta, out);
- }
- else {
+ out.writeBoolean(false);
+ {
Object nv = basicGetNewValue();
boolean newValueSerialized = nv instanceof CachedDeserializable;
if (newValueSerialized) {
@@ -2422,7 +2214,6 @@ public class EntryEventImpl
public int getNewValSizeForPR()
{
int newSize = 0;
- applyDelta(false);
Object v = basicGetNewValue();
if (v != null) {
try {
@@ -2664,14 +2455,6 @@ public class EntryEventImpl
return this;
}
- public final void setContextObject(Object ctx) {
- this.contextObj = ctx;
- }
-
- public final Object getContextObject() {
- return this.contextObj;
- }
-
/**
* @return the keyInfo
*/
@@ -2994,12 +2777,4 @@ public class EntryEventImpl
public boolean isOldValueOffHeap() {
return isOffHeapReference(this.oldValue);
}
-
- public final boolean isPutDML() {
- return this.isPutDML;
- }
-
- public final void setPutDML(boolean val) {
- this.isPutDML = val;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
index 16215ac..4b757fb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
@@ -38,7 +38,7 @@ public class EntryOperationImpl implements EntryOperation {
private final Object key;
- private Object callbackArgument = Token.NOT_AVAILABLE;
+ private final Object callbackArgument;
public EntryOperationImpl(Region region, Operation operation, Object key,
Object value, Object callbackArgument) {
@@ -102,17 +102,4 @@ public class EntryOperationImpl implements EntryOperation {
public Object getRawNewValue() {
return this.value;
}
-
- /**
- * Method for internal use. (Used by SQLFabric)
- */
- public void setCallbackArgument(Object newCallbackArgument) {
- if (this.callbackArgument instanceof WrappedCallbackArgument) {
- ((WrappedCallbackArgument)this.callbackArgument)
- .setOriginalCallbackArgument(newCallbackArgument);
- }
- else {
- this.callbackArgument = newCallbackArgument;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index 5355a2b..186ebbc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -17,7 +17,69 @@
package com.gemstone.gemfire.internal.cache;
-import com.gemstone.gemfire.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.io.StringBufferInputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.naming.Context;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.CancelCriterion;
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.ForcedDisconnectException;
+import com.gemstone.gemfire.GemFireCacheException;
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.admin.internal.SystemMemberCacheEventProcessor;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.TimeoutException;
@@ -107,19 +169,6 @@ import com.gemstone.gemfire.pdx.internal.TypeRegistry;
import com.gemstone.gemfire.redis.GemFireRedisServer;
import com.sun.jna.Native;
import com.sun.jna.Platform;
-import org.apache.logging.log4j.Logger;
-
-import javax.naming.Context;
-import java.io.*;
-import java.net.InetSocketAddress;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
// @todo somebody Come up with more reasonable values for {@link #DEFAULT_LOCK_TIMEOUT}, etc.
/**
@@ -414,18 +463,6 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
private volatile boolean isShutDownAll = false;
- /**
- * Set of members that are not yet ready. Currently used by SQLFabric during initial DDL replay to indicate that the
- * member should not be chosen for primary buckets.
- */
- private final HashSet<InternalDistributedMember> unInitializedMembers = new HashSet<InternalDistributedMember>();
-
- /**
- * Set of {@link BucketAdvisor}s for this node that are pending for volunteer for primary due to uninitialized node
- * (SQLFabric DDL replay in progress).
- */
- private final LinkedHashSet<BucketAdvisor> deferredVolunteerForPrimary = new LinkedHashSet<BucketAdvisor>();
-
private final ResourceAdvisor resourceAdvisor;
private final JmxManagerAdvisor jmxAdvisor;
@@ -4911,76 +4948,6 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
return this.regionsInDestroy.get(path);
}
- /**
- * Mark a node as initialized or not initialized. Used by SQLFabric to avoid creation of buckets or routing of
- * operations/functions on a node that is still in the DDL replay phase.
- */
- public boolean updateNodeStatus(InternalDistributedMember member, boolean initialized) {
- HashSet<BucketAdvisor> advisors = null;
- synchronized (this.unInitializedMembers) {
- if (initialized) {
- if (this.unInitializedMembers.remove(member)) {
- if (member.equals(getMyId())) {
- // don't invoke volunteerForPrimary() inside the lock since
- // BucketAdvisor will also require the lock after locking itself
- advisors = new HashSet<BucketAdvisor>(this.deferredVolunteerForPrimary);
- this.deferredVolunteerForPrimary.clear();
- }
- } else {
- return false;
- }
- } else {
- return this.unInitializedMembers.add(member);
- }
- }
- if (advisors != null) {
- for (BucketAdvisor advisor : advisors) {
- if (logger.isDebugEnabled()) {
- logger.debug("Invoking volunteer for primary for deferred bucket " + "post SQLFabric DDL replay for BucketAdvisor: {}", advisor);
- }
- advisor.volunteerForPrimary();
- }
- }
- return true;
- }
-
- /**
- * Return true if this node is still not initialized else false.
- */
- public boolean isUnInitializedMember(InternalDistributedMember member) {
- synchronized (this.unInitializedMembers) {
- return this.unInitializedMembers.contains(member);
- }
- }
-
- /**
- * Return false for volunteer primary if this node is not currently initialized. Also adds the {@link BucketAdvisor}
- * to a list that will be replayed once this node is initialized.
- */
- public boolean doVolunteerForPrimary(BucketAdvisor advisor) {
- synchronized (this.unInitializedMembers) {
- if (!this.unInitializedMembers.contains(getMyId())) {
- return true;
- }
- if (logger.isDebugEnabled()) {
- logger.debug("Deferring volunteer for primary due to uninitialized " + "node (SQLFabric DDL replay) for BucketAdvisor: {}", advisor);
- }
- this.deferredVolunteerForPrimary.add(advisor);
- return false;
- }
- }
-
- /**
- * Remove all the uninitialized members from the given collection.
- */
- public final void removeUnInitializedMembers(Collection<InternalDistributedMember> members) {
- synchronized (this.unInitializedMembers) {
- for (final InternalDistributedMember m : this.unInitializedMembers) {
- members.remove(m);
- }
- }
- }
-
public TombstoneService getTombstoneService() {
return this.tombstoneService;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/880f8648/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
index ec5fc4e..ff7dea1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
@@ -249,7 +249,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
private String host;
/**
- * SQLFabric uses a negative port value when creating a fake profile meant
+ * a negative port value is used when creating a fake profile meant
* to only gather information about all available locators.
*/
private int port;
@@ -308,7 +308,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
if(advisee != null && advisee.getProfile().equals(this)) {
continue;
}
- // negative value for port used by SQLFabric to indicate fake profile
+ // negative value for port indicates fake profile
// meant to only gather remote profiles during profile exchange
if (this.port > 0) {
handleDistributionAdvisee(advisee, removeProfile, exchangeProfiles,
@@ -337,7 +337,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
if(bsi.getProfile().equals(this)) {
continue;
}
- // negative value for port used by SQLFabric to indicate fake
+ // negative value for port indicates fake
// profile meant to only gather remote profiles during profile
// exchange
if (this.port > 0) {
[13/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
Posted by hi...@apache.org.
GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cb291539
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cb291539
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cb291539
Branch: refs/heads/feature/GEODE-1372
Commit: cb2915390ee5afb8a9d8aff50442986c81321f1f
Parents: 7061201
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Mon May 30 19:26:52 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../internal/RegionFactoryDelegate.java | 6 +-
.../gemstone/gemfire/modules/SecondVMTest.java | 5 +-
.../session/bootstrap/AbstractCache.java | 20 +-
.../modules/session/TestSessionsBase.java | 5 +-
.../LocatorLauncherAssemblyIntegrationTest.java | 22 +-
.../LauncherLifecycleCommandsDUnitTest.java | 4 +-
.../LauncherLifecycleCommandsJUnitTest.java | 7 +-
.../internal/web/RestInterfaceJUnitTest.java | 4 +-
.../controllers/RestAPIsWithSSLDUnitTest.java | 41 +-
.../gemfire/admin/DistributedSystemConfig.java | 26 +-
.../internal/AdminDistributedSystemImpl.java | 2 +-
.../admin/internal/CacheServerConfigImpl.java | 5 +-
.../gemfire/admin/internal/CacheServerImpl.java | 5 +-
.../internal/DistributedSystemConfigImpl.java | 4 +-
.../EnabledManagedEntityController.java | 10 +-
.../admin/jmx/internal/AgentConfigImpl.java | 8 +-
.../jmx/internal/MemberInfoWithStatsMBean.java | 6 +-
.../client/internal/AuthenticateUserOp.java | 8 +-
.../gemfire/distributed/DistributedSystem.java | 4 +-
.../gemfire/distributed/LocatorLauncher.java | 4 +-
.../gemfire/distributed/ServerLauncher.java | 4 +-
.../internal/AbstractDistributionConfig.java | 346 +--
.../internal/DistributionConfig.java | 2191 ++++++++++--------
.../internal/DistributionConfigImpl.java | 406 ++--
.../distributed/internal/InternalLocator.java | 5 +-
.../internal/RuntimeDistributionConfigImpl.java | 36 +-
.../gemfire/internal/AbstractConfig.java | 11 +-
.../gemfire/internal/MigrationClient.java | 6 +-
.../gemfire/internal/MigrationServer.java | 6 +-
.../gemstone/gemfire/internal/SystemAdmin.java | 4 +-
.../gemfire/internal/admin/SSLConfig.java | 10 +-
.../admin/remote/RemoteTransportConfig.java | 4 +-
.../internal/cache/CacheServerLauncher.java | 15 +-
.../gemfire/internal/cache/DiskStoreImpl.java | 5 +-
.../tier/sockets/ClientProxyMembershipID.java | 4 +-
.../internal/cache/tier/sockets/HandShake.java | 14 +-
.../internal/cache/xmlcache/CacheXml.java | 3 +-
.../internal/logging/LogWriterFactory.java | 4 +-
.../management/internal/cli/CommandManager.java | 5 +-
.../internal/cli/commands/ConfigCommands.java | 5 +-
.../internal/cli/commands/ShellCommands.java | 7 +-
.../cli/functions/ChangeLogLevelFunction.java | 4 +-
.../GetMemberConfigInformationFunction.java | 6 +-
.../internal/cli/i18n/CliStrings.java | 2 +-
.../gemfire/redis/GemFireRedisServer.java | 5 +-
.../gemfire/DiskInstantiatorsJUnitTest.java | 7 +-
.../gemfire/LocalStatisticsJUnitTest.java | 8 +-
.../com/gemstone/gemfire/LonerDMJUnitTest.java | 11 +-
.../internal/DistributedSystemTestCase.java | 6 +-
.../admin/internal/HealthEvaluatorTestCase.java | 6 +-
.../cache/ConnectionPoolFactoryJUnitTest.java | 5 +-
.../gemfire/cache/RegionFactoryJUnitTest.java | 6 +-
.../client/ClientCacheFactoryJUnitTest.java | 11 +-
.../ClientServerRegisterInterestsDUnitTest.java | 8 +-
.../cache/client/internal/LocatorTestBase.java | 4 +-
...itionedRegionCompactRangeIndexDUnitTest.java | 5 +-
.../QueryParamsAuthorizationDUnitTest.java | 8 +-
.../functional/IndexCreationJUnitTest.java | 22 +-
.../DeclarativeIndexCreationJUnitTest.java | 5 +-
.../NewDeclarativeIndexCreationJUnitTest.java | 7 +-
...gRegionCreationIndexUpdateTypeJUnitTest.java | 5 +-
.../cache/snapshot/RegionSnapshotJUnitTest.java | 6 +-
.../cache/snapshot/SnapshotTestCase.java | 5 +-
.../gemfire/cache30/Bug40255JUnitTest.java | 8 +-
.../gemfire/cache30/Bug40662JUnitTest.java | 6 +-
.../gemfire/cache30/CacheLogRollDUnitTest.java | 36 +-
...cheRegionsReliablityStatsCheckDUnitTest.java | 186 +-
.../gemfire/cache30/CacheXml45DUnitTest.java | 5 +-
.../gemfire/cache30/CacheXmlTestCase.java | 6 +-
.../cache30/ClientServerCCEDUnitTest.java | 10 +-
.../DistributedAckRegionCCEDUnitTest.java | 4 +-
.../cache30/DistributedAckRegionDUnitTest.java | 7 +-
.../DistributedMulticastRegionDUnitTest.java | 8 +-
.../DistributedNoAckRegionCCEDUnitTest.java | 9 +-
.../cache30/GlobalRegionCCEDUnitTest.java | 4 +-
.../gemfire/cache30/QueueMsgDUnitTest.java | 9 +-
.../gemfire/cache30/ReconnectDUnitTest.java | 75 +-
.../RegionReliabilityListenerDUnitTest.java | 6 +-
.../cache30/RegionReliabilityTestCase.java | 29 +-
.../gemfire/cache30/RequiredRolesDUnitTest.java | 13 +-
.../cache30/RolePerformanceDUnitTest.java | 5 +-
.../gemfire/cache30/SlowRecDUnitTest.java | 36 +-
.../gemfire/cache30/TXDistributedDUnitTest.java | 5 +-
.../distributed/DistributedMemberDUnitTest.java | 9 +-
.../DistributedSystemConnectPerf.java | 7 +-
.../distributed/DistributedSystemDUnitTest.java | 16 +-
.../gemfire/distributed/LocatorDUnitTest.java | 100 +-
.../LocatorLauncherLocalIntegrationTest.java | 30 +-
.../LocatorLauncherRemoteIntegrationTest.java | 3 +-
.../gemfire/distributed/RoleDUnitTest.java | 11 +-
.../ServerLauncherLocalIntegrationTest.java | 40 +-
.../ServerLauncherRemoteIntegrationTest.java | 9 +-
.../distributed/internal/Bug40751DUnitTest.java | 4 +-
.../ConsoleDistributionManagerDUnitTest.java | 4 +-
.../internal/DistributionConfigJUnitTest.java | 34 +-
.../internal/DistributionManagerDUnitTest.java | 23 +-
.../InternalDistributedSystemJUnitTest.java | 56 +-
.../internal/ProductUseLogDUnitTest.java | 6 +-
.../membership/MembershipJUnitTest.java | 19 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 12 +-
.../locator/GMSLocatorRecoveryJUnitTest.java | 6 +-
.../messenger/JGroupsMessengerJUnitTest.java | 8 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 12 +-
.../TcpServerBackwardCompatDUnitTest.java | 7 +-
.../gemfire/disttx/CacheMapDistTXDUnitTest.java | 7 +-
.../gemfire/disttx/DistTXJUnitTest.java | 2 +-
.../gemfire/disttx/DistTXOrderDUnitTest.java | 6 +-
.../disttx/DistTXRestrictionsDUnitTest.java | 7 +-
.../disttx/DistTXWithDeltaDUnitTest.java | 7 +-
.../disttx/DistributedTransactionDUnitTest.java | 2 +-
.../gemfire/disttx/PRDistTXDUnitTest.java | 7 +-
.../gemfire/disttx/PRDistTXJUnitTest.java | 2 +-
.../disttx/PRDistTXWithVersionsDUnitTest.java | 7 +-
...entPartitionedRegionWithDistTXDUnitTest.java | 7 +-
.../internal/AbstractConfigJUnitTest.java | 99 +-
.../internal/GemFireStatSamplerJUnitTest.java | 29 +-
.../gemfire/internal/JSSESocketJUnitTest.java | 12 +-
.../gemfire/internal/JarDeployerDUnitTest.java | 3 +-
.../internal/PdxDeleteFieldDUnitTest.java | 2 +-
.../gemfire/internal/PdxRenameDUnitTest.java | 2 +-
.../gemfire/internal/SSLConfigJUnitTest.java | 571 +++--
.../gemfire/internal/cache/BackupJUnitTest.java | 14 +-
.../internal/cache/Bug37244JUnitTest.java | 6 +-
.../internal/cache/Bug41091DUnitTest.java | 13 +-
.../internal/cache/Bug45934DUnitTest.java | 7 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 9 +-
.../cache/ClientServerTransactionDUnitTest.java | 38 +-
.../cache/ConcurrentMapOpsDUnitTest.java | 5 +-
.../cache/ConnectDisconnectDUnitTest.java | 7 +-
.../cache/DeltaPropagationDUnitTest.java | 13 +-
.../cache/DiskOfflineCompactionJUnitTest.java | 11 +-
.../internal/cache/DiskOldAPIsJUnitTest.java | 14 +-
.../cache/DiskRegCacheXmlJUnitTest.java | 5 +-
.../DiskRegCachexmlGeneratorJUnitTest.java | 306 +--
.../DiskRegionIllegalArguementsJUnitTest.java | 10 +-
...iskRegionIllegalCacheXMLvaluesJUnitTest.java | 5 +-
.../internal/cache/DiskRegionTestingBase.java | 14 +-
.../cache/DiskStoreFactoryJUnitTest.java | 11 +-
.../cache/FixedPRSinglehopDUnitTest.java | 6 +-
.../internal/cache/GridAdvisorDUnitTest.java | 1308 +++++------
.../cache/IncrementalBackupDUnitTest.java | 5 +-
.../internal/cache/InterruptDiskJUnitTest.java | 11 +-
...InterruptsConserveSocketsFalseDUnitTest.java | 4 +-
.../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 6 +-
...victionAlgoMemoryEnabledRegionJUnitTest.java | 6 +-
.../cache/OfflineSnapshotJUnitTest.java | 5 +-
...dRegionAPIConserveSocketsFalseDUnitTest.java | 4 +-
...rtitionedRegionCacheXMLExampleDUnitTest.java | 7 +-
.../PartitionedRegionSingleHopDUnitTest.java | 11 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 9 +-
.../PersistentPartitionedRegionJUnitTest.java | 5 +-
.../cache/RemoteTransactionDUnitTest.java | 7 +-
.../internal/cache/RunCacheInOldGemfire.java | 5 +-
.../cache/TombstoneCreationJUnitTest.java | 10 +-
.../cache/TransactionsWithDeltaDUnitTest.java | 5 +-
...ltiThreadedOplogPerJUnitPerformanceTest.java | 6 +-
...ributedRegionFunctionExecutionDUnitTest.java | 7 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 18 +-
...egionFunctionExecutionFailoverDUnitTest.java | 6 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 22 +-
.../internal/cache/ha/Bug48879DUnitTest.java | 6 +-
.../cache/ha/HARegionQueueJUnitTest.java | 5 +-
.../cache/locks/TXLockServiceDUnitTest.java | 4 +-
.../cache/partitioned/Bug43684DUnitTest.java | 15 +-
.../cache/partitioned/Bug47388DUnitTest.java | 7 +-
.../cache/partitioned/Bug51400DUnitTest.java | 4 +-
.../PersistentRecoveryOrderDUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 8 +-
.../cache/tier/sockets/Bug37805DUnitTest.java | 8 +-
.../cache/tier/sockets/CacheServerTestUtil.java | 26 +-
.../tier/sockets/ClientConflationDUnitTest.java | 5 +-
.../sockets/DurableClientBug39997DUnitTest.java | 6 +-
.../DurableClientQueueSizeDUnitTest.java | 10 +-
.../DurableClientReconnectDUnitTest.java | 7 +-
.../sockets/DurableClientStatsDUnitTest.java | 8 +-
.../sockets/DurableRegistrationDUnitTest.java | 7 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 8 +-
.../sockets/InterestRegrListenerDUnitTest.java | 7 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 6 +-
.../CompressionCacheConfigDUnitTest.java | 5 +-
.../datasource/AbstractPoolCacheJUnitTest.java | 6 +-
.../internal/datasource/CleanUpJUnitTest.java | 5 +-
.../ConnectionPoolCacheImplJUnitTest.java | 5 +-
.../datasource/ConnectionPoolingJUnitTest.java | 5 +-
.../datasource/DataSourceFactoryJUnitTest.java | 5 +-
.../internal/datasource/RestartJUnitTest.java | 5 +-
.../internal/jta/BlockingTimeOutJUnitTest.java | 6 +-
.../gemfire/internal/jta/CacheUtils.java | 9 +-
.../internal/jta/DataSourceJTAJUnitTest.java | 12 +-
.../jta/GlobalTransactionJUnitTest.java | 5 +-
.../jta/TransactionTimeOutJUnitTest.java | 7 +-
.../internal/jta/dunit/ExceptionsDUnitTest.java | 5 +-
.../jta/dunit/IdleTimeOutDUnitTest.java | 5 +-
.../jta/dunit/LoginTimeOutDUnitTest.java | 5 +-
.../jta/dunit/MaxPoolSizeDUnitTest.java | 5 +-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 5 +-
.../dunit/TxnManagerMultiThreadDUnitTest.java | 5 +-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 6 +-
.../DistributedSystemLogFileJUnitTest.java | 73 +-
.../logging/LocatorLogFileJUnitTest.java | 10 +-
.../logging/LogWriterPerformanceTest.java | 6 +-
.../CustomConfigWithCacheIntegrationTest.java | 6 +-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 4 +-
.../statistics/StatisticsDUnitTest.java | 15 +-
.../internal/stats50/AtomicStatsJUnitTest.java | 5 +-
.../management/ClientHealthStatsDUnitTest.java | 16 +-
.../DataBrowserJSONValidationJUnitTest.java | 8 +-
.../management/LocatorManagementDUnitTest.java | 5 +-
.../gemfire/management/ManagementTestBase.java | 10 +-
...ersalMembershipListenerAdapterDUnitTest.java | 19 +-
.../stats/DistributedSystemStatsJUnitTest.java | 8 +-
.../bean/stats/MBeanStatsTestCase.java | 10 +-
.../cli/commands/ConfigCommandsDUnitTest.java | 2 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 17 +-
.../cli/commands/DeployCommandsDUnitTest.java | 7 +-
.../commands/DiskStoreCommandsDUnitTest.java | 10 +-
.../HTTPServiceSSLSupportJUnitTest.java | 30 +-
.../cli/commands/IndexCommandsDUnitTest.java | 13 +-
.../ListAndDescribeRegionDUnitTest.java | 8 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 5 +-
.../cli/commands/MemberCommandsDUnitTest.java | 17 +-
.../MiscellaneousCommandsDUnitTest.java | 8 +-
.../cli/commands/QueueCommandsDUnitTest.java | 8 +-
.../cli/commands/ShowDeadlockDUnitTest.java | 10 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 8 +-
.../cli/commands/UserCommandsDUnitTest.java | 3 +-
.../security/ExampleJSONAuthorization.java | 7 +-
.../internal/security/JSONAuthorization.java | 11 +-
.../ClientsWithVersioningRetryDUnitTest.java | 4 +-
.../gemstone/gemfire/redis/AuthJUnitTest.java | 11 +-
.../gemstone/gemfire/redis/HashesJUnitTest.java | 6 +-
.../gemstone/gemfire/redis/ListsJUnitTest.java | 9 +-
.../gemfire/redis/RedisDistDUnitTest.java | 6 +-
.../gemstone/gemfire/redis/SetsJUnitTest.java | 6 +-
.../gemfire/redis/SortedSetsJUnitTest.java | 6 +-
.../gemfire/redis/StringsJunitTest.java | 6 +-
.../generator/SSLCredentialGenerator.java | 10 +-
.../gemfire/test/dunit/LogWriterUtils.java | 4 +-
.../internal/JUnit4DistributedTestCase.java | 10 +-
.../test/dunit/standalone/DUnitLauncher.java | 11 +-
.../gemfire/test/golden/GoldenTestCase.java | 4 +-
.../gemfire/test/process/ProcessWrapper.java | 5 +-
.../com/main/WANBootStrapping_Site1_Add.java | 2 +-
.../com/main/WANBootStrapping_Site1_Remove.java | 4 +-
.../com/main/WANBootStrapping_Site2_Add.java | 2 +-
.../com/main/WANBootStrapping_Site2_Remove.java | 4 +-
.../gemfire/cache/query/cq/CQJUnitTest.java | 5 +-
.../cq/dunit/CqDataUsingPoolDUnitTest.java | 8 +-
.../cache/query/cq/dunit/CqStateDUnitTest.java | 4 +-
.../PartitionedRegionCqQueryDUnitTest.java | 6 +-
.../cache/snapshot/ClientSnapshotDUnitTest.java | 5 +-
.../cache/RemoteCQTransactionDUnitTest.java | 5 +-
.../tier/sockets/DurableClientTestCase.java | 7 +-
.../CacheServerManagementDUnitTest.java | 7 +-
.../cli/commands/ClientCommandsDUnitTest.java | 20 +-
.../DurableClientCommandsDUnitTest.java | 8 +-
.../IndexRepositoryImplPerformanceTest.java | 1 -
...uceneIndexXmlParserIntegrationJUnitTest.java | 5 +-
.../spark/connector/JavaApiIntegrationTest.java | 2 +-
.../internal/cache/UpdateVersionDUnitTest.java | 14 +-
.../cache/wan/CacheClientNotifierDUnitTest.java | 8 +-
.../gemfire/internal/cache/wan/WANTestBase.java | 10 +-
.../cache/wan/disttx/DistTXWANDUnitTest.java | 4 +-
.../wan/misc/NewWanAuthenticationDUnitTest.java | 6 +-
264 files changed, 4095 insertions(+), 3815 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
index 65b0eb2..e217195 100644
--- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
+++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
@@ -31,11 +31,9 @@ import org.slf4j.LoggerFactory;
import java.util.Iterator;
import java.util.Properties;
-public class RegionFactoryDelegate {
-
- private static final String LOG_FILE = DistributionConfig.LOG_FILE_NAME;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
- private static final String CACHE_XML_FILE = DistributionConfig.CACHE_XML_FILE_NAME;
+public class RegionFactoryDelegate {
private static final String DEFAULT_REGION_TYPE = RegionShortcut.REPLICATE_HEAP_LRU.name();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
index 386e22f..cde19c6 100644
--- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
+++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Region.Entry;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import junit.framework.TestCase;
@@ -36,7 +35,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.logging.Level;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
@Ignore("Can this test be deleted?")
@Category(IntegrationTest.class)
@@ -50,7 +49,7 @@ public class SecondVMTest extends TestCase {
public void _testStartEmptyVM() throws IOException {
Properties gemfireProperties = new Properties();
gemfireProperties.setProperty(MCAST_PORT, "5555");
- gemfireProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+ gemfireProperties.setProperty(LOG_LEVEL, "fine");
Cache cache = new CacheFactory(gemfireProperties).create();
System.in.read();
Iterator it = cache.rootRegions().iterator();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
index 481ec09..c9b9da6 100644
--- a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
+++ b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
@@ -36,6 +36,8 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public abstract class AbstractCache {
protected GemFireCache cache;
@@ -111,7 +113,7 @@ public abstract class AbstractCache {
}
public String getLogFileName() {
- String logFileName = getGemFireProperties().get(DistributionConfig.LOG_FILE_NAME);
+ String logFileName = getGemFireProperties().get(LOG_FILE);
if (logFileName == null) {
logFileName = DEFAULT_LOG_FILE_NAME;
}
@@ -119,7 +121,7 @@ public abstract class AbstractCache {
}
public String getStatisticArchiveFileName() {
- String statisticsArchiveFileName = getGemFireProperties().get(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME);
+ String statisticsArchiveFileName = getGemFireProperties().get(STATISTIC_ARCHIVE_FILE);
if (statisticsArchiveFileName == null) {
statisticsArchiveFileName = DEFAULT_STATISTIC_ARCHIVE_FILE_NAME;
}
@@ -127,7 +129,7 @@ public abstract class AbstractCache {
}
public String getCacheXmlFileName() {
- String cacheXmlFileName = getGemFireProperties().get(DistributionConfig.CACHE_XML_FILE_NAME);
+ String cacheXmlFileName = getGemFireProperties().get(CACHE_XML_FILE);
if (cacheXmlFileName == null) {
cacheXmlFileName = getDefaultCacheXmlFileName();
}
@@ -219,19 +221,19 @@ public abstract class AbstractCache {
if (getCacheXmlFileName().equals(getDefaultCacheXmlFileName()) && !cacheXmlFile.exists()) {
absoluteCacheXmlFileName = DistributionConfig.DEFAULT_CACHE_XML_FILE.getName();
}
- properties.put(DistributionConfig.CACHE_XML_FILE_NAME, absoluteCacheXmlFileName);
+ properties.put(CACHE_XML_FILE, absoluteCacheXmlFileName);
// Replace the log file in the properties
- properties.put(DistributionConfig.LOG_FILE_NAME, getLogFile().getAbsolutePath());
+ properties.put(LOG_FILE, getLogFile().getAbsolutePath());
// Replace the statistics archive file in the properties
File statisticArchiveFile = getStatisticArchiveFile();
if (statisticArchiveFile == null) {
// Remove the statistics archive file name since statistic sampling is disabled
- properties.remove(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME);
- properties.remove(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME);
+ properties.remove(STATISTIC_ARCHIVE_FILE);
+ properties.remove(STATISTIC_SAMPLING_ENABLED);
} else {
- properties.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, statisticArchiveFile.getAbsolutePath());
+ properties.put(STATISTIC_ARCHIVE_FILE, statisticArchiveFile.getAbsolutePath());
}
getLogger().info("Creating distributed system from: " + properties);
@@ -269,7 +271,7 @@ public abstract class AbstractCache {
protected File getStatisticArchiveFile() {
File statisticsArchiveFile = null;
- String statisticSamplingEnabled = getGemFireProperties().get(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME);
+ String statisticSamplingEnabled = getGemFireProperties().get(STATISTIC_SAMPLING_ENABLED);
if (statisticSamplingEnabled != null && statisticSamplingEnabled.equals("true")) {
String statisticsArchiveFileName = getStatisticArchiveFileName();
statisticsArchiveFile = new File(statisticsArchiveFileName);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
index 4f2d06d..fac2472 100644
--- a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.modules.session;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.modules.session.catalina.DeltaSessionManager;
import com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener;
@@ -37,7 +36,7 @@ import java.beans.PropertyChangeEvent;
import java.io.IOException;
import java.io.PrintWriter;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static junit.framework.Assert.*;
public abstract class TestSessionsBase {
@@ -59,7 +58,7 @@ public abstract class TestSessionsBase {
PeerToPeerCacheLifecycleListener p2pListener = new PeerToPeerCacheLifecycleListener();
p2pListener.setProperty(MCAST_PORT, "0");
- p2pListener.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config");
+ p2pListener.setProperty(LOG_LEVEL, "config");
server.getEmbedded().addLifecycleListener(p2pListener);
sessionManager = manager;
sessionManager.setEnableCommitValve(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
index 84d4aba..b8c9cca 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
@@ -39,6 +39,8 @@ import java.io.File;
import static org.junit.Assert.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* These tests are part of assembly as they require the REST war file to be present.
*/
@@ -70,11 +72,11 @@ public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLaunc
.setPort(this.locatorPort)
.setRedirectOutput(false)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
- .set(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false")
- .set(DistributionConfig.JMX_MANAGER_NAME, "true")
- .set(DistributionConfig.JMX_MANAGER_START_NAME, "true")
- .set(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
+ .set(LOG_LEVEL, "config")
+ .set(ENABLE_CLUSTER_CONFIGURATION, "false")
+ .set(JMX_MANAGER, "true")
+ .set(JMX_MANAGER_START, "true")
+ .set(JMX_MANAGER_PORT, "0");
performTest(builder);
}
@@ -91,11 +93,11 @@ public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLaunc
.setPort(this.locatorPort)
.setRedirectOutput(false)
.setWorkingDirectory(rootFolder)
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
- .set(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false")
- .set(DistributionConfig.JMX_MANAGER_NAME, "true")
- .set(DistributionConfig.JMX_MANAGER_START_NAME, "true")
- .set(DistributionConfig.JMX_MANAGER_PORT_NAME, Integer.toString(jmxPort));
+ .set(LOG_LEVEL, "config")
+ .set(ENABLE_CLUSTER_CONFIGURATION, "false")
+ .set(JMX_MANAGER, "true")
+ .set(JMX_MANAGER_START, "true")
+ .set(JMX_MANAGER_PORT, Integer.toString(jmxPort));
performTest(builder);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index e04e012..d468a4a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -64,7 +64,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
@@ -917,7 +917,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
private ClientCache setupClientCache(final String durableClientId, final int serverPort) {
- ClientCache clientCache = new ClientCacheFactory().set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId).create();
+ ClientCache clientCache = new ClientCacheFactory().set(DURABLE_CLIENT_ID, durableClientId).create();
PoolFactory poolFactory = PoolManager.createFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 3fc1fcc..b97cef3 100755
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -35,8 +35,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
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.*;
/**
@@ -101,8 +100,8 @@ public class LauncherLifecycleCommandsJUnitTest {
final Properties gemfireProperties = new Properties();
gemfireProperties.setProperty(LOCATORS, "localhost[11235]");
- gemfireProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config");
- gemfireProperties.setProperty(DistributionConfig.LOG_FILE_NAME, StringUtils.EMPTY_STRING);
+ gemfireProperties.setProperty(LOG_LEVEL, "config");
+ gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY_STRING);
gemfireProperties.setProperty(MCAST_PORT, "0");
gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "tidepool");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
index 6861f64..62131fe 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
@@ -50,7 +50,7 @@ import java.io.InputStreamReader;
import java.text.SimpleDateFormat;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.*;
/**
@@ -110,7 +110,7 @@ public class RestInterfaceJUnitTest {
.setPdxIgnoreUnreadFields(false)
.set("name", getClass().getSimpleName())
.set(MCAST_PORT, "0")
- .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+ .set(LOG_LEVEL, "config")
.set(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, "localhost")
.set(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(getHttpServicePort()))
//.set("http-service-ssl-enabled", "false")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 604e3cf..4be3b0f 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -53,8 +53,7 @@ import java.util.HashMap;
import java.util.Map;
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.*;
/**
*
@@ -245,26 +244,26 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
private void configureSSL(Properties props, Properties sslProperties, boolean clusterLevel) {
if (clusterLevel) {
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, DistributionConfig.CLUSTER_SSL_ENABLED_NAME);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME,
- DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME,
- DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_NAME, DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME,
- DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_ENABLED, CLUSTER_SSL_ENABLED);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE, CLUSTER_SSL_KEYSTORE);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,
+ CLUSTER_SSL_KEYSTORE_PASSWORD);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_TYPE, CLUSTER_SSL_KEYSTORE_TYPE);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_PROTOCOLS, CLUSTER_SSL_PROTOCOLS);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION,
+ CLUSTER_SSL_REQUIRE_AUTHENTICATION);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE, CLUSTER_SSL_TRUSTSTORE);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,
+ CLUSTER_SSL_TRUSTSTORE_PASSWORD);
} else {
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, null);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, null);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, null);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, null);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, null);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME, null);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_NAME, null);
- sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_ENABLED, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_TYPE, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_PROTOCOLS, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE, null);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index 726b228..e5e2d6e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -24,8 +24,6 @@ import java.util.Properties;
import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
-//import com.gemstone.gemfire.admin.jmx.AgentConfig;
-//import java.net.InetAddress;
/**
* Configuration for defining a GemFire distributed system to
@@ -114,8 +112,7 @@ public interface DistributedSystemConfig extends Cloneable {
/** The name of the "membership-port-range" property
* @since GemFire 6.5
*/
- String MEMBERSHIP_PORT_RANGE_NAME =
- DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME;
+ String MEMBERSHIP_PORT_RANGE_NAME = MEMBERSHIP_PORT_RANGE;
/**
* The default membership-port-range.
@@ -197,32 +194,28 @@ public interface DistributedSystemConfig extends Cloneable {
"rsh -n {HOST} {CMD}";
/** The name of the "SSLEnabled" property */
- String SSL_ENABLED_NAME =
- DistributionConfig.SSL_ENABLED_NAME;
+ String SSL_ENABLED_NAME = SSL_ENABLED;
/** The default ssl-enabled state (<code>false</code>) */
boolean DEFAULT_SSL_ENABLED =
DistributionConfig.DEFAULT_SSL_ENABLED;
/** The name of the "SSLProtocols" property */
- String SSL_PROTOCOLS_NAME =
- DistributionConfig.SSL_PROTOCOLS_NAME;
+ String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
/** The default ssl-protocols value (<code>any</code>) */
String DEFAULT_SSL_PROTOCOLS =
DistributionConfig.DEFAULT_SSL_PROTOCOLS;
/** The name of the "SSLCiphers" property */
- String SSL_CIPHERS_NAME =
- DistributionConfig.SSL_CIPHERS_NAME;
+ String SSL_CIPHERS_NAME = SSL_CIPHERS;
/** The default ssl-ciphers value. (<code>any</code>) */
String DEFAULT_SSL_CIPHERS =
DistributionConfig.DEFAULT_SSL_CIPHERS;
/** The name of the "SSLRequireAuthentication" property */
- String SSL_REQUIRE_AUTHENTICATION_NAME =
- DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME;
+ String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
/** The default ssl-require-authentication value (<code>true</code>) */
boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION =
@@ -241,21 +234,21 @@ public interface DistributedSystemConfig extends Cloneable {
int DEFAULT_MEMBER_TIMEOUT = DistributionConfig.DEFAULT_MEMBER_TIMEOUT;
/** The name of the "logFile" property */
- String LOG_FILE_NAME = DistributionConfig.LOG_FILE_NAME;
+ String LOG_FILE_NAME = LOG_FILE;
/** The default log-file value ("" which directs logging to standard
* output) */
String DEFAULT_LOG_FILE = "";
/** The name of the "logLevel" property */
- String LOG_LEVEL_NAME = DistributionConfig.LOG_LEVEL_NAME;
+ String LOG_LEVEL_NAME = LOG_LEVEL;
/** The default log level ("config") */
String DEFAULT_LOG_LEVEL = "config";
/** The name of the "LogDiskSpaceLimit" property */
String LOG_DISK_SPACE_LIMIT_NAME =
- DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME;
+ LOG_DISK_SPACE_LIMIT;
/** The default log disk space limit in megabytes (0) */
int DEFAULT_LOG_DISK_SPACE_LIMIT =
@@ -270,8 +263,7 @@ public interface DistributedSystemConfig extends Cloneable {
DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT;
/** The name of the "LogFileSizeLimit" property */
- String LOG_FILE_SIZE_LIMIT_NAME =
- DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME;
+ String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT;
/** The default log file size limit in megabytes (0) */
int DEFAULT_LOG_FILE_SIZE_LIMIT =
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 9438d91..38b9218 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -573,7 +573,7 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
MCAST_ADDRESS,
InetAddressUtil.toInetAddress(this.config.getMcastAddress())),
new ConfigurationParameterImpl(
- DistributionConfig.DISABLE_TCP_NAME,
+ DISABLE_TCP,
Boolean.valueOf(this.config.getDisableTcp()) ),
};
member.setConfiguration(configParms);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
index 225b4de..1994f05 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
@@ -18,9 +18,10 @@ package com.gemstone.gemfire.admin.internal;
import com.gemstone.gemfire.admin.CacheServerConfig;
import com.gemstone.gemfire.admin.CacheVmConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.admin.GemFireVM;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* An implementation of <code>CacheVmConfig</code>
*
@@ -54,7 +55,7 @@ public class CacheServerConfigImpl extends ManagedEntityConfigImpl
public CacheServerConfigImpl(GemFireVM vm) {
super(vm);
- String name = DistributionConfig.CACHE_XML_FILE_NAME;
+ String name = CACHE_XML_FILE;
this.cacheXMLFile = vm.getConfig().getAttribute(name);
this.classpath = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
index 524578d..ee6f597 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
@@ -18,11 +18,12 @@ package com.gemstone.gemfire.admin.internal;
import com.gemstone.gemfire.admin.*;
import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.internal.admin.GemFireVM;
import com.gemstone.gemfire.internal.admin.remote.RemoteApplicationVM;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Implements the administrative interface to a cache server.
*
@@ -142,7 +143,7 @@ public class CacheServerImpl extends ManagedSystemMemberImpl
String file = this.getConfig().getCacheXMLFile();
if (file != null && file.length() > 0) {
sb.append(" ");
- sb.append(DistributionConfig.CACHE_XML_FILE_NAME);
+ sb.append(CACHE_XML_FILE);
sb.append("=");
sb.append(file);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
index 9f3c6c9..cad20d0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
@@ -1088,7 +1088,7 @@ public class DistributedSystemConfigImpl
buf.append(lf);
buf.append(" " + TCP_PORT + "=" + this.tcpPort);
buf.append(lf);
- buf.append(" " + DistributionConfig.DISABLE_TCP_NAME + "=");
+ buf.append(" " + DISABLE_TCP + "=");
buf.append(String.valueOf(this.disableTcp));
buf.append(lf);
buf.append(" " + DistributionConfig.DISABLE_AUTO_RECONNECT_NAME + "=");
@@ -1097,7 +1097,7 @@ public class DistributedSystemConfigImpl
buf.append(" " + REMOTE_COMMAND_NAME + "=");
buf.append(String.valueOf(this.remoteCommand));
buf.append(lf);
- buf.append(" " + SSL_ENABLED_NAME + "=");
+ buf.append(" " + SSL_ENABLED + "=");
buf.append(String.valueOf(this.sslEnabled));
buf.append(lf);
buf.append(" " + SSL_CIPHERS_NAME + "=");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
index ab39935..0c1eab5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
@@ -32,7 +32,7 @@ import java.io.File;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Implements the actual administration (starting, stopping, etc.) of
@@ -318,16 +318,16 @@ class EnabledManagedEntityController implements ManagedEntityController {
MCAST_PORT,
"0");
sslProps.setProperty(prefix +
- DistributionConfig.SSL_ENABLED_NAME,
+ SSL_ENABLED,
String.valueOf(config.isSSLEnabled()));
sslProps.setProperty(prefix +
- DistributionConfig.SSL_CIPHERS_NAME,
+ SSL_CIPHERS,
config.getSSLCiphers());
sslProps.setProperty(prefix +
- DistributionConfig.SSL_PROTOCOLS_NAME,
+ SSL_PROTOCOLS,
config.getSSLProtocols());
sslProps.setProperty(prefix +
- DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME,
+ SSL_REQUIRE_AUTHENTICATION,
String.valueOf(config.isSSLAuthenticationRequired()));
return sslProps;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
index 5aaa184..0f56d0f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
@@ -287,7 +287,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
props.setProperty(STATE_SAVE_FILE_NAME,
String.valueOf(DEFAULT_STATE_SAVE_FILE));
- props.setProperty(SSL_ENABLED_NAME,
+ props.setProperty(SSL_ENABLED,
String.valueOf(DEFAULT_SSL_ENABLED));
props.setProperty(SSL_PROTOCOLS_NAME,
@@ -695,7 +695,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom()));
props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList()));
- props.setProperty(SSL_ENABLED_NAME, toString(SSL_ENABLED_NAME, isSSLEnabled()));
+ props.setProperty(SSL_ENABLED, toString(SSL_ENABLED, isSSLEnabled()));
props.setProperty(SSL_PROTOCOLS_NAME, toString(SSL_PROTOCOLS_NAME, getSSLProtocols()));
props.setProperty(SSL_CIPHERS_NAME, toString(SSL_CIPHERS_NAME, getSSLCiphers()));
props.setProperty(SSL_REQUIRE_AUTHENTICATION_NAME, toString(SSL_REQUIRE_AUTHENTICATION_NAME, isSSLAuthenticationRequired()));
@@ -1071,7 +1071,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
DEFAULT_HTTP_AUTHENTICATION_PASSWORD);
this.sslEnabled = validateBoolean(props.getProperty(
- SSL_ENABLED_NAME),
+ SSL_ENABLED),
DEFAULT_SSL_ENABLED);
this.sslProtocols = validateNonEmptyString(props.getProperty(
SSL_PROTOCOLS_NAME),
@@ -1280,7 +1280,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
return LocalizedStrings.AgentConfigImpl_REFRESH_INTERVAL_IN_SECONDS_FOR_AUTOREFRESH_OF_MEMBERS_AND_STATISTIC_RESOURCES.toLocalizedString();
} else if (prop.equals(REMOTE_COMMAND_NAME)) {
return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_FOR_LAUNCHING_MEMBERS_OF_THE_DISTRIBUTED_SYSTEM.toLocalizedString();
- } else if (prop.equals(SSL_ENABLED_NAME)) {
+ } else if (prop.equals(SSL_ENABLED)) {
return LocalizedStrings.AgentConfigImpl_DOES_THE_DISTRIBUTED_SYSTEM_COMMUNICATE_USING_SSL.toLocalizedString();
} else if (prop.equals(SSL_PROTOCOLS_NAME)) {
return LocalizedStrings.AgentConfigImpl_SSL_PROTOCOLS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
index 2667ec7..9e80cf3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.admin.jmx.internal;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.admin.*;
import com.gemstone.gemfire.admin.jmx.Agent;
import com.gemstone.gemfire.cache.InterestPolicy;
@@ -658,10 +660,10 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
//assuming will never return as per current implementation
ConfigurationParameter[] configParams = member.getConfiguration();
for (ConfigurationParameter configParam : configParams) {
- if (DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME.equals(configParam.getName())) {
+ if (STATISTIC_SAMPLING_ENABLED.equals(configParam.getName())) {
allDetails.put(MEMBER_STATSAMPLING_ENABLED, configParam.getValue());
statSamplingEnabled = Boolean.parseBoolean(""+configParam.getValue());
- } else if (DistributionConfig.ENABLE_TIME_STATISTICS_NAME.equals(configParam.getName())) {
+ } else if (ENABLE_TIME_STATISTICS.equals(configParam.getName())) {
allDetails.put(MEMBER_TIME_STATS_ENABLED, configParam.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
index b85e17a..94c8ecf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
@@ -45,6 +45,8 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Authenticates this client (or a user) on a server. This op ideally should get
* executed once-per-server.
@@ -111,8 +113,7 @@ public class AuthenticateUserOp {
DistributedMember server = new InternalDistributedMember(con.getSocket()
.getInetAddress(), con.getSocket().getPort(), false);
DistributedSystem sys = InternalDistributedSystem.getConnectedInstance();
- String authInitMethod = sys.getProperties().getProperty(
- DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME);
+ String authInitMethod = sys.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT);
Properties tmpSecurityProperties = sys.getSecurityProperties();
// LOG: following passes the DS API LogWriters into the security API
@@ -158,8 +159,7 @@ public class AuthenticateUserOp {
.getSocket().getInetAddress(), cnx.getSocket().getPort(), false);
DistributedSystem sys = InternalDistributedSystem
.getConnectedInstance();
- String authInitMethod = sys.getProperties().getProperty(
- DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME);
+ String authInitMethod = sys.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT);
Properties credentials = HandShake.getCredentials(authInitMethod,
this.securityProperties, server, false, (InternalLogWriter)sys.getLogWriter(), (InternalLogWriter)sys
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
index 96ea8ea..80f1b82 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -43,6 +43,8 @@ import java.net.URL;
import java.util.*;
import java.util.concurrent.TimeUnit;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* A "connection" to a GemFire distributed system. A
* <code>DistributedSystem</code> is created by invoking the {@link
@@ -1742,7 +1744,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
// String prop=(String)en.nextElement();
// logger.info(prop + "=" + props.getProperty(prop));
//}
- props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "true");
+ props.setProperty(CONSERVE_SOCKETS, "true");
// LOG: no longer using the LogWriter that was passed in
return connect(props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index 52e9c34..1e350e7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -17,6 +17,8 @@
package com.gemstone.gemfire.distributed;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
@@ -1089,7 +1091,7 @@ public final class LocatorLauncher extends AbstractLauncher<String> {
private Properties getOverriddenDefaults() {
Properties overriddenDefaults = new Properties();
- overriddenDefaults.put(ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(DistributionConfig.LOG_FILE_NAME),
+ overriddenDefaults.put(ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(LOG_FILE),
getLogFileName());
for (String key : System.getProperties().stringPropertyNames()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index 252f701..fe441fd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -17,6 +17,8 @@
package com.gemstone.gemfire.distributed;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
@@ -1258,7 +1260,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
final Properties overriddenDefaults = new Properties();
overriddenDefaults.put(
- ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(DistributionConfig.LOG_FILE_NAME),
+ ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(LOG_FILE),
getLogFileName());
for (String key : System.getProperties().stringPropertyNames()) {
[43/55] [abbrv] incubator-geode git commit: GEODE-1331: gfsh.bat on
Windows is incorrect.
Posted by hi...@apache.org.
GEODE-1331: gfsh.bat on Windows is incorrect.
* Renamed internal variable from CLASSPATH to DEPENDENCIES.
* Verified @setlocal was not altering the System environment variables for the shell.
* Launch with -classpath param like the bash script does.
* Ensured command-line arguments match bash script's order of arguments.
* This closes #149
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8e21638c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8e21638c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8e21638c
Branch: refs/heads/feature/GEODE-1372
Commit: 8e21638ce336aee07bec33d140500c76d1cedc53
Parents: 41d9cff
Author: Kevin J. Duling <kd...@pivotal.io>
Authored: Thu May 26 09:46:03 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Jun 6 09:05:07 2016 -0700
----------------------------------------------------------------------
geode-assembly/src/main/dist/bin/gfsh.bat | 33 +++++++++++++-------------
1 file changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e21638c/geode-assembly/src/main/dist/bin/gfsh.bat
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat
index 6813243..706146a 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -37,25 +37,22 @@ REM echo %scriptdir%
:gfok
@set GEMFIRE=%gf%
-@set GEMFIRE_JARS=%GEMFIRE%\lib\gfsh-dependencies.jar
+@set GFSH_JARS=%GEMFIRE%\lib\gfsh-dependencies.jar
+REM if a system level classpath is set, append it to the classes gfsh will need
@if defined CLASSPATH (
-@set GEMFIRE_JARS=%GEMFIRE_JARS%;%CLASSPATH%
+ @set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH%
+) else (
+ @set DEPENDENCIES=%GFSH_JARS%
)
@if not defined GF_JAVA (
-@REM %GF_JAVA% is not defined, assume it is on the PATH
-@if defined JAVA_HOME (
-@set GF_JAVA=%JAVA_HOME%\bin\java.exe
+REM %GF_JAVA% is not defined, assume it is on the PATH
+ @if defined JAVA_HOME (
+ @set GF_JAVA=%JAVA_HOME%\bin\java.exe
) else (
-@set GF_JAVA=java
+ @set GF_JAVA=java
+ )
)
-)
-
-REM
-REM GFSH_JARS
-REM
-@set GFSH_JARS=;%GEMFIRE%\lib\gfsh-dependencies.jar
-@set CLASSPATH=%GFSH_JARS%;%GEMFIRE_JARS%
REM
REM Copy default .gfshrc to the home directory. Uncomment if needed.
@@ -71,17 +68,19 @@ REM @if not exist "%USERPROFILE%\.gemfire" (
REM @mkdir "%USERPROFILE%\.gemfire"
REM )
-REM Consider java is from JDK
+REM Expect to find the tools.jar from the JDK
@set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar
@IF EXIST "%TOOLS_JAR%" (
- @set CLASSPATH=%CLASSPATH%;%TOOLS_JAR%
+ @set DEPENDENCIES=%DEPENDENCIES%;%TOOLS_JAR%
) ELSE (
set TOOLS_JAR=
)
@set LAUNCHER=com.gemstone.gemfire.management.internal.cli.Launcher
@if defined JAVA_ARGS (
-@set JAVA_ARGS="%JAVA_ARGS%"
+ @set JAVA_ARGS="%JAVA_ARGS%"
)
-@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml %JAVA_ARGS% %LAUNCHER% %*
+
+REM Call java with our classpath
+@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath %DEPENDENCIES% %JAVA_ARGS% %LAUNCHER% %*
:done
[42/55] [abbrv] incubator-geode git commit: This closes #150
Posted by hi...@apache.org.
This closes #150
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/41d9cff3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/41d9cff3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/41d9cff3
Branch: refs/heads/feature/GEODE-1372
Commit: 41d9cff33e33bbeacd2be2101bee4a5d956e8f87
Parents: fb719d0
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Fri Jun 3 14:18:32 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Jun 3 14:18:32 2016 -0700
----------------------------------------------------------------------
.../cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/41d9cff3/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 de93c75..f306cb9 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
@@ -61,7 +61,6 @@ import com.gemstone.gemfire.test.dunit.Wait;
*/
public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
-
public PartitionedRegionCqQueryDUnitTest(String name) {
super(name);
}