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

DATAGEODE-204 - Replace all cache.xml document schema declarations referring to the DTD to use the XSD.

Browse Source
This commit is contained in:
John Blum
2019-06-18 11:10:34 -07:00
parent 8c64ff6881
commit 0f75b2338f
13 changed files with 174 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/resources/autoregionlookup-cache.xml
View File

@@ -1,7 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<region name="NativePartitionedRegion" refid="PARTITION"/>
<region name="NativeReplicateParent" refid="REPLICATE">
@@ -9,4 +11,5 @@
<region name="NativeReplicateGrandchild" refid="REPLICATE"/>
</region>
</region>
</cache>

10
src/test/resources/cache-with-declarable.xml
View File

@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN" "http://www.gemstone.com/dtd/cache8_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<region name="Example">
<region-attributes data-policy="normal">
<cache-loader>
@@ -8,4 +11,5 @@
</cache-loader>
</region-attributes>
</region>
</cache>

48
src/test/resources/cache-with-regions.xml
View File

@@ -1,44 +1,50 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
"http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<region name="NativeLocalRegion" refid="LOCAL">
<region-attributes cloning-enabled="false"
concurrency-checks-enabled="false"
concurrency-level="80"
initial-capacity="101"
load-factor="0.95">
concurrency-checks-enabled="false"
concurrency-level="80"
initial-capacity="101"
load-factor="0.95">
<key-constraint>java.lang.Integer</key-constraint>
<value-constraint>java.lang.String</value-constraint>
</region-attributes>
</region>
<region name="NativePartitionRegion">
<region-attributes data-policy="persistent-partition"
cloning-enabled="true"
concurrency-checks-enabled="true"
concurrency-level="40"
initial-capacity="51"
load-factor="0.85"
multicast-enabled="false">
cloning-enabled="true"
concurrency-checks-enabled="true"
concurrency-level="40"
initial-capacity="51"
load-factor="0.85"
multicast-enabled="false">
<key-constraint>java.lang.Integer</key-constraint>
<value-constraint>java.lang.String</value-constraint>
</region-attributes>
</region>
<region name="NativeReplicateRegion">
<region-attributes data-policy="persistent-replicate"
cloning-enabled="false"
concurrency-checks-enabled="true"
concurrency-level="20"
initial-capacity="23"
load-factor="0.75"
multicast-enabled="false"
scope="distributed-no-ack">
cloning-enabled="false"
concurrency-checks-enabled="true"
concurrency-level="20"
initial-capacity="23"
load-factor="0.75"
multicast-enabled="false"
scope="distributed-no-ack">
<key-constraint>java.lang.Integer</key-constraint>
<value-constraint>java.lang.String</value-constraint>
</region-attributes>
</region>
<region name="NativeParentRegion" refid="REPLICATE">
<region name="NativeChildRegion" refid="REPLICATE">
</region>
</region>
</cache>

16
src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml
View File

@@ -1,16 +1,21 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
"http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<region name="Users" refid="REPLICATE">
<region-attributes initial-capacity="101" load-factor="0.85">
<key-constraint>java.lang.String</key-constraint>
<value-constraint>org.springframework.data.gemfire.repository.sample.User</value-constraint>
<cache-loader>
<class-name>org.springframework.data.gemfire.support.SpringContextBootstrappingInitializerIntegrationTest$UserDataStoreCacheLoader</class-name>
<class-name>
org.springframework.data.gemfire.support.SpringContextBootstrappingInitializerIntegrationTest$UserDataStoreCacheLoader
</class-name>
</cache-loader>
</region-attributes>
</region>
<initializer>
<class-name>org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer</class-name>
<parameter name="basePackages">
@@ -19,4 +24,5 @@
</string>
</parameter>
</initializer>
</cache>

16
src/test/resources/cache-with-spring-context-bootstrap-initializer.xml
View File

@@ -1,16 +1,21 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
"http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<region name="Users" refid="REPLICATE">
<region-attributes initial-capacity="101" load-factor="0.85">
<key-constraint>java.lang.String</key-constraint>
<value-constraint>org.springframework.data.gemfire.repository.sample.User</value-constraint>
<cache-loader>
<class-name>org.springframework.data.gemfire.support.SpringContextBootstrappingInitializerIntegrationTest$UserDataStoreCacheLoader</class-name>
<class-name>
org.springframework.data.gemfire.support.SpringContextBootstrappingInitializerIntegrationTest$UserDataStoreCacheLoader
</class-name>
</cache-loader>
</region-attributes>
</region>
<initializer>
<class-name>org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer</class-name>
<parameter name="contextConfigLocations">
@@ -21,4 +26,5 @@
</string>
</parameter>
</initializer>
</cache>

12
src/test/resources/clientcache-with-regions.xml
View File

@@ -1,11 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE client-cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
"http://www.gemstone.com/dtd/cache7_0.dtd">
<client-cache>
<?xml version="1.0" encoding="UTF-8"?>
<client-cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<region name="NativeClientRegion" refid="LOCAL">
<region-attributes cloning-enabled="false"/>
</region>
<region name="NativeClientParentRegion" refid="LOCAL">
<region name="NativeClientChildRegion" refid="LOCAL"/>
</region>
</client-cache>

10
src/test/resources/empty-cache.xml
View File

@@ -1,5 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
</cache>

10
src/test/resources/empty-client-cache.xml
View File

@@ -1,5 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE client-cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
<client-cache>
<?xml version="1.0" encoding="UTF-8"?>
<client-cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
</client-cache>

92
src/test/resources/gemfire-cache.xml
View File

@@ -1,39 +1,55 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.7//EN" "http://www.gemstone.com/dtd/cache5_7.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300">
<region-attributes id="attTemplate" scope="local" data-policy="normal" initial-capacity="16" load-factor="0.75" concurrency-level="16" statistics-enabled="true">
<key-constraint>java.lang.String</key-constraint>
</region-attributes>
<region name="root">
<region-attributes refid="attTemplate" scope="distributed-no-ack">
<region-time-to-live>
<expiration-attributes timeout="0" action="invalidate"/>
</region-time-to-live>
<region-idle-time>
<expiration-attributes timeout="0" action="invalidate"/>
</region-idle-time>
<entry-time-to-live>
<expiration-attributes timeout="0" action="invalidate"/>
</entry-time-to-live>
<entry-idle-time>
<expiration-attributes timeout="0" action="invalidate"/>
</entry-idle-time>
</region-attributes>
<entry>
<key><string>Application Version</string></key>
<value><string>1.0</string></value>
</entry>
<region name="rlocal">
<region-attributes refid="attTemplate">
</region-attributes>
</region>
<region name="rdistnoack">
<region-attributes refid="attTemplate" scope="distributed-no-ack">
</region-attributes>
</region>
<region name="rglobalreplication">
<region-attributes refid="attTemplate" scope="global" data-policy="replicate">
</region-attributes>
</region>
</region>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0"
lock-lease="120" lock-timeout="60" search-timeout="300">
<region-attributes id="attTemplate"
concurrency-level="16"
data-policy="normal"
initial-capacity="16"
load-factor="0.75"
scope="local"
statistics-enabled="true">
<key-constraint>java.lang.String</key-constraint>
</region-attributes>
<region name="root">
<region-attributes refid="attTemplate" scope="distributed-no-ack">
<region-time-to-live>
<expiration-attributes timeout="0" action="invalidate"/>
</region-time-to-live>
<region-idle-time>
<expiration-attributes timeout="0" action="invalidate"/>
</region-idle-time>
<entry-time-to-live>
<expiration-attributes timeout="0" action="invalidate"/>
</entry-time-to-live>
<entry-idle-time>
<expiration-attributes timeout="0" action="invalidate"/>
</entry-idle-time>
</region-attributes>
<entry>
<key>
<string>Application Version</string>
</key>
<value>
<string>1.0</string>
</value>
</entry>
<region name="rlocal">
<region-attributes refid="attTemplate">
</region-attributes>
</region>
<region name="rdistnoack">
<region-attributes refid="attTemplate" scope="distributed-no-ack">
</region-attributes>
</region>
<region name="rglobalreplication">
<region-attributes refid="attTemplate" scope="global" data-policy="replicate">
</region-attributes>
</region>
</region>
</cache>

23
src/test/resources/gemfire-client-cache.xml
View File

@@ -1,14 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE client-cache PUBLIC
"-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
"http://www.gemstone.com/dtd/cache6_5.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<client-cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<pool name="DEFAULT">
<locator port="1234" host="localhost"/>
</pool>
<region name="myRegion" refid="PROXY"/>
<client-cache>
<pool name="DEFAULT">
<locator port="1234" host="localhost"/>
</pool>
<region name="myRegion" refid="PROXY"/>
<!-- you can override or add to the PROXY attributes by adding
a region-attributes sub element here -->
</client-cache>

12
src/test/resources/gemfire-datasource-integration-test-cache.xml
View File

@@ -1,8 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<cache-server hostname-for-clients="localhost" port="42082"/>
<region name="ServerRegion" refid="PARTITION"/>
<region name="AnotherServerRegion" refid="REPLICATE"/>
</cache>

15
src/test/resources/lazy-wiring-declarable-support-function-cache.xml
View File

@@ -1,13 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<function-service>
<function>
<class-name>org.springframework.data.gemfire.support.LazyWiringDeclarableSupportFunctionBasedIntegrationTests$HelloGemFireFunction</class-name>
<class-name>
org.springframework.data.gemfire.support.LazyWiringDeclarableSupportFunctionBasedIntegrationTests$HelloGemFireFunction
</class-name>
<parameter name="hello.address.to">
<string>Everyone</string>
</parameter>
</function>
</function-service>
</cache>

12
src/test/resources/subregion-cache.xml
View File

@@ -1,12 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
"http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
version="1.0">
<region name="Parent" refid="REPLICATE">
<region name="Child" refid="REPLICATE">
<region name="Grandchild" refid="REPLICATE"/>
</region>
</region>
<region name="Customers" refid="REPLICATE">
<region name="Accounts" refid="REPLICATE">
<region name="Orders" refid="REPLICATE">
@@ -14,4 +17,5 @@
</region>
</region>
</region>
</cache>