SGF-289 - Enumeration restrictions (xsd:enumeration) should be avoided in the XML schema.

Removed the XSD enumeration restriction on the 'result-policy' attribute of the 'interestType' SDG XSD complex-type definition in order to allow users to specify an Interest Policy using concrete values or properly placeholders when registering client Region Interests.
This commit is contained in:
John Blum
2015-01-27 23:51:57 -08:00
parent d615dcad5f
commit 4fc92494ae
23 changed files with 663 additions and 99 deletions

View File

@@ -1,18 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
" default-lazy-init="true">
<util:properties id="placeholderProperties">
<prop key="client.interests.durable">true</prop>
<prop key="client.interests.receive-values">false</prop>
<prop key="client.key.interests.result-policy">keys</prop>
<prop key="client.regex.interests.result-policy">Keys_VALUes</prop>
</util:properties>
<context:property-placeholder properties-ref="placeholderProperties"/>
<util:properties id="gemfireProperties">
<prop key="name">ClientRegionNamespaceTest</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">warning</prop>
</util:properties>
<gfe:pool id="gemfire-pool" subscription-enabled="false">
<gfe:locator host="localhost" port="40403"/>
</gfe:pool>
<gfe:client-cache/>
<gfe:client-cache properties-ref="gemfireProperties"/>
<gfe:client-region id="simple" name="SimpleRegion"/>
@@ -66,6 +85,20 @@
shortcut="CACHING_PROXY"
value-constraint="java.lang.String"/>
<bean id="mockCache" class="org.springframework.data.gemfire.config.ClientRegionNamespaceTest$MockCacheFactoryBean"/>
<gfe:client-region id="client-with-interests" ignore-if-exists="true" shortcut="PROXY" cache-ref="mockCache">
<gfe:key-interest durable="${client.interests.durable}" receive-values="${client.interests.receive-values}"
result-policy="${client.key.interests.result-policy}">
<bean class="java.lang.String">
<constructor-arg value=".*"/>
</bean>
</gfe:key-interest>
<gfe:regex-interest pattern="keyPrefix.*" durable="${client.interests.durable}"
receive-values="${client.interests.receive-values}"
result-policy="${client.regex.interests.result-policy}"/>
</gfe:client-region>
<bean id="c-listener" class="org.springframework.data.gemfire.SimpleCacheListener"/>
<bean id="testCompressor" class="org.springframework.data.gemfire.config.ClientRegionNamespaceTest$TestCompressor" p:name="STD"/>