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

SGF-10

Browse Source 
SGF-11
+ changed default cache name from 'cache' to 'gemfire-cache' to prevent collision with other defaults
This commit is contained in:
costin
2010-09-01 11:05:59 +03:00
parent 6f6480f032
commit e8af99870c
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ class CacheParser extends AbstractSingleBeanDefinitionParser {
throws BeanDefinitionStoreException {
String name = super.resolveId(element, definition, parserContext);
if (!StringUtils.hasText(name)) {
name = "cache";
name = "gemfire-cache";
}
return name;
}

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

@@ -60,7 +60,7 @@ class ClientRegionParser extends AbstractSingleBeanDefinitionParser {
String attr = element.getAttribute("cache-ref");
// add cache reference (fallback to default if nothing is specified)
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "cache"));
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
ManagedList<Object> interests = new ManagedList<Object>();

1
src/main/java/org/springframework/data/gemfire/config/GemfireNamespaceHandler.java
View File

@@ -30,5 +30,6 @@ class GemfireNamespaceHandler extends NamespaceHandlerSupport {
registerBeanDefinitionParser("replicated-region", new ReplicatedRegionParser());
registerBeanDefinitionParser("partitioned-region", new PartitionedRegionParser());
registerBeanDefinitionParser("client-region", new ClientRegionParser());
registerBeanDefinitionParser("pool", new PoolParser());
}
}

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

@@ -54,7 +54,7 @@ class PartitionedRegionParser extends AbstractSingleBeanDefinitionParser {
String attr = element.getAttribute("cache-ref");
// add cache reference (fallback to default if nothing is specified)
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "cache"));
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
// partition attributes

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

@@ -53,7 +53,7 @@ class ReplicatedRegionParser extends AbstractSingleBeanDefinitionParser {
String attr = element.getAttribute("cache-ref");
// add cache reference (fallback to default if nothing is specified)
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "cache"));
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
// add attributes
AttributesFactory af = new AttributesFactory();

6
src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd
View File

@@ -32,7 +32,7 @@ Defines a GemFire Cache instance used for creating or retrieving 'regions'.
<xsd:attribute name="id" type="xsd:ID" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[
The name of the cache definition (by default "cache").]]></xsd:documentation>
The name of the cache definition (by default "gemfire-cache").]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="cache-xml-location" type="xsd:string" use="optional">
@@ -128,10 +128,10 @@ The name of the region definition. If no specified, it will have the value of th
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="cache-ref" type="xsd:string" default="cache" use="optional">
<xsd:attribute name="cache-ref" type="xsd:string" default="gemfire-cache" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[
The name of the bean defining the GemFire cache (by default 'cache').
The name of the bean defining the GemFire cache (by default 'gemfire-cache').
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>

4
src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java
View File

@@ -38,8 +38,8 @@ public class CacheNamespaceTest extends RecreatingContextTest {
@Test
public void testBasicCache() throws Exception {
assertTrue(ctx.containsBean("cache"));
CacheFactoryBean cfb = (CacheFactoryBean) ctx.getBean("&cache");
assertTrue(ctx.containsBean("gemfire-cache"));
CacheFactoryBean cfb = (CacheFactoryBean) ctx.getBean("&gemfire-cache");
assertNull(TestUtils.readField("cacheXml", cfb));
assertNull(TestUtils.readField("properties", cfb));
}