From ca5585293c26d9cb5b47367916bfdd8e6494b340 Mon Sep 17 00:00:00 2001 From: John Blum Date: Sat, 11 Nov 2017 14:22:33 -0800 Subject: [PATCH] DATAGEODE-55 - Create SDG XML Namespace schemas (XSDs) for both GFE and GFE-DATA. Set META-INF/spriong.schemas appropriately. Remove all old 1.xSDG XML Namespace schemas (XSDs). --- src/main/resources/META-INF/spring.schemas | 14 +- src/main/resources/META-INF/spring.tooling | 6 +- .../gemfire/config/spring-data-geode-1.0.xsd | 251 -- ...eode-1.1.xsd => spring-data-geode-2.1.xsd} | 7 +- .../data/gemfire/config/spring-geode-1.0.xsd | 3395 ----------------- ...ing-geode-1.1.xsd => spring-geode-2.1.xsd} | 805 ++-- 6 files changed, 429 insertions(+), 4049 deletions(-) delete mode 100644 src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.0.xsd rename src/main/resources/org/springframework/data/gemfire/config/{spring-data-geode-1.1.xsd => spring-data-geode-2.1.xsd} (99%) delete mode 100644 src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.0.xsd rename src/main/resources/org/springframework/data/gemfire/config/{spring-geode-1.1.xsd => spring-geode-2.1.xsd} (99%) diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas index b26c32e5..faae6e0c 100644 --- a/src/main/resources/META-INF/spring.schemas +++ b/src/main/resources/META-INF/spring.schemas @@ -1,10 +1,8 @@ -http\://www.springframework.org/schema/geode/spring-geode-1.0.xsd=org/springframework/data/gemfire/config/spring-geode-1.0.xsd -http\://www.springframework.org/schema/geode/spring-geode-1.1.xsd=org/springframework/data/gemfire/config/spring-geode-1.1.xsd http\://www.springframework.org/schema/geode/spring-geode-2.0.xsd=org/springframework/data/gemfire/config/spring-geode-2.0.xsd -http\://www.springframework.org/schema/geode/spring-gemfire.xsd=org/springframework/data/gemfire/config/spring-geode-2.0.xsd -http\://www.springframework.org/schema/geode/spring-geode.xsd=org/springframework/data/gemfire/config/spring-geode-2.0.xsd -http\://www.springframework.org/schema/data/geode/spring-data-geode-1.0.xsd=org/springframework/data/gemfire/config/spring-data-geode-1.0.xsd -http\://www.springframework.org/schema/data/geode/spring-data-geode-1.1.xsd=org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd +http\://www.springframework.org/schema/geode/spring-geode-2.1.xsd=org/springframework/data/gemfire/config/spring-geode-2.1.xsd +http\://www.springframework.org/schema/geode/spring-gemfire.xsd=org/springframework/data/gemfire/config/spring-geode-2.1.xsd +http\://www.springframework.org/schema/geode/spring-geode.xsd=org/springframework/data/gemfire/config/spring-geode-2.1.xsd http\://www.springframework.org/schema/data/geode/spring-data-geode-2.0.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd -http\://www.springframework.org/schema/data/geode/spring-data-gemfire.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd -http\://www.springframework.org/schema/data/geode/spring-data-geode.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd +http\://www.springframework.org/schema/data/geode/spring-data-geode-2.1.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd +http\://www.springframework.org/schema/data/geode/spring-data-gemfire.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd +http\://www.springframework.org/schema/data/geode/spring-data-geode.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd diff --git a/src/main/resources/META-INF/spring.tooling b/src/main/resources/META-INF/spring.tooling index 460138cb..1ac95b3f 100644 --- a/src/main/resources/META-INF/spring.tooling +++ b/src/main/resources/META-INF/spring.tooling @@ -1,8 +1,8 @@ # Tooling related information for the gemfire namespace -http\://www.springframework.org/schema/gemfire@name=gemfire Namespace +http\://www.springframework.org/schema/gemfire@name=Spring GemFire Namespace http\://www.springframework.org/schema/gemfire@prefix=gfe http\://www.springframework.org/schema/gemfire@icon=org/springframework/data/gemfire/config/spring-gemfire.gif # -http\://www.springframework.org/schema/data/gemfire@name=Spring data gemfire Namespace +http\://www.springframework.org/schema/data/gemfire@name=Spring Data GemFire Namespace http\://www.springframework.org/schema/data/gemfire@prefix=gfe-data -http\://www.springframework.org/schema/data/gemfire@icon=org/springframework/data/gemfire/config/spring-gemfire.gif \ No newline at end of file +http\://www.springframework.org/schema/data/gemfire@icon=org/springframework/data/gemfire/config/spring-gemfire.gif diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.0.xsd deleted file mode 100644 index e9aedd80..00000000 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.0.xsd +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - The reference to a MappingContext. If not set a default one will be created. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Determines whether imports are suppressed on initialization of the GemFire Snapshot Service. - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd similarity index 99% rename from src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd rename to src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd index bdd6e7ae..cc206800 100644 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd +++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd @@ -9,7 +9,8 @@ targetNamespace="http://www.springframework.org/schema/data/geode" elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.1"> + version="2.1"> + @@ -18,6 +19,7 @@ + - + + diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.0.xsd deleted file mode 100644 index 83b07d14..00000000 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.0.xsd +++ /dev/null @@ -1,3395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - namespace and its 'properties' element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifies the parent, template Region from which to inherit the Region attribute configuration. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd similarity index 99% rename from src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.1.xsd rename to src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd index 9c845854..86f2929f 100644 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.1.xsd +++ b/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd @@ -8,10 +8,12 @@ targetNamespace="http://www.springframework.org/schema/geode" elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.1"> + version="2.1"> + + + + + + + @@ -197,6 +210,16 @@ JavaDocs for org.apache.geode.cache.control.ResourceManager for more information Set the percentage of heap at or above which the eviction should begin on Regions configured for HeapLRU eviction. This feature requires additional VM flags to perform properly (see the JavaDocs for org.apache.geode.cache.control.ResourceManager for more information). + ]]> + + + + + @@ -558,6 +581,7 @@ Comma-delimited list of Server endpoints used by this Pool in the form of: host1 + @@ -1308,14 +1332,14 @@ distributed system with the mcast-port gemfire.properties setting. - - + + - + @@ -1323,31 +1347,99 @@ up-to-date copy of the data. - + - + - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Eviction policy for the partitioned region. + ]]> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Specifies the data policy for this region (NORMAL or PRELOADED). Setting 'data-policy' is not stictly necessary, +but if set, then the value must agree with the 'persistent' attribute if also specified. + ]]> - - - + + - - - - - - - - - - - - - - - - + + + + + @@ -1425,17 +1647,17 @@ The RegionShortcut for this region. Allows easy initialization of the region bas - + - + - + - + - + - @@ -1460,7 +1682,7 @@ Defines a template for creating multiple GemFire REPLICATE Regions that all shar - + @@ -1746,22 +1968,33 @@ Defines a template for creating multiple GemFire PARTITION Regions that all shar - - + + - - + - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +Specifies the data policy for this region (EMPTY, REPLICATE, PERSISTENT_REPLICATE). Setting 'data-policy' is not +stictly necessary, but if set, then the value must agree with the 'persistent' attribute if also specified. + ]]> - + + - + +Indicates whether the Region is a lock grantor. This attribute is only relevant for Regions with global scope, +as only they allow locking. GemFire default is false. + ]]> + + + + + +The RegionShortcut for this region. Allows easy initialization of the region based on pre-defined defaults. + ]]> - - - - - - - - - + + + + + + @@ -2050,17 +2085,17 @@ The ClientRegionShortcut for this region. Allows easy initialization of the regi - + - + - + - + - + - @@ -2085,91 +2120,7 @@ Defines a template for creating multiple GemFire Client Regions that all share a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2298,6 +2249,79 @@ The name of the bean defining the GemFire cache (by default 'gemfireCache'). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3263,4 +3287,5 @@ Used for convenience. If no reference exists, use inner bean declarations. +