Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Additional changes for SGF-226 supporting cluster-based configuration in GemFire 8 based on latest changes to the shared, persistent cluster configuration service in preparation for the 8.0 release. The recent changes in SDG for the shared, persistent cluster-based configuration feature are based on GemFire RC build number r48398.

Browse Source
This commit is contained in:
John Blum
2014-08-11 19:21:33 -07:00
parent 6cb2301c32
commit 65b0793a03
7 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java
View File

@@ -75,7 +75,7 @@ public class CacheClusterConfigurationIntegrationTest {
assertTrue(locatorWorkingDirectory.isDirectory() || locatorWorkingDirectory.mkdirs());
ZipUtils.unzip(new ClassPathResource("/shared_config.zip"), locatorWorkingDirectory);
ZipUtils.unzip(new ClassPathResource("/cluster_config.zip"), locatorWorkingDirectory);
List<String> arguments = new ArrayList<String>();

6
src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java
View File

@@ -72,13 +72,13 @@ public class LocatorProcess {
DEFAULT_HOSTNAME_FOR_CLIENTS))
.setPort(Integer.getInteger("spring.gemfire.locator-port", DEFAULT_LOCATOR_PORT))
.setRedirectOutput(false)
.set(DistributionConfig.ENABLE_SHARED_CONFIGURATION_NAME, String.valueOf(Boolean.getBoolean(
.set(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, String.valueOf(Boolean.getBoolean(
"spring.gemfire.enable-cluster-configuration")))
.set(DistributionConfig.HTTP_SERVICE_PORT_NAME, System.getProperty("spring.gemfire.http-service-port",
DEFAULT_HTTP_SERVICE_PORT))
.set(DistributionConfig.JMX_MANAGER_NAME, String.valueOf(Boolean.TRUE))
.set(DistributionConfig.JMX_MANAGER_START_NAME, String.valueOf(Boolean.FALSE))
.set(DistributionConfig.LOAD_SHARED_CONFIG_FROM_DIR_NAME, String.valueOf(Boolean.getBoolean(
.set(DistributionConfig.LOAD_CLUSTER_CONFIG_FROM_DIR_NAME, String.valueOf(Boolean.getBoolean(
"spring.gemfire.load-cluster-configuration")))
.set(DistributionConfig.LOG_LEVEL_NAME, System.getProperty("spring.gemfire.log-level", DEFAULT_LOG_LEVEL))
.build();
@@ -86,7 +86,7 @@ public class LocatorProcess {
private static boolean isClusterConfigurationEnabled(final InternalLocator locator) {
return (locator != null && Boolean.valueOf(locator.getDistributedSystem().getProperties().getProperty(
DistributionConfig.ENABLE_SHARED_CONFIGURATION_NAME)));
DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME)));
}
private static void registerShutdownHook() {