fixed xsd problems

This commit is contained in:
David Turanski
2013-03-12 17:19:45 -04:00
parent 7f1d84e598
commit bb9072bed1
3 changed files with 24 additions and 119 deletions

View File

@@ -947,39 +947,24 @@ up to date copy of the data.
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="baseRegionType">
<xsd:sequence minOccurs="1" maxOccurs="1">
<xsd:sequence>
<xsd:element name="subscription" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
Subscription policy for the replicated region.
]]></xsd:documentation>
</xsd:annotation>
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="subscriptionType">
<xsd:attribute name="type" type="subscriptionPolicyType"
fixed="ALL">
<xsd:annotation>
<xsd:documentation><![CDATA[
The action to take when performing subscription.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
<xsd:attribute name="type" type="subscriptionPolicyType"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
Eviction policy for the replicated region.
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="evictionType">
@@ -995,8 +980,7 @@ The action to take when performing eviction.
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
<xsd:attributeGroup ref="distributedRegionAttributes" />
@@ -1074,29 +1058,6 @@ Defines a GemFire local region instance. Each local region is scoped only to the
<xsd:complexContent>
<xsd:extension base="baseRegionType">
<xsd:sequence minOccurs="1" maxOccurs="1">
<xsd:element name="subscription" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
Subscription policy for the replicated region.
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="subscriptionType">
<xsd:attribute name="type" type="subscriptionPolicyType"
fixed="ALL">
<xsd:annotation>
<xsd:documentation><![CDATA[
The action to take when performing subscription.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
@@ -1162,7 +1123,7 @@ The name of the region definition.
</xsd:complexContent>
</xsd:complexType>
<!-- -->
<xsd:element name="local-region" type="localRegionType" />
<xsd:element name="local-region" type="localRegionType"/>
<!-- -->
<xsd:complexType name="basePartitionedRegionType">
<xsd:annotation>
@@ -1217,7 +1178,7 @@ is created or any bucket in a partitioned region becomes primary
<xsd:annotation>
<xsd:documentation
source="com.gemstone.gemfire.cache.partition.FixedPartitionAttributes"><![CDATA[
Create a fixed partition with the given attributes. Required for a FixedPartitionResolver.
Create a fixed partition with the given attributes. Required for a FixedPartitionResolver.
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
@@ -1226,7 +1187,7 @@ is created or any bucket in a partitioned region becomes primary
<xsd:annotation>
<xsd:documentation
source="com.gemstone.gemfire.cache.partition.FixedPartitionAttributes"><![CDATA[
Specifies the fixed partition name
Specifies the fixed partition name
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -1235,7 +1196,7 @@ Specifies the fixed partition name
<xsd:annotation>
<xsd:documentation
source="com.gemstone.gemfire.cache.partition.FixedPartitionAttributes"><![CDATA[
Specifies if this member is primary for this partition
Specifies if this member is primary for this partition
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -1243,7 +1204,7 @@ Specifies if this member is primary for this partition
<xsd:annotation>
<xsd:documentation
source="com.gemstone.gemfire.cache.partition.FixedPartitionAttributes"><![CDATA[
Specifies the number of buckets to allocate to the fixed partition
Specifies the number of buckets to allocate to the fixed partition
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -1252,22 +1213,11 @@ Specifies the number of buckets to allocate to the fixed partition
<xsd:element name="subscription" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
Subscription policy for the replicated region.
]]></xsd:documentation>
</xsd:annotation>
Subscription policy for the partitioned region.
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="subscriptionType">
<xsd:attribute name="type" type="subscriptionPolicyType"
fixed="ALL">
<xsd:annotation>
<xsd:documentation><![CDATA[
The action to take when performing subscription.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
<xsd:attribute name="type" type="subscriptionPolicyType"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
@@ -1291,27 +1241,6 @@ The action to take when performing eviction.
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="subscription" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
Subscription policy for the replicated region.
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="subscriptionType">
<xsd:attribute name="type" type="subscriptionPolicyType"
fixed="ALL">
<xsd:annotation>
<xsd:documentation><![CDATA[
The action to take when performing subscription.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
<xsd:attributeGroup ref="distributedRegionAttributes" />
<xsd:attribute name="copies" use="optional" default="0">
@@ -1561,30 +1490,6 @@ reclaim memory.
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="subscriptionType">
<xsd:attribute name="type" default="ALL">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="ALL">
<xsd:annotation>
<xsd:documentation><![CDATA[
]]></xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="CONTENT_CACHE">
<xsd:annotation>
<xsd:documentation><![CDATA[
]]></xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>
<xsd:simpleType name="subscriptionPolicyType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="ALL">

View File

@@ -20,13 +20,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.data.gemfire.test.GemfireTestRunner;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Lyndon Adams
*/
@RunWith(GemfireTestRunner.class)
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("/org/springframework/data/gemfire/config/subscription-ns.xml")
public class CacheSubscriptionTest{
@Autowired ApplicationContext ctx;

View File

@@ -1,20 +1,20 @@
<?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:gfe="http://www.springframework.org/schema/gemfire"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" default-lazy-init="true">
default-lazy-init="true"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
<gfe:cache/>
<gfe:replicated-region id="rr" >
<gfe:subscription type="ALL"/>
<gfe:replicated-region id="rr">
<gfe:subscription type="ALL"/>
</gfe:replicated-region>
<gfe:partitioned-region id="pp">
<gfe:subscription type="ALL"/>
<gfe:subscription type="CACHE_CONTENT"/>
<gfe:eviction threshold="70"/>
</gfe:partitioned-region>
<gfe:client-region id="cc">