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

Additional changes for JIRA feature request SGF-226 supporting GemFire's new Cluster-based Configuration Service. Renamed the CacheUsingSharedConfigurationIntegrationTest class to CacheClusterConfigurationIntegrationTest and added an additional test case to assert the default, non-use of cluster configuration behavior. Renamed GemFire System properties references for enabling/disabling Cluster Config based revision r48252 in GemFire 8.

Browse Source
This commit is contained in:
John Blum
2014-07-28 15:29:23 -07:00
parent f427125669
commit 6cb2301c32
9 changed files with 100 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
View File

@@ -97,7 +97,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
protected Boolean pdxIgnoreUnreadFields;
protected Boolean pdxPersistent;
protected Boolean pdxReadSerialized;
protected Boolean useSharedConfiguration;
protected Boolean useClusterConfiguration;
protected Cache cache;
@@ -695,8 +695,8 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
*
* @param useSharedConfiguration a boolean value to set the use-shared-configuration GemFire distribution property.
*/
public void setUseSharedConfiguration(Boolean useSharedConfiguration) {
this.useSharedConfiguration = useSharedConfiguration;
public void setUseClusterConfiguration(Boolean useSharedConfiguration) {
this.useClusterConfiguration = useSharedConfiguration;
}
/**
@@ -895,8 +895,8 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
*
* @return a boolean value indicating whether shared configuration use has been enabled or not.
*/
public Boolean getUseSharedConfiguration() {
return this.useSharedConfiguration;
public Boolean getUseClusterConfiguration() {
return this.useClusterConfiguration;
}
/**
@@ -911,8 +911,8 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
protected void postProcessPropertiesBeforeInitialization(Properties gemfireProperties) {
gemfireProperties.setProperty("disable-auto-reconnect", String.valueOf(
!Boolean.TRUE.equals(getEnableAutoReconnect())));
gemfireProperties.setProperty("use-shared-configuration", String.valueOf(
Boolean.TRUE.equals(getUseSharedConfiguration())));
gemfireProperties.setProperty("use-cluster-configuration", String.valueOf(
Boolean.TRUE.equals(getUseClusterConfiguration())));
}
/* (non-Javadoc)

4
src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
View File

@@ -263,12 +263,12 @@ public class ClientCacheFactoryBean extends CacheFactoryBean {
}
@Override
public final Boolean getUseSharedConfiguration() {
public final Boolean getUseClusterConfiguration() {
return Boolean.FALSE;
}
@Override
public final void setUseSharedConfiguration(Boolean useSharedConfiguration) {
public final void setUseClusterConfiguration(Boolean useClusterConfiguration) {
throw new UnsupportedOperationException("Shared, cluster configuration is not applicable to clients.");
}

2
src/main/java/org/springframework/data/gemfire/config/CacheParser.java
View File

@@ -72,7 +72,7 @@ class CacheParser extends AbstractSimpleBeanDefinitionParser {
ParsingUtils.setPropertyValue(element, builder, "pdx-persistent");
parsePdxDiskStore(element, parserContext, builder);
ParsingUtils.setPropertyValue(element, builder, "search-timeout");
ParsingUtils.setPropertyValue(element, builder, "use-shared-configuration");
ParsingUtils.setPropertyValue(element, builder, "use-cluster-configuration");
List<Element> txListeners = DomUtils.getChildElementsByTagName(element, "transaction-listener");