You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/11 17:13:30 UTC

[01/24] incubator-geode git commit: (GEODE-1186) Geode website: reinstate Google Analytics. Per Google's recommendation, relocated Google analytics snippet from footer to header.

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-17-2 a0f6f22ee -> 7ec4bad47


    (GEODE-1186) Geode website: reinstate Google Analytics. Per Google's recommendation, relocated Google analytics snippet from footer to header.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dd9e5af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dd9e5af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dd9e5af4

Branch: refs/heads/feature/GEODE-17-2
Commit: dd9e5af4b4324e5511d170238f6532217384e15b
Parents: 3d38ec5
Author: Dave Barnes <db...@pivotal.io>
Authored: Fri Apr 8 11:04:40 2016 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Fri Apr 8 11:04:40 2016 -0700

----------------------------------------------------------------------
 geode-site/website/layouts/footer.html | 12 ------------
 geode-site/website/layouts/header.html | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd9e5af4/geode-site/website/layouts/footer.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/footer.html b/geode-site/website/layouts/footer.html
index 3d31236..08dc71d 100644
--- a/geode-site/website/layouts/footer.html
+++ b/geode-site/website/layouts/footer.html
@@ -82,15 +82,3 @@
 <script type="text/javascript">
     head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", "/js/usergrid-site.js");
 </script>
-<!-- update the code below for google analytics -->
-<!--
- <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-45815079-1', 'apache.org');
-  ga('send', 'pageview');
-
-</script> -->

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd9e5af4/geode-site/website/layouts/header.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/header.html b/geode-site/website/layouts/header.html
index 5d89d71..6edaec8 100644
--- a/geode-site/website/layouts/header.html
+++ b/geode-site/website/layouts/header.html
@@ -39,6 +39,18 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
     <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
 
+<!-- google analytics -->
+ <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-63425957-1', 'auto');
+  ga('send', 'pageview');
+</script>
+<!-- end google analytics -->
+
     <% if @community == true %>
     <script type="text/javascript"
       src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBYSxyIKS22zC4wSLFXZGR8QKXbGWLFwYw&sensor=false">


[15/24] incubator-geode git commit: GEODE-386: Change xsd namespace to apache

Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-site/website/content/schema/cache/cache-1.0.xsd
----------------------------------------------------------------------
diff --git a/geode-site/website/content/schema/cache/cache-1.0.xsd b/geode-site/website/content/schema/cache/cache-1.0.xsd
new file mode 100644
index 0000000..c9c4f91
--- /dev/null
+++ b/geode-site/website/content/schema/cache/cache-1.0.xsd
@@ -0,0 +1,1469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<xsd:schema
+    targetNamespace="http://geode.apache.org/schema/cache"
+    xmlns:gf="http://geode.apache.org/schema/cache"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+  <xsd:annotation>
+    <xsd:documentation><![CDATA[
+This is the XML Schema for the Geode distributed cache declarative
+caching XML file. All declarative cache files must include a schema
+of the following form:
+
+  <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">
+
+If you are declaring a client cache then use this schema:
+
+  <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">
+
+The contents of a declarative XML file correspond to APIs found in the
+com.gemstone.gemfire.cache and com.gemstone.gemfire.cache.client
+packages. A declarative caching XML file is used to populate a Cache
+or a ClientCache when it is created.
+
+The top-level element in this syntax is "cache" or "client-cache".
+All elements are listed here in alphabetical order.
+
+The following conventions apply to all Geode distributed cache
+declarative caching XML file elements unless indicated otherwise.
+
+- In elements that contain PCDATA, leading and trailing whitespace in
+  the data may be ignored.
+
+- In elements whose value is an "enumerated type", the value is case
+  sensitive.
+  
+  ]]></xsd:documentation>
+  </xsd:annotation>
+
+    <!--
+-->
+  <xsd:element name="cache">
+    <xsd:annotation>
+      <xsd:documentation>
+        The "cache" element is the root element of the declarative cache file on a peer or server.
+        This element configures a Geode Cache and describes the root regions it contains, if any.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element maxOccurs="1" minOccurs="0" name="cache-transaction-manager" type="gf:cache-transaction-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="dynamic-region-factory" type="gf:dynamic-region-factory-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-hub">
+          <xsd:annotation>
+            <xsd:documentation>
+              The "gateway-hub" element specifies a Gateway Hub that is
+              initialized when the Cache is declaratively initialized.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The "gateway" element specifies a Gateway that is
+                    initialized when a GatewayHub is declaratively initialized.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:choice>
+                      <xsd:element maxOccurs="unbounded" minOccurs="1" name="gateway-endpoint">
+                        <xsd:annotation>
+                          <xsd:documentation>
+                            The "gateway-endpoint" element specifies an endpoint that is
+                            initialized when a Gateway is declaratively initialized.
+                          </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:complexType>
+                          <xsd:attribute name="host" type="xsd:string" use="required" />
+                          <xsd:attribute name="id" type="xsd:string" use="required" />
+                          <xsd:attribute name="port" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                      </xsd:element>
+                      <xsd:element maxOccurs="unbounded" minOccurs="1" name="gateway-listener">
+                        <xsd:annotation>
+                          <xsd:documentation>
+                            The "gateway-listener" element specifies a listener that is
+                            initialized when a Gateway is declaratively initialized.
+                          </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:complexType>
+                          <xsd:sequence>
+                            <xsd:element name="class-name" type="gf:class-name-type" />
+                            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                          </xsd:sequence>
+                        </xsd:complexType>
+                      </xsd:element>
+                    </xsd:choice>
+                    <xsd:element maxOccurs="1" minOccurs="0" name="gateway-queue">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          The "gateway-queue" element specifies a queue that is initialized when a
+                          Gateway is declaratively initialized. As of 6.5 overflow-directory is
+                          deprecated. Use disk-store-name instead. As of 6.5 roll-oplogs is
+                          deprecated. Use disk-store-name instead.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:attribute name="alert-threshold" type="xsd:string" use="optional" />
+                        <xsd:attribute name="batch-conflation" type="xsd:boolean" use="optional" />
+                        <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+                        <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
+                        <xsd:attribute name="enable-persistence" type="xsd:boolean" use="optional" />
+                        <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+                        <xsd:attribute name="roll-oplogs" type="xsd:boolean" use="optional" />
+                        <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
+                        <xsd:attribute name="overflow-directory" type="xsd:string" use="optional" />
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute name="early-ack" type="xsd:boolean" use="optional" />
+                  <xsd:attribute name="id" type="xsd:string" use="required" />
+                  <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+                  <xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional" />
+                  <xsd:attribute name="concurrency-level" type="xsd:string" use="optional" />
+                  <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute name="id" type="xsd:string" use="required" />
+            <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
+            <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
+            <xsd:attribute name="port" type="xsd:string" use="optional" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="startup-policy" use="optional">
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                  <xsd:enumeration value="primary" />
+                  <xsd:enumeration value="secondary" />
+                  <xsd:enumeration value="none" />
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:attribute>
+            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="max-connections" type="xsd:integer" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-sender">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-event-filter" type="gf:class-with-parameters-type" />
+              <xsd:element maxOccurs="1" minOccurs="0" name="gateway-event-substitution-filter" type="gf:class-with-parameters-type" />
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-transport-filter" type="gf:class-with-parameters-type" />
+            </xsd:sequence>
+            <xsd:attribute name="id" type="xsd:string" use="required" />
+            <xsd:attribute name="remote-distributed-system-id" type="xsd:string" use="required" />
+            <xsd:attribute name="parallel" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional" />
+            <xsd:attribute name="enable-batch-conflation" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
+            <xsd:attribute name="enable-persistence" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+            <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
+            <xsd:attribute name="alert-threshold" type="xsd:string" use="optional" />
+            <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
+            <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-receiver">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-transport-filter" type="gf:class-with-parameters-type" />
+            </xsd:sequence>
+            <xsd:attribute name="start-port" type="xsd:string" use="optional" />
+            <xsd:attribute name="end-port" type="xsd:string" use="optional" />
+            <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
+            <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="hostname-for-senders" type="xsd:string" use="optional" />
+            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="1" minOccurs="0" name="gateway-conflict-resolver">
+          <xsd:annotation>
+            <xsd:documentation>
+              A "gateway-conflict-resolver" element describes a region's GatewayConflictResolver.
+              It is used to resolve inter-system concurrency conflicts.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="class-name" type="gf:class-name-type" />
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="async-event-queue">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-event-filter" type="gf:class-with-parameters-type" />
+              <xsd:element maxOccurs="1" minOccurs="0" name="gateway-event-substitution-filter" type="gf:class-with-parameters-type" />
+              <xsd:element name="async-event-listener" type="gf:class-with-parameters-type">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    A "async-event-listener" element describes a region's AsyncEventListener.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute name="id" type="xsd:string" use="required" />
+            <xsd:attribute name="parallel" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
+            <xsd:attribute name="enable-batch-conflation" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
+            <xsd:attribute name="persistent" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+            <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
+            <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="cache-server">
+          <xsd:annotation>
+            <xsd:documentation>
+              The "cache-server" element specifies a Cache Server that will accept requests from
+              clients and that is started when the Cache is declaratively initialized.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:complexContent>
+              <xsd:extension base="gf:server-type">
+                <xsd:attribute name="tcp-no-delay" type="xsd:boolean" use="optional" />
+              </xsd:extension>
+            </xsd:complexContent>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="pool" type="gf:pool-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="disk-store" type="gf:disk-store-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="hdfs-store" type="gf:hdfs-store-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="pdx" type="gf:pdx-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+          <xsd:element name="jndi-bindings" type="gf:jndi-bindings-type" />
+          <xsd:element name="region" type="gf:region-type" />
+          <xsd:element name="vm-root-region" type="gf:region-type">
+            <xsd:annotation>
+              <xsd:appinfo>deprecated</xsd:appinfo>
+              <xsd:documentation>
+                A "vm-root-region" element is the same as "region". This element exists for
+                backwards compatiblity and should not be used in new xml files.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:choice>
+        <xsd:element maxOccurs="1" minOccurs="0" name="function-service" type="gf:function-service-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="resource-manager" type="gf:resource-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="serialization-registration" type="gf:serialization-registration-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="backup" type="xsd:string">
+          <xsd:annotation>
+            <xsd:documentation>
+              The backup element defines files or directories that should be backed up when the
+              system wide backup command is invoked. Disk stores with persistent data are
+              automatically backed up, they do not need to be listed with this element.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element maxOccurs="1" minOccurs="0" name="initializer" type="gf:initializer-type" />
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="copy-on-read" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="is-server" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="lock-timeout" type="xsd:string" use="optional" />
+      <xsd:attribute name="lock-lease" type="xsd:string" use="optional" />
+      <xsd:attribute name="message-sync-interval" type="xsd:string" use="optional" />
+      <xsd:attribute name="search-timeout" type="xsd:string" use="optional" />
+      <xsd:attribute name="version" type="gf:versionType" use="required" fixed="1.0" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="client-cache">
+    <xsd:annotation>
+      <xsd:documentation>
+        The "client-cache" element is the root element of the declarative cache file on a client.
+        This element configures a Geode ClientCache and describes the root regions it contains, if any.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element maxOccurs="1" minOccurs="0" name="cache-transaction-manager" type="gf:cache-transaction-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="dynamic-region-factory" type="gf:dynamic-region-factory-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="pool" type="gf:pool-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="disk-store" type="gf:disk-store-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="pdx" type="gf:pdx-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+          <xsd:element name="jndi-bindings" type="gf:jndi-bindings-type" />
+          <xsd:element name="region" type="gf:region-type" />
+        </xsd:choice>
+        <xsd:element maxOccurs="1" minOccurs="0" name="function-service" type="gf:function-service-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="resource-manager" type="gf:resource-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="serialization-registration" type="gf:serialization-registration-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="initializer" type="gf:initializer-type" />
+      </xsd:sequence>
+      <xsd:attribute name="copy-on-read" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="version" type="gf:versionType" use="required" fixed="1.0" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="region-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "region" element describes a region (and its entries) in Geode distributed cache.
+        It may be used to create a new region or may be used to add new entries to an existing
+        region. Note that the "name" attribute specifies the simple name of the region; it
+        cannot contain a "/". If "refid" is set then it defines the default region attributes
+        to use for this region. A nested "region-attributes" element can override these defaults.
+        If the nested "region-attributes" element has its own "refid" then it will cause the
+        "refid" on the region to be ignored. "refid" can be set to the name of a RegionShortcut
+        or a ClientRegionShortcut (see the javadocs of those enum classes for their names).
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="index">
+        <xsd:annotation>
+          <xsd:documentation>
+            An "index" element describes an index to be created on a region.
+            The index node, if any, should all come immediately after the
+            "region-attributes" node. There can be any number of functional types
+            of index on a Region, but only at max one index of type "primary-key". The
+            "name" attribute is a required field which identifies the name of the index.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:choice minOccurs="0">
+            <xsd:element name="functional">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A functional type of index needs a from-clause, expression which are mandatory.
+                  The import string is used for specifying the type of Object in the region or
+                  the type of Object which the indexed expression evaluates to.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="expression" type="xsd:string" use="required" />
+                <xsd:attribute name="from-clause" type="xsd:string" use="required" />
+                <xsd:attribute name="imports" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="primary-key">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A primary-key type of index needs a field attribute which is mandatory.
+                  There should be only one or zero primary-index defined for a region
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="field" type="xsd:string" use="required" />
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:choice>
+          <xsd:attribute name="name" type="xsd:string" use="required" />
+          <xsd:attribute name="expression" type="xsd:string" use="optional" />
+          <xsd:attribute name="from-clause" type="xsd:string" use="optional" />
+          <xsd:attribute name="imports" type="xsd:string" use="optional" />
+          <xsd:attribute name="key-index" type="xsd:boolean" use="optional" />
+          <xsd:attribute default="range" name="type" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="range" />
+                <xsd:enumeration value="hash" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="entry">
+        <xsd:annotation>
+          <xsd:documentation>
+            An "entry" element desribes an entry to be added to a region. Note
+            that if an entry with the given key already exists in the region,
+            it will be replaced.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="key">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "key" element describes the key in a Region entry.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:choice>
+                  <xsd:element name="string" type="gf:string-type" />
+                  <xsd:element name="declarable" type="gf:declarable-type" />
+                </xsd:choice>
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="value">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "value" element describes the value in a Region entry
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:choice>
+                  <xsd:element name="string" type="gf:string-type" />
+                  <xsd:element name="declarable" type="gf:declarable-type" />
+                </xsd:choice>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="region" type="gf:region-type" />
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="refid" type="xsd:string" use="optional" />
+  </xsd:complexType>
+    <!-- ======================================================= -->
+    <!--
+A "region-attributes" element describes the attributes of a region to
+be created.
+As of 6.5 disk-dirs is deprecated on region-attributes. Use disk-store-name instead.
+-->
+  <xsd:complexType name="region-attributes-type">
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="key-constraint">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "key-constraint" element specifies the name of a class to which the
+            keys of a region are constrained.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="value-constraint" type="xsd:string">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "value-constraint" element specifies the name of a class to which the
+            values of a region are constrained.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="region-time-to-live">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "region-time-to-live" element specifies a Region's time to live.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="region-idle-time">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "region-idle-time" element specifies a Region's idle time.
+            Note that the APIs that correspond to this element add "out" to their
+            name. See getRegionIdleTimeout and setRegionIdleTimeout.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="entry-time-to-live">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "entry-time-to-live" element specifies a Region's entries' time to
+            live.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="entry-idle-time">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "entry-idle-time" element specifies a Region's entries' idle time.
+            Note that the APIs that correspond to this element add "out" to
+            their name. See getEntryIdleTimeout and setEntryIdleTimeout.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-write-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "disk-write-attributes" element describes how entry data is written
+            to disk. Deprecated as of 6.5 use disk-store instead.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:choice>
+            <xsd:element name="asynchronous-writes">
+              <xsd:annotation>
+                <xsd:documentation>
+                  An "asynchronous-writes" element specifies how entry data should be
+                  written to disk asynchronous. Deprecated as of 6.5 use disk-store instead.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="bytes-threshold" type="xsd:string" use="required" />
+                <xsd:attribute name="time-interval" type="xsd:string" use="required" />
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="synchronous-writes">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "synchronous-writes" element specifies that entry data should be
+                  written to disk synchronously.
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:choice>
+          <xsd:attribute name="max-oplog-size" type="xsd:string" use="optional" />
+          <xsd:attribute name="roll-oplogs" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dirs" type="gf:disk-dirs-type" />
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="partition-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "partition-attributes" element configures a region for partitioned
+            data storage.
+
+            local-max-memory attribute added to partition-attributes in release 5.1
+            total-max-memory attribute added to partition-attributes in release 5.1
+            total-num-buckets attribute added to partition-attributes in release 5.1
+            partition-resolver attribute added to partition-attributes in release 5.7
+            partition-listener attribute added to partition-attributes in release 6.1
+            colocated-with attribute added to partition-attributes in release 5.7
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="1" minOccurs="0" name="partition-resolver">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "partition-resolver" element describes a partitioned region's custom
+                  PartitionResolver.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+                <xsd:attribute name="name" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="partition-listener">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "partition-listener" element describes a partitioned region's custom
+                  PartitionListener.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="fixed-partition-attributes">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "fixed-partition-attributes" element describes characteristics of a
+                  partition in a Fixed Partitioned Region.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="partition-name" type="xsd:string" use="required" />
+                <xsd:attribute name="is-primary" type="xsd:boolean" use="optional" />
+                <xsd:attribute name="num-buckets" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+          </xsd:sequence>
+          <xsd:attribute name="local-max-memory" type="xsd:string" use="optional" />
+          <xsd:attribute name="recovery-delay" type="xsd:string" use="optional" />
+          <xsd:attribute name="redundant-copies" type="xsd:string" use="optional" />
+          <xsd:attribute name="startup-recovery-delay" type="xsd:string" use="optional" />
+          <xsd:attribute name="total-max-memory" type="xsd:string" use="optional" />
+          <xsd:attribute name="total-num-buckets" type="xsd:string" use="optional" />
+          <xsd:attribute name="colocated-with" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="membership-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "membership-attributes" element configures a region for membership
+            constraints based on required roles.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="required-role">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "required-role" element specifies a role that is required for reliable
+                  access to the region
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="name" type="xsd:string" use="required" />
+              </xsd:complexType>
+            </xsd:element>
+
+          </xsd:sequence>
+          <xsd:attribute name="loss-action" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="full-access" />
+                <xsd:enumeration value="limited-access" />
+                <xsd:enumeration value="no-access" />
+                <xsd:enumeration value="reconnect" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="resumption-action" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="none" />
+                <xsd:enumeration value="reinitialize" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="subscription-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "subscription-attributes" element configures how a region subscribes
+            to remote distributed regions.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="interest-policy" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="all" />
+                <xsd:enumeration value="cache-content" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="cache-loader" type="gf:cache-loader-type" />
+      <xsd:element maxOccurs="1" minOccurs="0" name="cache-writer" type="gf:cache-writer-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="cache-listener">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "cache-listener" element describes a region's CacheListener.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="compressor">
+        <xsd:annotation>
+          <xsd:documentation>
+            A compressor registers a custom class which extends Compressor to support compression on a region.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="eviction-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            Create eviction attributes that monitor and control the size of the Region.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:choice>
+            <xsd:element name="lru-entry-count">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Create an LRU eviction controller which performs the action if the
+                  Region has more than the maximum number of Entries in the Region.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
+                <xsd:attribute name="maximum" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="lru-heap-percentage">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Create an LRU which evicts entries using the specified action
+                  when the heap is over the resource manager critical heap/off-heap percentage.
+                  When the threshold has been exceeded each create or put operation
+                  is required to evict the same size of data which was added. The
+                  optional class-name and parameters allow for the declaration
+                  of an ObjectSizer, which will be used to determine data size.
+                  The class must implement the ObjectSizer interface.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence minOccurs="0">
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="lru-memory-size">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Create an LRU that performs the action when the memory size of the Region is
+                  over the maximum. The optional class-name and parameters allow for the
+                  declaration an ObjectSizer, which is used to measure the size of each Object
+                  in the Region. The class must implement the ObjectSizer interface.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence minOccurs="0">
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
+                <xsd:attribute name="maximum" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:choice>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="concurrency-level" type="xsd:string" use="optional" />
+    <xsd:attribute name="data-policy" type="gf:region-attributesData-policy" use="optional" />
+    <xsd:attribute name="early-ack" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="enable-async-conflation" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="enable-gateway" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="enable-subscription-conflation" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="gateway-sender-ids" type="xsd:string" use="optional" />
+    <xsd:attribute name="async-event-queue-ids" type="xsd:string" use="optional" />
+    <xsd:attribute name="hub-id" type="xsd:string" use="optional" />
+    <xsd:attribute name="id" type="xsd:string" use="optional" />
+    <xsd:attribute name="ignore-jta" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="index-update-type" type="gf:region-attributesIndex-update-type" use="optional" />
+    <xsd:attribute name="initial-capacity" type="xsd:string" use="optional" />
+    <xsd:attribute name="is-lock-grantor" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="load-factor" type="xsd:string" use="optional" />
+    <xsd:attribute name="mirror-type" type="gf:region-attributesMirror-type" use="optional" />
+    <xsd:attribute name="multicast-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="persist-backup" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="pool-name" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="hdfs-store-name" type="xsd:string" use="optional" />
+    <xsd:attribute name="hdfs-write-only" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="publisher" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="refid" type="xsd:string" use="optional" />
+    <xsd:attribute name="scope" type="gf:region-attributesScope" use="optional" />
+    <xsd:attribute name="statistics-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="cloning-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute default="true" name="concurrency-checks-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="off-heap" type="xsd:boolean" use="optional" />
+  </xsd:complexType>
+  <xsd:simpleType name="region-attributesData-policy">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="empty" />
+      <xsd:enumeration value="normal" />
+      <xsd:enumeration value="partition" />
+      <xsd:enumeration value="persistent-replicate" />
+      <xsd:enumeration value="preloaded" />
+      <xsd:enumeration value="replicate" />
+      <xsd:enumeration value="persistent-partition" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="region-attributesIndex-update-type">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="asynchronous" />
+      <xsd:enumeration value="synchronous" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="region-attributesMirror-type">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="keys" />
+      <xsd:enumeration value="keys-values" />
+      <xsd:enumeration value="none" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="region-attributesScope">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="distributed-ack" />
+      <xsd:enumeration value="distributed-no-ack" />
+      <xsd:enumeration value="global" />
+      <xsd:enumeration value="local" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="enum-readable-writable">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="readable" />
+      <xsd:enumeration value="writable" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!-- ======================================================= -->
+
+  <xsd:complexType name="server-type">
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="group" type="xsd:string">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "group" element specifies a single server group.
+            Deprecated as of 7.0 use the groups Geode property instead.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="client-subscription">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "client-subscription" element describes the eviction policy, capacity and
+            overflow-directory for client subscription config. The overflow-directory attribute
+            is deprecated as of 6.5 use disk-store-name instead.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="eviction-policy" use="required">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="entry" />
+                <xsd:enumeration value="mem" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="capacity" type="xsd:string" use="required" />
+          <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+          <xsd:attribute name="overflow-directory" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="custom-load-probe">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "custom-load-probe" element describes a callback that reports the load on a cache-server.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
+    <xsd:attribute name="hostname-for-clients" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-connections" type="xsd:string" use="optional" />
+    <xsd:attribute name="maximum-message-count" type="xsd:string" use="optional" />
+    <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-threads" type="xsd:string" use="optional" />
+    <xsd:attribute name="message-time-to-live" type="xsd:string" use="optional" />
+    <xsd:attribute name="notify-by-subscription" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="port" type="xsd:string" use="optional" />
+    <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="load-poll-interval" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="resource-manager-type">
+    <xsd:annotation>
+      <xsd:appinfo>deprecated</xsd:appinfo>
+      <xsd:documentation>
+        The "resource manager" element configures the behavior of the resource manager.
+        The resource manager provides support for resource management of its associated Cache.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="critical-heap-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="eviction-heap-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="critical-off-heap-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="eviction-off-heap-percentage" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="function-service-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        The "function service" element configures the behavior of the function service.
+        The function service allows users to execute functions on data stored in Geode.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="function">
+        <xsd:annotation>
+          <xsd:documentation>
+            The "function" element defines a function for registration in the function service.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="cache-loader-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "cache-loader" element describes a region's CacheLoader.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="cache-transaction-manager-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "cache-transaction-manager" element allows insertion of cache-level transaction listeners.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="transaction-listener">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "transaction-listener" describes a TransactionListener.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="transaction-writer">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "transaction-writer" describes a TransactionWriter.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="cache-writer-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "cache-writer" element describes a region's CacheWriter.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="serialization-registration-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A serialization-registration contains a set of serializer or instantiator tags to
+        register customer DataSerializer extensions or DataSerializable implementations respectively.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="serializer">
+        <xsd:annotation>
+          <xsd:documentation>
+            A serializer registers a custom class which extends DataSerializer to support custom
+            serialization of non-modifiable object types inside Geode. The class must have a
+            public zero-arg constructor.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="instantiator">
+        <xsd:annotation>
+          <xsd:documentation>
+            An instantiator registers a custom class which implements the DataSerializable interface
+            to support custom object serialization inside Geode. The class must have a public
+            zero-arg constructor.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+          </xsd:sequence>
+          <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The id that the instantiator should associate with the DataSerializable type.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:simpleType name="class-name-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "class-name" element specifies the name of a class, an instance of which is created
+        when a declarative cache XML file is read.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:complexType name="disk-store-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "disk-store" element specifies a DiskStore for persistence.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dirs" type="gf:disk-dirs-type" />
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="auto-compact" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="compaction-threshold" type="xsd:string" use="optional" />
+    <xsd:attribute name="allow-force-compaction" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="max-oplog-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="time-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="write-buffer-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="queue-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-usage-warning-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-usage-critical-percentage" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType mixed="true" name="hdfs-store-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "hdfs-store" element specifies a HdfsStore for persistence.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="namenode-url" type="xsd:string" use="optional" />
+    <xsd:attribute name="home-dir" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-memory" type="xsd:string" use="optional" />
+    <xsd:attribute name="read-cache-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="batch-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
+    <xsd:attribute name="buffer-persistent" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="disk-store" type="xsd:string" use="optional" />
+    <xsd:attribute name="synchronous-disk-write" type="xsd:string" use="optional" />
+    <xsd:attribute name="hdfs-client-config-file" type="xsd:string" use="optional" />
+    <xsd:attribute name="purge-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="major-compaction" type="xsd:string" use="optional" />
+    <xsd:attribute name="major-compaction-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="major-compaction-threads" type="xsd:integer" use="optional" />
+    <xsd:attribute name="minor-compaction" type="xsd:string" use="optional" />
+    <xsd:attribute name="minor-compaction-threads" type="xsd:integer" use="optional" />
+    <xsd:attribute name="max-write-only-file-size" type="xsd:integer" use="optional" />
+    <xsd:attribute name="write-only-file-rollover-interval" type="xsd:string" use="optional" />    
+  </xsd:complexType>
+
+  <xsd:complexType name="pdx-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "pdx" element specifies the configuration for the portable data exchange (PDX) method of
+        serialization. The "read-serialized" attribute is "early access".
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="pdx-serializer">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "pdx-serializer" element describes a serializer used to serialize objects in the
+            portable data exchange format.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="read-serialized" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="ignore-unread-fields" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="persistent" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="pool-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "pool" element specifies a client to server connection pool.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice>
+      <xsd:element maxOccurs="unbounded" minOccurs="1" name="locator">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "locator" element specifies the host and port that a server locator is listening on
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="host" type="xsd:string" use="required" />
+          <xsd:attribute name="port" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="unbounded" minOccurs="1" name="server">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "server" element specifies the host and port that a cache server is listening on
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="host" type="xsd:string" use="required" />
+          <xsd:attribute name="port" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:choice>
+    <xsd:attribute name="free-connection-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="load-conditioning-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="min-connections" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-connections" type="xsd:string" use="optional" />
+    <xsd:attribute name="retry-attempts" type="xsd:string" use="optional" />
+    <xsd:attribute name="idle-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="ping-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="read-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="server-group" type="xsd:string" use="optional" />
+    <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="subscription-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="subscription-message-tracking-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="subscription-ack-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="subscription-redundancy" type="xsd:string" use="optional" />
+    <xsd:attribute name="statistic-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="thread-local-connections" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="pr-single-hop-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="multiuser-authentication" type="xsd:boolean" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="declarable-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "declarable" element specifies a Declarable object to be placed in a Region entry.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="disk-dir-type" mixed="true">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "disk-dir" element specifies one of a region or diskstore's disk directories.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="dir-size" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="disk-dirs-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "disk-dirs" element specifies the region's disk directories.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="1" name="disk-dir" type="gf:disk-dir-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="dynamic-region-factory-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "dynamic-region-factory" element configures a dynamic region factory for
+        this cache. If this optional element is missing then the cache does not
+        support dynamic regions.
+
+        The optional "disk-dir" sub-element can be used to specify the directory to
+        store the persistent files that are used for dynamic region bookkeeping.
+        It defaults to the current directory.
+
+        The pool-name attribute can be used to set the name of the connection pool used
+        by client applications in a client/server cache configuration. It should not be
+        specified in servers or peers.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dir" type="gf:disk-dir-type" />
+    </xsd:sequence>
+    <xsd:attribute name="disable-persist-backup" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="disable-register-interest" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="pool-name" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="expiration-attributes-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        An "expiration-attributes" element describes expiration.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="custom-expiry">
+        <xsd:annotation>
+          <xsd:documentation>
+            The "custom-expiry" element specifies a callback that specifies
+            custom expiration attributes. See the CustomExpiry class.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+
+    <xsd:attribute name="action" use="optional">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="destroy" />
+          <xsd:enumeration value="invalidate" />
+          <xsd:enumeration value="local-destroy" />
+          <xsd:enumeration value="local-invalidate" />
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="timeout" type="xsd:string" use="required" />
+  </xsd:complexType>
+
+  <xsd:complexType name="initializer-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "initializer" element specifies a Declarable object whose init method
+        will be called after all other cache.xml initialization is
+        complete.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="class-with-parameters-type">
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="jndi-bindings-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A jndi-bindings element will contain the jndi-binding for each of the
+        datasources which are to be bound with the JNDI Context.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="jndi-binding">
+        <xsd:annotation>
+          <xsd:documentation>
+            For every datasource which is bound to the JNDI tree, there will exist one
+            jndi-binding tag. This tag will describe the property and configuration of the
+            datasource. The attributes of jndi-binding are used for configuration by
+            Geode, while the property element is used to configure the custom property
+            for the datasource.
+
+            The "xa-datasource-class" must be set when type is XAPooledDataSource,
+            "conn-pooled-datasource-class" must be set when type is PooledDataSource,
+            and "jdbc-driver-class" msut be set when the type is SimpleDataSource. It is
+            advisable to set the user-name and password as attributes rather than as a
+            property element. Alternatively, they may both be set as attributes of the
+            jndi-binding tag as well as an attribute of the property tag.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="config-property">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="config-property-name" type="xsd:string" />
+                  <xsd:element name="config-property-type" type="xsd:string" />
+                  <xsd:element name="config-property-value" type="xsd:string" />
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+
+          </xsd:sequence>
+          <xsd:attribute name="blocking-timeout-seconds" type="xsd:string" use="optional" />
+          <xsd:attribute name="conn-pooled-datasource-class" type="xsd:string" use="optional" />
+          <xsd:attribute name="connection-url" type="xsd:string" use="optional" />
+          <xsd:attribute name="idle-timeout-seconds" type="xsd:string" use="optional" />
+          <xsd:attribute name="init-pool-size" type="xsd:string" use="optional" />
+          <xsd:attribute name="jdbc-driver-class" type="xsd:string" use="optional" />
+          <xsd:attribute name="jndi-name" type="xsd:string" use="required" />
+          <xsd:attribute name="login-timeout-seconds" type="xsd:string" use="optional" />
+          <xsd:attribute name="managed-conn-factory-class" type="xsd:string" use="optional" />
+          <xsd:attribute name="max-pool-size" type="xsd:string" use="optional" />
+          <xsd:attribute name="password" type="xsd:string" use="optional" />
+          <xsd:attribute name="transaction-type" type="xsd:string" use="optional" />
+          <xsd:attribute name="type" use="required">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="ManagedDataSource" />
+                <xsd:enumeration value="SimpleDataSource" />
+                <xsd:enumeration value="PooledDataSource" />
+                <xsd:enumeration value="XAPooledDataSource" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="user-name" type="xsd:string" use="optional" />
+          <xsd:attribute name="xa-datasource-class" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:simpleType name="enum-action-destroy-overflow">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="local-destroy" />
+      <xsd:enumeration value="overflow-to-disk" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:complexType name="parameter-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "parameter" element describes a parameter used to initialize a Declarable object.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice>
+      <xsd:element name="string" type="gf:string-type" />
+      <xsd:element name="declarable" type="gf:declarable-type" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+  </xsd:complexType>
+
+  <xsd:complexType name="string-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "string" element specifies a String to be placed in a Region entry.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string"></xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+  <xsd:simpleType name="versionType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Decimal version type.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:token">
+      <xsd:pattern value="\.?[0-9]+(\.[0-9]+)*" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- TODO -->
+    <!-- Will put refid later.....refid   IDREF #IMPLIED -->
+
+</xsd:schema>


[21/24] incubator-geode git commit: GEODE-1163 Fix failing I18n test for one of the strings

Posted by ji...@apache.org.
GEODE-1163 Fix failing I18n test for one of the strings


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a57b7cf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a57b7cf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a57b7cf5

Branch: refs/heads/feature/GEODE-17-2
Commit: a57b7cf5cccd5971feed4ac0c63483598bb47fc8
Parents: 0a98fa6
Author: Nitin Lamba <nl...@apache.org>
Authored: Sat Apr 2 01:52:17 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 21:18:55 2016 -0700

----------------------------------------------------------------------
 .../java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a57b7cf5/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index e923ed5..1ddc973 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -2151,7 +2151,7 @@ public class LocalizedStrings extends ParentLocalizedStrings {
 
   // Developer REST interface
   public static final StringId SwaggerConfig_VENDOR_PRODUCT_LINE = new StringId(6617, "Apache Geode Developer REST API");
-  public static final StringId SwaggerConfig_DESCRIPTOR = new StringId(6618, "Developer REST API and interface to Geode's distributed, in-memory data grid and cache.");
+  public static final StringId SwaggerConfig_DESCRIPTOR = new StringId(6618, "Developer REST API and interface to Geode''s distributed, in-memory data grid and cache.");
   public static final StringId SwaggerConfig_EULA_LINK = new StringId(6619, "http://www.apache.org/licenses/");
   public static final StringId SwaggerConfig_SUPPORT_LINK = new StringId(6620, "dev@geode.incubator.apache.org");
   public static final StringId SwaggerConfig_DOC_TITLE = new StringId(6621, "Apache Geode Documentation");


[08/24] incubator-geode git commit: GEODE-904 Adds notice to end of CDDL, changes CDDL name and link

Posted by ji...@apache.org.
GEODE-904 Adds notice to end of CDDL, changes CDDL name and link

These dependencies are under a “CDDL 1.0.1,” which adds a notice to the
end. I’ve included that here.

I also removed the redundant “License” from “CDDL License” and changed
the license link to point to a version with the notice.

This closes #126


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/df3d10fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/df3d10fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/df3d10fa

Branch: refs/heads/feature/GEODE-17-2
Commit: df3d10fad6fc92b1d811ed83af9720f09102812e
Parents: dc8a344
Author: Joey McAllister <jm...@pivotal.io>
Authored: Fri Apr 8 12:15:09 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:54:26 2016 -0700

----------------------------------------------------------------------
 geode-assembly/src/main/dist/LICENSE | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/df3d10fa/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index dbb3780..5ea39ca 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -263,10 +263,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ---------------------------------------------------------------------------
-The CDDL License (https://opensource.org/licenses/CDDL-1.0)
+The CDDL (https://glassfish.java.net/public/CDDLv1.0.html)
 ---------------------------------------------------------------------------
 
-Apache Geode bundles the following file under the CDDL license:
+Apache Geode bundles the following file under the Common Development and
+Distribution License:
 
   - javax.activation v1.1.1
     (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp),
@@ -583,6 +584,15 @@ Apache Geode bundles the following file under the CDDL license:
   on an equitable basis. Nothing herein is intended or shall be deemed to
   constitute any admission of liability.
 
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the State
+of California (excluding conflict-of-law provisions). Any litigation
+relating to this License shall be subject to the jurisdiction of the
+Federal Courts of the Northern District of California and the state courts
+of the State of California, with venue lying in Santa Clara County,
+California.
 
 ---------------------------------------------------------------------------
 The ISC License (http://opensource.org/licenses/ISC)


[02/24] incubator-geode git commit: GEODE-961 CI failure: PutAllCSDUnitTest.testPartialKeyInPRSingleHop

Posted by ji...@apache.org.
GEODE-961 CI failure: PutAllCSDUnitTest.testPartialKeyInPRSingleHop

Gester and Hitesh puzzled through this failure and found that the client
sometimes does not receive the response from the server that the test
expects.  This caused the region size checks to fail even though the
client received an exception indicating a partial putAll.

I've removed the size checks from the test so that we now just care about
the correct exceptions having been thrown.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8a78f0f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8a78f0f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8a78f0f2

Branch: refs/heads/feature/GEODE-17-2
Commit: 8a78f0f2c4454c84ce1c95c2adef8fcb646b1bd6
Parents: dd9e5af
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Apr 8 12:18:17 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Apr 8 12:20:57 2016 -0700

----------------------------------------------------------------------
 .../internal/cache/PutAllCSDUnitTest.java       | 325 ++++++++-----------
 1 file changed, 143 insertions(+), 182 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a78f0f2/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 48c5091..fafcd9b 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -2249,6 +2249,7 @@ public void testOneServer() throws CacheException, InterruptedException {
     stopBridgeServers(getCache());
   }
 
+
   /**
    * Tests partial key putAll to 2 PR servers, because putting data at server
    * side is different between PR and LR. PR does it in postPutAll.
@@ -2257,12 +2258,6 @@ public void testOneServer() throws CacheException, InterruptedException {
   public void testPartialKeyInPRSingleHop() throws CacheException, InterruptedException {
     final String title = "testPartialKeyInPRSingleHop_";
     final int cacheWriterAllowedKeyNum = 16;
-    int client1Size;
-    int client2Size;
-    int server1Size;
-    int server2Size;
-
-//    disconnectAllFromDS();
 
     final Host host = Host.getHost(0);
     final VM server1 = host.getVM(0);
@@ -2276,7 +2271,7 @@ public void testOneServer() throws CacheException, InterruptedException {
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
     final int serverPort1 = createBridgeServer(server1, regionName, 0, true, 0, "ds1");
     final int serverPort2 = createBridgeServer(server2, regionName, 0, true, 0, "ds1");
-    createClient(client1, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true);
+    createClient(client1, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true, false);
     createClient(client2, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true);
 
     server1.invoke(addExceptionTag1(expectedExceptions));
@@ -2284,199 +2279,158 @@ public void testOneServer() throws CacheException, InterruptedException {
     client1.invoke(addExceptionTag1(expectedExceptions));
     client2.invoke(addExceptionTag1(expectedExceptions));
 
-    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
-      public void run2() throws CacheException {
-        Region region = getRootRegion().getSubregion(regionName);
-        region.getAttributesMutator().addCacheListener(new MyListener(false));
-        
-        region.registerInterest("ALL_KEYS");
-        LogWriterUtils.getLogWriter().info("client2 registerInterest ALL_KEYS at "+region.getFullPath());
-      }
-    });
-    
-    client1.invoke(new CacheSerializableRunnable(title+"do some putAll to get ClientMetaData for future putAll") {
-      public void run2() throws CacheException {
-        doPutAll(regionName, "key-", numberOfEntries);
-      }
-    });
-    
-    WaitCriterion waitForSizes = new WaitCriterion() {
-      public String description() {
-        return "waiting for conditions to be met";
-      }
-      public boolean done() {
-        int c1Size = getRegionSize(client1, regionName);
-        int c2Size = getRegionSize(client2, regionName);
-        int s1Size = getRegionSize(server1, regionName);
-        int s2Size = getRegionSize(server2, regionName);
-        LogWriterUtils.getLogWriter().info("region sizes: "+c1Size+","+c2Size+","+s1Size+","+s2Size);
-        if (c1Size != numberOfEntries) {
-          LogWriterUtils.getLogWriter().info("waiting for client1 to get all updates");
-          return false;
-        }
-        if (c2Size != numberOfEntries) {
-          LogWriterUtils.getLogWriter().info("waiting for client2 to get all updates");
-          return false;
+    try {
+      client2.invoke(new CacheSerializableRunnable(title + "client2 add listener") {
+        public void run2() throws CacheException {
+          Region region = getRootRegion().getSubregion(regionName);
+          region.getAttributesMutator().addCacheListener(new MyListener(false));
+
+          region.registerInterest("ALL_KEYS");
+          LogWriterUtils.getLogWriter().info("client2 registerInterest ALL_KEYS at " + region.getFullPath());
         }
-        if (s1Size != numberOfEntries) {
-          LogWriterUtils.getLogWriter().info("waiting for server1 to get all updates");
-          return false;
+      });
+
+      client1.invoke(new CacheSerializableRunnable(title + "do some putAll to get ClientMetaData for future putAll") {
+        public void run2() throws CacheException {
+          doPutAll(regionName, "key-", numberOfEntries);
         }
-        if (s2Size != numberOfEntries) {
-          LogWriterUtils.getLogWriter().info("waiting for server2 to get all updates");
-          return false;
+      });
+
+      WaitCriterion waitForSizes = new WaitCriterion() {
+        public String description() {
+          return "waiting for conditions to be met";
         }
-        return true;
-      }
-    };
-    Wait.waitForCriterion(waitForSizes, 10000, 1000, true);
 
-    client1Size = getRegionSize(client1, regionName);
-    client2Size = getRegionSize(client2, regionName);
-    server1Size = getRegionSize(server1, regionName);
-    server2Size = getRegionSize(server2, regionName);
+        public boolean done() {
+          int c1Size = getRegionSize(client1, regionName);
+          int c2Size = getRegionSize(client2, regionName);
+          int s1Size = getRegionSize(server1, regionName);
+          int s2Size = getRegionSize(server2, regionName);
+          LogWriterUtils.getLogWriter().info("region sizes: " + c1Size + "," + c2Size + "," + s1Size + "," + s2Size);
+          if (c1Size != numberOfEntries) {
+            LogWriterUtils.getLogWriter().info("waiting for client1 to get all updates");
+            return false;
+          }
+          if (c2Size != numberOfEntries) {
+            LogWriterUtils.getLogWriter().info("waiting for client2 to get all updates");
+            return false;
+          }
+          if (s1Size != numberOfEntries) {
+            LogWriterUtils.getLogWriter().info("waiting for server1 to get all updates");
+            return false;
+          }
+          if (s2Size != numberOfEntries) {
+            LogWriterUtils.getLogWriter().info("waiting for server2 to get all updates");
+            return false;
+          }
+          return true;
+        }
+      };
+      Wait.waitForCriterion(waitForSizes, 10000, 1000, true);
 
-    server1.invoke(new CacheSerializableRunnable(title
+      server1.invoke(new CacheSerializableRunnable(title
         + "server1 add slow listener") {
-      public void run2() throws CacheException {
-        Region region = getRootRegion().getSubregion(regionName);
-        region.getAttributesMutator().addCacheListener(new MyListener(true));
-      }
-    });
+        public void run2() throws CacheException {
+          Region region = getRootRegion().getSubregion(regionName);
+          region.getAttributesMutator().addCacheListener(new MyListener(true));
+        }
+      });
 
-    // add a listener that will close the cache at the 10th update
-    final SharedCounter sc_server2 = new SharedCounter("server2");
-    server2.invoke(new CacheSerializableRunnable(title
+      // add a listener that will close the cache at the 10th update
+      final SharedCounter sc_server2 = new SharedCounter("server2");
+      server2.invoke(new CacheSerializableRunnable(title
         + "server2 add slow listener") {
-      public void run2() throws CacheException {
-        Region region = getRootRegion().getSubregion(regionName);
-        region.getAttributesMutator().addCacheListener(new MyListener(server2, true, sc_server2, 10));
-      }
-    });
-    
-    AsyncInvocation async1 = client1.invokeAsync(new CacheSerializableRunnable(title+"client1 add listener and putAll") {
-      public void run2() throws CacheException {
-        Region region = getRootRegion().getSubregion(regionName);
-        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        public void run2() throws CacheException {
+          Region region = getRootRegion().getSubregion(regionName);
+          region.getAttributesMutator().addCacheListener(new MyListener(server2, true, sc_server2, 10));
+        }
+      });
 
-        // create keys
-        try {
-          doPutAll(regionName, title, numberOfEntries);
-          fail("Expect ServerOperationException caused by PutAllParitialResultException");
-        } catch (ServerOperationException soe) {
-          assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+      AsyncInvocation async1 = client1.invokeAsync(new CacheSerializableRunnable(title + "client1 add listener and putAll") {
+        public void run2() throws CacheException {
+          Region region = getRootRegion().getSubregion(regionName);
+          region.getAttributesMutator().addCacheListener(new MyListener(false));
+
+          // create keys
+          try {
+            doPutAll(regionName, title, numberOfEntries);
+            fail("Expect ServerOperationException caused by PutAllParitialResultException");
+          } catch (ServerOperationException soe) {
+            assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+          }
         }
-      }
-    });   
+      });
 
-    // server2 will closeCache after creating 10 keys
-    
-    ThreadUtils.join(async1, 30 * 1000);
-    if (async1.exceptionOccurred()) {
-      Assert.fail("Aync1 get exceptions:", async1.getException());
-    }
+      // server2 will closeCache after creating 10 keys
 
-    client1Size = getRegionSize(client1, regionName);
-    // client2Size maybe more than client1Size
-    client2Size = getRegionSize(client2, regionName);
-    server1Size = getRegionSize(server1, regionName);
-    LogWriterUtils.getLogWriter().info("region sizes: "+client1Size+","+client2Size+","+server1Size);
-//    assertEquals(server1Size, client1Size);
+      ThreadUtils.join(async1, 30 * 1000);
+      if (async1.exceptionOccurred()) {
+        Assert.fail("putAll client threw an exception", async1.getException());
+      }
 
-    // restart server2 
-    LogWriterUtils.getLogWriter().info("restarting server 2");
-    createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1");
-    
-    // Test Case1: Trigger singleHop putAll. Stop server2 in middle. 
-    // numberOfEntries/2 + X keys will be created at servers. i.e. X keys at server2,
-    // numberOfEntries/2 keys at server1.
-    // The client should receive a PartialResultException due to PartitionOffline
-    client1Size = getRegionSize(client1, regionName);
-    client2Size = getRegionSize(client2, regionName);
-    server1Size = getRegionSize(server1, regionName);
-    server2Size = getRegionSize(server2, regionName);
-    LogWriterUtils.getLogWriter().info("region sizes after server2 restarted: "+client1Size+","+client2Size+","+server1Size);
-    assertEquals(150, client1Size);
-    assertEquals(client2Size, server1Size);
-    assertEquals(client2Size, server2Size);
 
-    // close a server to re-run the test 
-    closeCache(server2);
-    server1Size = getRegionSize(server1, regionName);
-    client1.invoke(new CacheSerializableRunnable(title+"client1 does putAll again") {
-      public void run2() throws CacheException {
-        Region region = getRootRegion().getSubregion(regionName);
+      // restart server2
+      System.out.println("restarting server 2");
+      createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1");
 
-        // create keys
-        try {
-          doPutAll(regionName, title+"again:", numberOfEntries);
-          fail("Expect ServerOperationException caused by PutAllParitialResultException");
-        } catch (ServerOperationException soe) {
-          assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
-        }
-      }
-    });   
+      // Test Case1: Trigger singleHop putAll. Stop server2 in middle.
+      // numberOfEntries/2 + X keys will be created at servers. i.e. X keys at server2,
+      // numberOfEntries/2 keys at server1.
+      // The client should receive a PartialResultException due to PartitionOffline
 
-    int new_server1Size = getRegionSize(server1, regionName);
-    int new_client1Size = getRegionSize(client1, regionName);
-    int new_client2Size = getRegionSize(client2, regionName);
+      // close a server to re-run the test
+      closeCache(server2);
+      client1.invoke(new CacheSerializableRunnable(title + "client1 does putAll again") {
+        public void run2() throws CacheException {
+          Region region = getRootRegion().getSubregion(regionName);
+
+          // create keys
+          try {
+            doPutAll(regionName, title + "again:", numberOfEntries);
+            fail("Expect ServerOperationException caused by PutAllParitialResultException");
+          } catch (ServerOperationException soe) {
+            assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+          }
+        }
+      });
 
-    // Test Case 2: based on case 1, but this time, there should be no X keys 
-    // created on server2.
-    LogWriterUtils.getLogWriter().info("region sizes after re-run the putAll: "+new_client1Size+","+new_client2Size+","+new_server1Size);
-    assertEquals(server1Size+numberOfEntries/2, new_server1Size);
-    assertEquals(client1Size+numberOfEntries/2, new_client1Size);
-    assertEquals(client2Size+numberOfEntries/2, new_client2Size);
+      // Test Case 2: based on case 1, but this time, there should be no X keys
+      // created on server2.
 
-    // restart server2
-    createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1");
-    server1Size = getRegionSize(server1, regionName);
-    server2Size = getRegionSize(server2, regionName);
-    LogWriterUtils.getLogWriter().info("region sizes after restart server2: "+server1Size+","+server2Size);
-    assertEquals(server1Size, server2Size);
+      // restart server2
+      createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1");
 
-    // add a cacheWriter for server to fail putAll after it created cacheWriterAllowedKeyNum keys
-    server1.invoke(new CacheSerializableRunnable(title
+      // add a cacheWriter for server to fail putAll after it created cacheWriterAllowedKeyNum keys
+      server1.invoke(new CacheSerializableRunnable(title
         + "server1 add cachewriter to throw exception after created some keys") {
-      public void run2() throws CacheException {
-        Region region = getRootRegion().getSubregion(regionName);
-        region.getAttributesMutator().setCacheWriter(new MyWriter(cacheWriterAllowedKeyNum));
-      }
-    });
-
-    client1.invoke(new CacheSerializableRunnable(title+"client1 does putAll once more") {
-      public void run2() throws CacheException {
-        Region region = getRootRegion().getSubregion(regionName);
-
-        // create keys
-        try {
-          doPutAll(regionName, title+"once more:", numberOfEntries);
-          fail("Expect ServerOperationException caused by PutAllParitialResultException");
-        } catch (ServerOperationException soe) {
-          assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+        public void run2() throws CacheException {
+          Region region = getRootRegion().getSubregion(regionName);
+          region.getAttributesMutator().setCacheWriter(new MyWriter(cacheWriterAllowedKeyNum));
         }
-      }
-    });   
-
-    // Test case 3: encountered 2 PartialResultException in singlehop. 
-    // should consolidate them into 1
-    int oncemore_client1Size = getRegionSize(client1, regionName);
-    int oncemore_client2Size = getRegionSize(client2, regionName);
-    int oncemore_server1Size = getRegionSize(server1, regionName);
-    int oncemore_server2Size = getRegionSize(server2, regionName);
-    LogWriterUtils.getLogWriter().info("region sizes in once more test: "
-        +oncemore_client1Size+","+oncemore_client2Size+","+oncemore_server1Size+","+oncemore_server2Size);
-    int delta_at_server = oncemore_server1Size - server1Size;
-    assertEquals(new_client1Size+delta_at_server, oncemore_client1Size);
-    assertEquals(oncemore_server1Size, oncemore_client2Size);
-    assertEquals(oncemore_server2Size, oncemore_server1Size);
-    server1.invoke(removeExceptionTag1(expectedExceptions));
-    server2.invoke(removeExceptionTag1(expectedExceptions));
-    client1.invoke(removeExceptionTag1(expectedExceptions));
-    client2.invoke(removeExceptionTag1(expectedExceptions));
+      });
 
-    // Stop server
-    stopBridgeServers(getCache());
+      client1.invoke(new CacheSerializableRunnable(title + "client1 does putAll once more") {
+        public void run2() throws CacheException {
+          Region region = getRootRegion().getSubregion(regionName);
+
+          // create keys
+          try {
+            doPutAll(regionName, title + "once more:", numberOfEntries);
+            fail("Expect ServerOperationException caused by PutAllParitialResultException");
+          } catch (ServerOperationException soe) {
+            assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+          }
+        }
+      });
+    } finally {
+      server1.invoke(removeExceptionTag1(expectedExceptions));
+      server2.invoke(removeExceptionTag1(expectedExceptions));
+      client1.invoke(removeExceptionTag1(expectedExceptions));
+      client2.invoke(removeExceptionTag1(expectedExceptions));
+
+      // Stop server
+      stopBridgeServers(getCache());
+    }
   }
 
   /**
@@ -2504,7 +2458,7 @@ public void testOneServer() throws CacheException, InterruptedException {
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
     final int serverPort1 = createBridgeServer(server1, regionName, 0, true, 1, "ds1");
     final int serverPort2 = createBridgeServer(server2, regionName, 0, true, 1, "ds1");
-    createClient(client1, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true);
+    createClient(client1, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true, false);
     createClient(client2, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true);
 
     server1.invoke(addExceptionTag1(expectedExceptions));
@@ -2667,7 +2621,7 @@ public void testOneServer() throws CacheException, InterruptedException {
     serverPorts[0] = createBridgeServer(server1, regionName, 0, true, 0, null);
     serverPorts[1] = createBridgeServer(server2, regionName, 0, true, 0, null);
     serverPorts[2] = createBridgeServer(server3, regionName, 0, true, 0, null);
-    createClient(client1, regionName, serverHost, serverPorts, -1, -1, false, true, true);
+    createClient(client1, regionName, serverHost, serverPorts, -1, -1, false, true, true, false);
 
     {
       // Create local region
@@ -3833,8 +3787,15 @@ public void testOneServer() throws CacheException, InterruptedException {
     });
   }
 
+  private void createClient(VM client, String regionName, String serverHost, int[] serverPorts,
+                            int redundancy, int readTimeOut, boolean receiveInvalidates,
+                            boolean concurrencyChecks, boolean enableSingleHop) {
+    createClient(client, regionName, serverHost, serverPorts, redundancy, readTimeOut, receiveInvalidates,
+            concurrencyChecks, enableSingleHop, true /*subscriptionEnabled*/);
+  }
   private void createClient(VM client, final String regionName, final String serverHost, final int[] serverPorts,
-      final int redundency, final int readTimeOut, final boolean receiveInvalidates, final boolean concurrencyChecks, final boolean enableSingleHop) {
+      final int redundency, final int readTimeOut, final boolean receiveInvalidates, final boolean concurrencyChecks,
+      final boolean enableSingleHop, final boolean subscriptionEnabled) {
     client.invoke(new CacheSerializableRunnable("Create client") {
       public void run2() throws CacheException {
         // Create DS
@@ -3859,7 +3820,7 @@ public void testOneServer() throws CacheException, InterruptedException {
               pf.addServer(serverHost, serverPorts[i]);
             }
 
-            pf.setReadTimeout(readTimeOut).setSubscriptionEnabled(true).setPRSingleHopEnabled(enableSingleHop).create("myPool");
+            pf.setReadTimeout(readTimeOut).setSubscriptionEnabled(subscriptionEnabled).setPRSingleHopEnabled(enableSingleHop).create("myPool");
                 factory.setPoolName("myPool");
           }
           else {


[16/24] incubator-geode git commit: GEODE-386: Change xsd namespace to apache

Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
new file mode 100644
index 0000000..57e3a13
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
@@ -0,0 +1,234 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * 
+ */
+package com.gemstone.gemfire.cache30;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
+import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+
+
+public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
+  private static final long serialVersionUID = -6437436147079728413L;
+
+  public CacheXmlGeode10DUnitTest(String name) {
+    super(name);
+  }
+
+  
+  // ////// Helper methods
+
+  protected String getGemFireVersion()
+  {
+    return CacheXml.VERSION_1_0;
+  }
+
+  @SuppressWarnings("rawtypes")
+  public void testEnableOffHeapMemory() {
+    try {
+      System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+      
+      final String regionName = "testEnableOffHeapMemory";
+      
+      final CacheCreation cache = new CacheCreation();
+      final RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
+      attrs.setOffHeap(true);
+      assertEquals(true, attrs.getOffHeap());
+      
+      final Region regionBefore = cache.createRegion(regionName, attrs);
+      assertNotNull(regionBefore);
+      assertEquals(true, regionBefore.getAttributes().getOffHeap());
+  
+      testXml(cache);
+      
+      final Cache c = getCache();
+      assertNotNull(c);
+  
+      final Region regionAfter = c.getRegion(regionName);
+      assertNotNull(regionAfter);
+      assertEquals(true, regionAfter.getAttributes().getOffHeap());
+      assertEquals(true, ((LocalRegion)regionAfter).getOffHeap());
+      regionAfter.localDestroyRegion();
+    } finally {
+      System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME);
+    }
+  }
+
+  @SuppressWarnings("rawtypes")
+  public void testEnableOffHeapMemoryRootRegionWithoutOffHeapMemoryThrowsException() {
+    final String regionName = getUniqueName();
+    
+    final CacheCreation cache = new CacheCreation();
+    final RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
+    attrs.setOffHeap(true);
+    assertEquals(true, attrs.getOffHeap());
+    
+    final Region regionBefore = cache.createRegion(regionName, attrs);
+    assertNotNull(regionBefore);
+    assertEquals(true, regionBefore.getAttributes().getOffHeap());
+
+    IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.
+        LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+regionName));
+    try {
+      testXml(cache);
+    } catch (IllegalStateException e) {
+      // expected
+      String msg = LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+regionName);
+      assertEquals(msg, e.getMessage());
+    } finally {
+      expectedException.remove();
+    }
+  }
+  
+  @SuppressWarnings({ "rawtypes", "deprecation", "unchecked" })
+  public void testEnableOffHeapMemorySubRegionWithoutOffHeapMemoryThrowsException() {
+    final String rootRegionName = getUniqueName();
+    final String subRegionName = "subRegion";
+    
+    final CacheCreation cache = new CacheCreation();
+    final RegionAttributesCreation rootRegionAttrs = new RegionAttributesCreation(cache);
+    assertEquals(false, rootRegionAttrs.getOffHeap());
+    
+    final Region rootRegionBefore = cache.createRegion(rootRegionName, rootRegionAttrs);
+    assertNotNull(rootRegionBefore);
+    assertEquals(false, rootRegionBefore.getAttributes().getOffHeap());
+    
+    final RegionAttributesCreation subRegionAttrs = new RegionAttributesCreation(cache);
+    subRegionAttrs.setOffHeap(true);
+    assertEquals(true, subRegionAttrs.getOffHeap());
+    
+    final Region subRegionBefore = rootRegionBefore.createSubregion(subRegionName, subRegionAttrs);
+    assertNotNull(subRegionBefore);
+    assertEquals(true, subRegionBefore.getAttributes().getOffHeap());
+
+    IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.
+        LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+rootRegionName+"/"+subRegionName));
+    try {
+      testXml(cache);
+    } catch (IllegalStateException e) {
+      // expected
+      final String msg = LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.
+          toLocalizedString("/" + rootRegionName + "/" + subRegionName);
+      assertEquals(msg, e.getMessage());
+    } finally {
+      expectedException.remove();
+    }
+  }
+
+  /**
+   * Test the ResourceManager element's critical-off-heap-percentage and 
+   * eviction-off-heap-percentage attributes
+   * @throws Exception
+   */
+  public void testResourceManagerThresholds() throws Exception {
+    CacheCreation cache = new CacheCreation();
+    final float low = 90.0f;
+    final float high = 95.0f;
+
+    try {
+      System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+
+      Cache c;
+      ResourceManagerCreation rmc = new ResourceManagerCreation();
+      rmc.setEvictionOffHeapPercentage(low);
+      rmc.setCriticalOffHeapPercentage(high);
+      cache.setResourceManagerCreation(rmc);
+      testXml(cache);
+      {
+        c = getCache();
+        assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
+        assertEquals(high, c.getResourceManager().getCriticalOffHeapPercentage());
+      }
+      closeCache();
+      
+      rmc = new ResourceManagerCreation();
+      // Set them to similar values
+      rmc.setEvictionOffHeapPercentage(low);
+      rmc.setCriticalOffHeapPercentage(low + 1);
+      cache.setResourceManagerCreation(rmc);
+      testXml(cache);
+      {
+        c = getCache();
+        assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
+        assertEquals(low + 1, c.getResourceManager().getCriticalOffHeapPercentage());
+      }
+      closeCache();
+  
+      rmc = new ResourceManagerCreation();
+      rmc.setEvictionOffHeapPercentage(high);
+      rmc.setCriticalOffHeapPercentage(low);
+      cache.setResourceManagerCreation(rmc);
+      IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE.toLocalizedString());
+      try {
+        testXml(cache);
+        assertTrue(false);
+      } catch (IllegalArgumentException expected) {
+      } finally {
+        expectedException.remove();
+        closeCache();
+      }
+  
+      // Disable eviction
+      rmc = new ResourceManagerCreation();
+      rmc.setEvictionOffHeapPercentage(0);
+      rmc.setCriticalOffHeapPercentage(low);
+      cache.setResourceManagerCreation(rmc);
+      testXml(cache);
+      {
+        c = getCache();
+        assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage());
+        assertEquals(low, c.getResourceManager().getCriticalOffHeapPercentage());
+      }
+      closeCache();
+  
+      // Disable refusing ops in "red zone"
+      rmc = new ResourceManagerCreation();
+      rmc.setEvictionOffHeapPercentage(low);
+      rmc.setCriticalOffHeapPercentage(0);
+      cache.setResourceManagerCreation(rmc);
+      testXml(cache);
+      {
+        c = getCache();
+        assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
+        assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage());
+      }
+      closeCache();
+  
+      // Disable both
+      rmc = new ResourceManagerCreation();
+      rmc.setEvictionOffHeapPercentage(0);
+      rmc.setCriticalOffHeapPercentage(0);
+      cache.setResourceManagerCreation(rmc);
+      testXml(cache);
+      c = getCache();
+      assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage());
+      assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage());
+    } finally {
+      System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME);
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
index 963f7ce..f308855 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
@@ -48,7 +48,7 @@ public class SharedConfigurationJUnitTest {
     String schemaLocation = XmlUtils.getAttribute(doc.getDocumentElement(), W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION, W3C_XML_SCHEMA_INSTANCE_NS_URI);
 
     assertNotNull(schemaLocation);
-    assertEquals(CacheXml.NAMESPACE + " " + CacheXml.LATEST_SCHEMA_LOCATION, schemaLocation);
+    assertEquals(CacheXml.GEODE_NAMESPACE + " " + CacheXml.LATEST_SCHEMA_LOCATION, schemaLocation);
 
     assertEquals(CacheXml.VERSION_LATEST, XmlUtils.getAttribute(doc.getDocumentElement(), "version"));
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
new file mode 100644
index 0000000..f42d52c
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gemstone.gemfire.internal.cache.xmlcache;
+
+import com.gemstone.gemfire.internal.ClassPathLoader;
+import org.junit.Test;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.EntityResolver2;
+
+import java.io.IOException;
+import java.util.ServiceLoader;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Unit test for {@link PivotalEntityResolver} and
+ * {@link DefaultEntityResolver2}.
+ */
+public abstract class AbstractEntityResolverTest {
+
+  public abstract EntityResolver getEntityResolver();
+
+  public abstract String getSystemId();
+
+  /**
+   * Assert that {@link PivotalEntityResolver} extends
+   * {@link DefaultEntityResolver2}.
+   * 
+   * @since 8.1
+   */
+  @Test
+  public void testInstanceOfDefaultEntityResolver2() {
+    assertTrue(DefaultEntityResolver2.class.isAssignableFrom(getEntityResolver().getClass()));
+  }
+
+  /**
+   * Find the {@link PivotalEntityResolver} in the {@link ClassPathLoader}.
+   * Verifies that the META-INF/services file is correctly found and the the
+   * implementation class is loadable.
+   * 
+   * @since 8.1
+   */
+  @Test
+  public void testDiscovery() {
+    boolean found = false;
+    final ServiceLoader<EntityResolver2> entityResolvers = ServiceLoader.load(EntityResolver2.class, ClassPathLoader.getLatestAsClassLoader());
+    for (final EntityResolver2 entityResolver : entityResolvers) {
+      if (getEntityResolver().getClass().isAssignableFrom(entityResolver.getClass())) {
+        found = true;
+        break;
+      }
+    }
+    assertTrue("Resolver not found.", found);
+  }
+
+  /**
+   * Resolve the cache.xml XSD using the {@link PivotalEntityResolver}. Verifies
+   * that the META-INF/schemas files are correctly found.
+   * 
+   * @throws SAXException
+   * @throws IOException
+   * @since 8.1
+   */
+  @Test
+  public void testResolveEntity() throws SAXException, IOException {
+    final InputSource inputSource = getEntityResolver().resolveEntity(null, getSystemId());
+    assertNotNull(inputSource);
+    assertEquals(getSystemId(), inputSource.getSystemId());
+  }
+
+  /**
+   * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
+   * <code>null</code> <code>systemId</code>. Asserts that returns to
+   * <code>null<code>.
+   * 
+   * @throws SAXException
+   * @throws IOException
+   * @since 8.1
+   */
+  @Test
+  public void testResolveEntityNullSystemId() throws SAXException, IOException {
+    final String systemId = null;
+    final InputSource inputSource = getEntityResolver().resolveEntity(null, systemId);
+    assertNull(inputSource);
+  }
+
+  /**
+   * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
+   * <code>"--not-a-valid-system-id--"</code> <code>systemId</code>, which is
+   * not in the Pivotal namespace.. Asserts that returns to <code>null<code>.
+   * 
+   * @throws SAXException
+   * @throws IOException
+   * @since 8.1
+   */
+  @Test
+  public void testResolveEntityUnkownSystemId() throws SAXException, IOException {
+    final String systemId = "--not-a-valid-system-id--";
+    final InputSource inputSource = getEntityResolver().resolveEntity(null, systemId);
+    assertNull(inputSource);
+  }
+
+  /**
+   * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
+   * <code>"http://schema.pivotal.io/this/should/be/not/found.xsd"</code>
+   * <code>systemId</code>, which should not be found. Asserts that returns to
+   * <code>null<code>.
+   * 
+   * @throws SAXException
+   * @throws IOException
+   * @since 8.1
+   */
+  @Test
+  public void testResolveEntityNotFoundSystemId() throws SAXException, IOException {
+    final String systemId = "http://schema.pivotal.io/this/should/be/not/found.xsd";
+    final InputSource inputSource = getEntityResolver().resolveEntity(null, systemId);
+    assertNull(inputSource);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index eb4ce86..a51ce2b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -41,21 +41,21 @@ public class CacheXmlVersionJUnitTest {
    */
   @Test
   public void testOrdinal() {
-    assertTrue(VERSION_3_0.compareTo(VERSION_4_0) < 0);
-    assertTrue(VERSION_4_0.compareTo(VERSION_4_1) < 0);
-    assertTrue(VERSION_4_1.compareTo(VERSION_5_0) < 0);
-    assertTrue(VERSION_5_0.compareTo(VERSION_5_1) < 0);
-    assertTrue(VERSION_5_1.compareTo(VERSION_5_5) < 0);
-    assertTrue(VERSION_5_5.compareTo(VERSION_5_7) < 0);
-    assertTrue(VERSION_5_7.compareTo(VERSION_5_8) < 0);
-    assertTrue(VERSION_5_8.compareTo(VERSION_6_0) < 0);
-    assertTrue(VERSION_6_0.compareTo(VERSION_6_1) < 0);
-    assertTrue(VERSION_6_1.compareTo(VERSION_6_5) < 0);
-    assertTrue(VERSION_6_5.compareTo(VERSION_6_6) < 0);
-    assertTrue(VERSION_6_6.compareTo(VERSION_7_0) < 0);
-    assertTrue(VERSION_7_0.compareTo(VERSION_8_0) < 0);
-    assertTrue(VERSION_8_0.compareTo(VERSION_8_1) < 0);
-    assertTrue(VERSION_8_1.compareTo(VERSION_9_0) < 0);
+    assertTrue(GEMFIRE_3_0.compareTo(GEMFIRE_4_0) < 0);
+    assertTrue(GEMFIRE_4_0.compareTo(GEMFIRE_4_1) < 0);
+    assertTrue(GEMFIRE_4_1.compareTo(GEMFIRE_5_0) < 0);
+    assertTrue(GEMFIRE_5_0.compareTo(GEMFIRE_5_1) < 0);
+    assertTrue(GEMFIRE_5_1.compareTo(GEMFIRE_5_5) < 0);
+    assertTrue(GEMFIRE_5_5.compareTo(GEMFIRE_5_7) < 0);
+    assertTrue(GEMFIRE_5_7.compareTo(GEMFIRE_5_8) < 0);
+    assertTrue(GEMFIRE_5_8.compareTo(GEMFIRE_6_0) < 0);
+    assertTrue(GEMFIRE_6_0.compareTo(GEMFIRE_6_1) < 0);
+    assertTrue(GEMFIRE_6_1.compareTo(GEMFIRE_6_5) < 0);
+    assertTrue(GEMFIRE_6_5.compareTo(GEMFIRE_6_6) < 0);
+    assertTrue(GEMFIRE_6_6.compareTo(GEMFIRE_7_0) < 0);
+    assertTrue(GEMFIRE_7_0.compareTo(GEMFIRE_8_0) < 0);
+    assertTrue(GEMFIRE_8_0.compareTo(GEMFIRE_8_1) < 0);
+    assertTrue(GEMFIRE_8_1.compareTo(GEODE_1_0) < 0);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
new file mode 100644
index 0000000..2fef8b3
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gemstone.gemfire.internal.cache.xmlcache;
+
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+import org.xml.sax.EntityResolver;
+
+/**
+ * Unit test for {@link GeodeEntityResolver} and
+ * {@link DefaultEntityResolver2}.
+ */
+@Category(UnitTest.class)
+public class GeodeEntityResolverJUnitTest extends AbstractEntityResolverTest {
+
+  private EntityResolver entityResolver;
+
+  private final String systemId = "http://geode.apache.org/schema/cache/cache-1.0.xsd";
+
+  @Before
+  public void setup() throws Exception {
+    entityResolver = new GeodeEntityResolver();
+  }
+
+  public EntityResolver getEntityResolver() {
+    return entityResolver;
+  }
+
+  public String getSystemId() {
+    return systemId;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
index 800e5ce..ce4941e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
@@ -17,19 +17,10 @@
 
 package com.gemstone.gemfire.internal.cache.xmlcache;
 
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.ServiceLoader;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.EntityResolver2;
-
-import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+import org.xml.sax.EntityResolver;
 
 /**
  * Unit test for {@link PivotalEntityResolver} and
@@ -39,106 +30,23 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @since 8.1
  */
 @Category(UnitTest.class)
-public class PivotalEntityResolverJUnitTest {
+public class PivotalEntityResolverJUnitTest extends AbstractEntityResolverTest {
 
-  /**
-   * Assert that {@link PivotalEntityResolver} extends
-   * {@link DefaultEntityResolver2}.
-   * 
-   * @since 8.1
-   */
-  @Test
-  public void testInstanceOfDefaultEntityResolver2() {
-    assertTrue(DefaultEntityResolver2.class.isAssignableFrom(PivotalEntityResolver.class));
-  }
-
-  /**
-   * Find the {@link PivotalEntityResolver} in the {@link ClassPathLoader}.
-   * Verifies that the META-INF/services file is correctly found and the the
-   * implementation class is loadable.
-   * 
-   * @since 8.1
-   */
-  @Test
-  public void testDiscovery() {
-    boolean found = false;
-    final ServiceLoader<EntityResolver2> entityResolvers = ServiceLoader.load(EntityResolver2.class, ClassPathLoader.getLatestAsClassLoader());
-    for (final EntityResolver2 entityResolver : entityResolvers) {
-      if (entityResolver instanceof PivotalEntityResolver) {
-        found = true;
-        break;
-      }
-    }
-    assertTrue("Resolver not found.", found);
-  }
+  private EntityResolver entityResolver;
 
-  /**
-   * Resolve the cache.xml XSD using the {@link PivotalEntityResolver}. Verifies
-   * that the META-INF/schemas files are correctly found.
-   * 
-   * @throws SAXException
-   * @throws IOException
-   * @since 8.1
-   */
-  @Test
-  public void testResolveEntity() throws SAXException, IOException {
-    final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
-    final String systemId = "http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd";
-    final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
-    assertNotNull(inputSource);
-    assertEquals(systemId, inputSource.getSystemId());
-  }
+  private final String systemId = "http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd";
 
-  /**
-   * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
-   * <code>null</code> <code>systemId</code>. Asserts that returns to
-   * <code>null<code>.
-   * 
-   * @throws SAXException
-   * @throws IOException
-   * @since 8.1
-   */
-  @Test
-  public void testResolveEntityNullSystemId() throws SAXException, IOException {
-    final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
-    final String systemId = null;
-    final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
-    assertNull(inputSource);
+  @Before
+  public void setup() throws Exception {
+    entityResolver = new PivotalEntityResolver();
   }
 
-  /**
-   * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
-   * <code>"--not-a-valid-system-id--"</code> <code>systemId</code>, which is
-   * not in the Pivotal namespace.. Asserts that returns to <code>null<code>.
-   * 
-   * @throws SAXException
-   * @throws IOException
-   * @since 8.1
-   */
-  @Test
-  public void testResolveEntityUnkownSystemId() throws SAXException, IOException {
-    final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
-    final String systemId = "--not-a-valid-system-id--";
-    final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
-    assertNull(inputSource);
+  public EntityResolver getEntityResolver() {
+    return entityResolver;
   }
 
-  /**
-   * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
-   * <code>"http://schema.pivotal.io/this/should/be/not/found.xsd"</code>
-   * <code>systemId</code>, which shound not be found. Asserts that returns to
-   * <code>null<code>.
-   * 
-   * @throws SAXException
-   * @throws IOException
-   * @since 8.1
-   */
-  @Test
-  public void testResolveEntityNotFoundSystemId() throws SAXException, IOException {
-    final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
-    final String systemId = "http://schema.pivotal.io/this/should/be/not/found.xsd";
-    final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
-    assertNull(inputSource);
+  public String getSystemId() {
+    return systemId;
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
index bcb88c0..dca5d0b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -69,7 +69,7 @@ public class CacheElementJUnitTest {
    */
   @Test
   public void testCacheDefinedAsNestedComplexType8_1() throws Exception {
-    Document doc = loadSchema(CacheXmlVersion.VERSION_8_1.getSchemaLocation());
+    Document doc = loadSchema(CacheXmlVersion.GEMFIRE_8_1.getSchemaLocation());
     final XPathContext xPathContext = new XPathContext(CacheElement.XSD_PREFIX, XMLConstants.W3C_XML_SCHEMA_NS_URI);
     final Node cacheType = XmlUtils.querySingleElement(doc.getFirstChild(), CacheElement.CACHE_TYPE_EMBEDDED, xPathContext);
     assertNotNull("Cache type is not embedded complexType.", cacheType);
@@ -118,9 +118,9 @@ public class CacheElementJUnitTest {
     assertEntry("gateway-conflict-resolver", order++, entries.next());
     assertEntry("async-event-queue", order++, entries.next());
     assertEntry("cache-server", order++, entries.next());
-    assertEntry("bridge-server", order++, entries.next());
     assertEntry("pool", order++, entries.next());
     assertEntry("disk-store", order++, entries.next());
+    assertEntry("hdfs-store", order++, entries.next());
     assertEntry("pdx", order++, entries.next());
     assertEntry("region-attributes", order++, entries.next());
     assertEntry("jndi-bindings", order++, entries.next());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
index d8c52c6..ff4980d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
@@ -69,7 +69,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
   @BeforeClass
   public static void beforeClass() {
     cache = new CacheFactory().set("mcast-port", "0").create();
-    xPathContext.addNamespace(CacheXml.PREFIX, CacheXml.NAMESPACE);
+    xPathContext.addNamespace(CacheXml.PREFIX, CacheXml.GEODE_NAMESPACE);
     xPathContext.addNamespace(TEST_PREFIX, TEST_NAMESPACE);
   }
 
@@ -105,7 +105,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     nodes = XmlUtils.query(changes, xPath, xPathContext);
     assertEquals(1, nodes.getLength());
     Element element = (Element) nodes.item(0);
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final XmlEntity xmlEntity = XmlEntity.builder().withType("region").withAttribute("name", "r3").withConfig(changes).build();
     XmlUtils.addNewNode(config, xmlEntity);
@@ -113,7 +113,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     nodes = XmlUtils.query(config, xPath, xPathContext);
     assertEquals(1, nodes.getLength());
     element = (Element) nodes.item(0);
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final List<Node> childNodes = getElementNodes(config.getFirstChild().getChildNodes());
 
@@ -158,7 +158,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     nodes = XmlUtils.query(changes, xPath, xPathContext);
     assertEquals(1, nodes.getLength());
     Element element = (Element) nodes.item(0);
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final XmlEntity xmlEntity = XmlEntity.builder().withType("jndi-bindings").withConfig(changes).build();
     XmlUtils.addNewNode(config, xmlEntity);
@@ -166,7 +166,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     nodes = XmlUtils.query(config, xPath, xPathContext);
     assertEquals(1, nodes.getLength());
     element = (Element) nodes.item(0);
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final List<Node> childElements = getElementNodes(config.getFirstChild().getChildNodes());
     assertEquals("pdx", childElements.get(2).getNodeName());
@@ -231,7 +231,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     Element element = (Element) nodes.item(0);
     assertEquals(1, getElementNodes(element.getChildNodes()).size());
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
         "XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml")));
@@ -239,7 +239,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     element = (Element) nodes.item(0);
     assertEquals(0, element.getChildNodes().getLength());
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final XmlEntity xmlEntity = XmlEntity.builder().withType("region").withAttribute("name", "r1").withConfig(changes).build();
     XmlUtils.addNewNode(config, xmlEntity);
@@ -248,7 +248,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     element = (Element) nodes.item(0);
     assertEquals(0, element.getChildNodes().getLength());
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
   }
 
   /**
@@ -266,7 +266,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     Element element = (Element) nodes.item(0);
     assertEquals("foo", XmlUtils.getAttribute(element, "disk-store-name"));
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
         "XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml")));
@@ -274,7 +274,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     element = (Element) nodes.item(0);
     assertEquals("bar", XmlUtils.getAttribute(element, "disk-store-name"));
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final XmlEntity xmlEntity = XmlEntity.builder().withType("pdx").withConfig(changes).build();
     XmlUtils.addNewNode(config, xmlEntity);
@@ -283,7 +283,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     element = (Element) nodes.item(0);
     assertEquals("bar", XmlUtils.getAttribute(element, "disk-store-name"));
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
   }
 
   /**
@@ -338,7 +338,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     Element element = (Element) nodes.item(0);
     assertEquals(1, getElementNodes(element.getChildNodes()).size());
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
         "XmlUtilsAddNewNodeJUnitTest.testDeleteNodeNamed.xml")));
@@ -367,7 +367,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
     assertEquals(1, nodes.getLength());
     Element element = (Element) nodes.item(0);
     assertEquals("foo", XmlUtils.getAttribute(element, "disk-store-name"));
-    assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+    assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
 
     final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
         "XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml")));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index 0e14501..24702c3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -69,10 +69,10 @@ public class XmlUtilsJUnitTest {
     assertNotNull(schemaLocationMap);
     assertEquals(2, schemaLocationMap.size());
 
-    final List<String> locations1 = schemaLocationMap.get("http://schema.pivotal.io/gemfire/cache");
+    final List<String> locations1 = schemaLocationMap.get("http://geode.apache.org/schema/cache");
     assertNotNull(locations1);
     assertEquals(1, locations1.size());
-    assertEquals("http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd", locations1.get(0));
+    assertEquals("http://geode.apache.org/schema/cache/cache-1.0.xsd", locations1.get(0));
 
     final List<String> locations2 = schemaLocationMap.get("urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest");
     assertNotNull(locations2);
@@ -109,11 +109,11 @@ public class XmlUtilsJUnitTest {
     assertNotNull(schemaLocationMap);
     assertEquals(3, schemaLocationMap.size());
 
-    final List<String> locations1 = schemaLocationMap.get("http://schema.pivotal.io/gemfire/cache");
+    final List<String> locations1 = schemaLocationMap.get("http://geode.apache.org/schema/cache");
     assertNotNull(locations1);
     assertEquals(2, locations1.size());
-    assertEquals("http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd", locations1.get(0));
-    assertEquals("cache-8.1.xsd", locations1.get(1));
+    assertEquals("http://geode.apache.org/schema/cache/cache-1.0.xsd", locations1.get(0));
+    assertEquals("cache-1.0.xsd", locations1.get(1));
 
     final List<String> locations2 = schemaLocationMap.get("urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest");
     assertNotNull(locations2);
@@ -179,7 +179,7 @@ public class XmlUtilsJUnitTest {
     final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
         "XmlUtilsJUnitTest.testQuerySingleElement.xml")));
     final Element root = doc.getDocumentElement();
-    final String cacheNamespace = "http://schema.pivotal.io/gemfire/cache";
+    final String cacheNamespace = "http://geode.apache.org/schema/cache";
     final XPathContext cacheXPathContext = new XPathContext("cache", cacheNamespace);
 
     // There are mulitple region elements, this should get the first one.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index a8f6514..222e63d 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -378,7 +378,7 @@ com/gemstone/gemfire/internal/cache/wan/GatewayReceiverException,true,7079321411
 com/gemstone/gemfire/internal/cache/wan/GatewaySenderConfigurationException,true,1
 com/gemstone/gemfire/internal/cache/wan/GatewaySenderException,true,8090143153569084886
 com/gemstone/gemfire/internal/cache/wan/parallel/BucketRegionQueueUnavailableException,false
-com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion,false,publicId:java/lang/String,schemaLocation:java/lang/String,systemId:java/lang/String,version:java/lang/String
+com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion,false,namespace:java/lang/String,publicId:java/lang/String,schemaLocation:java/lang/String,systemId:java/lang/String,version:java/lang/String
 com/gemstone/gemfire/internal/cache/xmlcache/DiskStoreAttributesCreation,false
 com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation,true,2241078661206355376,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/ArrayList,cacheLoader:com/gemstone/gemfire/cache/CacheLoader,cacheWriter:com/gemstone/gemfire/cache/CacheWriter,cloningEnabled:boolean,compressor:com/gemstone/gemfire/compression/Compressor,concurrencyChecksEnabled:boolean,concurrencyLevel:int,customEntryIdleTimeout:com/gemstone/gemfire/cache/CustomExpiry,customEntryTimeToLive:com/gemstone/gemfire/cache/CustomExpiry,dataPolicy:com/gemstone/gemfire/cache/DataPolicy,diskDirs:java/io/File[],diskSizes:int[],diskStoreName:java/lang/String,diskWriteAttributes:com/gemstone/gemfire/cache/DiskWriteAttributes,earlyAck:boolean,enableAsyncConflation:boolean,enableSubscriptionConflation:boolean,entryIdleTimeout:com/gemstone/gemfire/cache/ExpirationAttributes,entryTimeToLive:com/gemstone/gemfire/cache/ExpirationAttributes,evictionAttributes:com/gemstone/gemfire/internal/cache/EvictionAttributesIm
 pl,gatewaySenderIds:java/util/Set,hdfsStoreName:java/lang/String,hdfsWriteOnly:boolean,id:java/lang/String,ignoreJTA:boolean,indexMaintenanceSynchronous:boolean,initialCapacity:int,isDiskSynchronous:boolean,isLockGrantor:boolean,keyConstraint:java/lang/Class,loadFactor:float,membershipAttributes:com/gemstone/gemfire/cache/MembershipAttributes,multicastEnabled:boolean,offHeap:boolean,partitionAttributes:com/gemstone/gemfire/cache/PartitionAttributes,poolName:java/lang/String,publisher:boolean,refid:java/lang/String,regionIdleTimeout:com/gemstone/gemfire/cache/ExpirationAttributes,regionTimeToLive:com/gemstone/gemfire/cache/ExpirationAttributes,scope:com/gemstone/gemfire/cache/Scope,statisticsEnabled:boolean,subscriptionAttributes:com/gemstone/gemfire/cache/SubscriptionAttributes,valueConstraint:java/lang/Class
 com/gemstone/gemfire/internal/concurrent/AtomicLong5,true,-1915700199064062938

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
index 269ddcf..d995b91 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
 </cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
index 3055f31..62c21c3 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
index fb50e6b..b2695c7 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
index 38f791d..c51117b 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
index 4f5b1a1..4139da0 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
index 4db3799..fd661f1 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
index a3238d8..2267ccd 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
index b325fbf..a461cc8 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
index bdefa30..bb19ce7 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
-    version="8.1">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
index 832d756..82d3920 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd
                         urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest classpath:/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.xsd
                         urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest XmlUtilsJUnitTest.xsd"
-    version="8.1">
+    version="1.0">
 </cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
index 05843bf..64a8fa4 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
     xsi:schemaLocation=""
-    version="8.1">
+    version="1.0">
 </cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
index 87b3cac..5604ac9 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache cache-8.1.xsd
+    xsi:schemaLocation="http://geode.apache.org/schema/cache cache-1.0.xsd
                         urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest classpath:/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.xsd
                         urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest2 XmlUtilsJUnitTest2.xsd"
-    version="8.1">
+    version="1.0">
 </cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
index 95d11b3..87997c1 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
-    version="8.1">
+    version="1.0">
 </cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
index 76b851e..4593074 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd
                         urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest XmlUtilsJUnitTest.xsd"
-    version="8.1">
+    version="1.0">
   <async-event-queue id="aeq1">
     <async-event-listener>
       <class-name>null</class-name>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd b/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
index bfe9f6c..6fd7306 100644
--- a/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
+++ b/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
@@ -23,22 +23,22 @@ limitations under the License.
     version="1.0">
   
   <xsd:import
-      namespace="http://schema.pivotal.io/gemfire/cache"
-      schemaLocation="http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"/>
+      namespace="http://geode.apache.org/schema/cache"
+      schemaLocation="http://geode.apache.org/schema/cache/cache-1.0.xsd"/>
   
   <xsd:annotation>
     <xsd:documentation><![CDATA[
 XML schema for Lucene indexes in Geode.
 
   <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:lucene="http://geode.apache.org/schema/lucene"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
-        http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+    xsi:schemaLocation="http://geode.apache.org/schema/cache
+        http://geode.apache.org/schema/cache/cache-1.0.xsd
         http://geode.apache.org/schema/lucene
         http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
-    version="9.0">
+    version="1.0">
     
     ]]></xsd:documentation>
   </xsd:annotation>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
index 47f3250..89d5bef 100644
--- a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
@@ -17,14 +17,14 @@
 -->
 
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:lucene="http://geode.apache.org/schema/lucene"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
-        http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+    xsi:schemaLocation="http://geode.apache.org/schema/cache
+        http://geode.apache.org/schema/cache/cache-1.0.xsd
         http://geode.apache.org/schema/lucene
         http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
-    version="9.0">
+    version="1.0">
 
 	<region name="region" refid="PARTITION">
     	<lucene:index name="index1">

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
index 47f3250..89d5bef 100644
--- a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
@@ -17,14 +17,14 @@
 -->
 
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:lucene="http://geode.apache.org/schema/lucene"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
-        http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+    xsi:schemaLocation="http://geode.apache.org/schema/cache
+        http://geode.apache.org/schema/cache/cache-1.0.xsd
         http://geode.apache.org/schema/lucene
         http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
-    version="9.0">
+    version="1.0">
 
 	<region name="region" refid="PARTITION">
     	<lucene:index name="index1">

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
index 72f4d2f..fe9da93 100755
--- a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
+++ b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
@@ -144,10 +144,10 @@ public class AutoBalancerIntegrationJUnitTest {
 
   @Test
   public void testInitializerCacheXML() {
-    String configStr = "<cache xmlns=\"http://schema.pivotal.io/gemfire/cache\"                          "
+    String configStr = "<cache xmlns=\"http://geode.apache.org/schema/cache\"                          "
         + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"                                      "
-        + " xsi:schemaLocation=\"http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd\""
-        + " version=\"9.0\">                                                                             "
+        + " xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\""
+        + " version=\"1.0\">                                                                             "
         + "   <initializer>                                                                              "
         + "     <class-name>com.gemstone.gemfire.cache.util.AutoBalancer</class-name>                    "
         + "     <parameter name=\"schedule\">                                                            "
@@ -161,10 +161,10 @@ public class AutoBalancerIntegrationJUnitTest {
 
   @Test(expected = GemFireConfigException.class)
   public void testInitFailOnMissingScheduleConf() {
-    String configStr = "<cache xmlns=\"http://schema.pivotal.io/gemfire/cache\"                          "
+    String configStr = "<cache xmlns=\"http://geode.apache.org/schema/cache\"                          "
         + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"                                      "
-        + " xsi:schemaLocation=\"http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd\""
-        + " version=\"9.0\">                                                                             "
+        + " xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\""
+        + " version=\"1.0\">                                                                             "
         + "   <initializer>                                                                              "
         + "     <class-name>com.gemstone.gemfire.cache.util.AutoBalancer</class-name>                    "
         + "   </initializer>                                                                             "


[10/24] incubator-geode git commit: GEODE-904 Adds file listings to LICENSE

Posted by ji...@apache.org.
GEODE-904 Adds file listings to LICENSE


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6ea0b3bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6ea0b3bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6ea0b3bb

Branch: refs/heads/feature/GEODE-17-2
Commit: 6ea0b3bbff22124f0964f75b201bbec7f74ed680
Parents: a773988
Author: Joey McAllister <jm...@pivotal.io>
Authored: Mon Apr 4 18:13:06 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:54:26 2016 -0700

----------------------------------------------------------------------
 LICENSE | 201 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 125 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ea0b3bb/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index dc7a5a7..896f7bc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -202,172 +202,221 @@
 
 ===========================================================================
 
-Apache Geode includes a number of components and libraries with separate 
-copyright notices and license terms. Your use of those components are 
-subject to the terms and conditions of the following licenses. 
+Apache Geode includes a number of components and libraries with separate
+copyright notices and license terms. Your use of those components are
+subject to the terms and conditions of the following licenses.
 
 ---------------------------------------------------------------------------
-Backbone (http://backbonejs.org)
+ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html)
 ---------------------------------------------------------------------------
-This product bundles Backbone which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles ANSIBuffer, which is available under a BSD license.
+For details, see http://opensource.org/licenses/BSD-3-Clause.
+
+---------------------------------------------------------------------------
+Backbone.js (http://backbonejs.org)
+---------------------------------------------------------------------------
+This product bundles Backbone.js, which is available under an MIT license.
+For details see http://opensource.org/licenses/mit-license.php.
+
+---------------------------------------------------------------------------
+Bootflat (http://bootflat.github.io/)
+---------------------------------------------------------------------------
+This product bundles Bootflat, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.html.
+
+---------------------------------------------------------------------------
+Bootstrap (http://getbootstrap.com/)
+---------------------------------------------------------------------------
+This product bundles Bootstrap, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.html.
 
 ---------------------------------------------------------------------------
 CompactConcurrentHashSet2 (http://gee.cs.oswego.edu/dl/concurrency-interest)
 ---------------------------------------------------------------------------
-This product bundles CompactConcurrentHashSet2 derived from JSR-166 
-ConcurrentHashMap v1.43 which is available in the public domain.  
+This product bundles CompactConcurrentHashSet2, derived from JSR-166
+ConcurrentHashMap v1.43, which is available in the public domain.
+
+---------------------------------------------------------------------------
+Font Awesome (https://fortawesome.github.io/Font-Awesome/)
+---------------------------------------------------------------------------
+This product bundles Font Awesome, which is available under the SIL OFL 1.1
+license (font) and the MIT license (code). For details, see
+http://scripts.sil.org/OFL and http://opensource.org/licenses/mit-license.html.
 
 ---------------------------------------------------------------------------
 Handlebars (http://handlebarsjs.com)
 ---------------------------------------------------------------------------
-This product bundles Handlebars which is available under an MIT license.  
+This product bundles Handlebars, which is available under an MIT license.
 For details see http://www.opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
+HeadJS (http://headjs.com/)
+---------------------------------------------------------------------------
+This product bundles HeadJS, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.html.
+
+---------------------------------------------------------------------------
 highlight.js (https://highlightjs.org)
 ---------------------------------------------------------------------------
-This product bundles highlight.js which is available under a BSD 3 clauses license.  
-For details see http://opensource.org/licenses/BSD-3-Clause.
+This product bundles highlight.js, which is available under a BSD 3-clause
+license. For details see http://opensource.org/licenses/BSD-3-Clause.
+
+---------------------------------------------------------------------------
+HTML5 Shiv (https://github.com/aFarkas/html5shiv)
+---------------------------------------------------------------------------
+This product bundles HTML5 Shiv, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.html.
+
+---------------------------------------------------------------------------
+iCheck (http://icheck.fronteed.com/)
+---------------------------------------------------------------------------
+This product bundles iCheck, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.html.
 
 ---------------------------------------------------------------------------
 JOpt Simple (http://pholser.github.io/jopt-simple/)
 ---------------------------------------------------------------------------
-This product bundles JOpt Simple which is available under an MIT license.  
+This product bundles JOpt Simple, which is available under an MIT license.
 For details see http://www.opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
 jQuery (https://jquery.com)
 ---------------------------------------------------------------------------
-This product bundles jQuery which is available under an MIT license.  
+This product bundles jQuery, which is available under an MIT license.
 For details see http://www.opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
 jQuery BBQ (http://benalman.com/projects/jquery-bbq-plugin/)
 ---------------------------------------------------------------------------
-This product bundles jQuery BBQ which is available under an MIT and GPL dual license.  
-For details see http://benalman.com/about/license.
+This product bundles jQuery BBQ, which is available under an MIT and GPL
+dual license. For details see http://benalman.com/about/license.
 
 ---------------------------------------------------------------------------
-jQuery-slideto (https://github.com/Sleavely/jQuery-slideto)
+jQuery.i18n.properties (https://github.com/jquery-i18n-properties/jquery-i18n-properties)
 ---------------------------------------------------------------------------
-This product bundles jQuery-slideto which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles jQuery.i18n.properties, which is available under an
+MIT license. For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle)
+jQuery jqGrid (https://plugins.jquery.com/jqGrid/)
 ---------------------------------------------------------------------------
-This product bundles jQuery Wiggle which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles jQuery jqGrid, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-JSON (http://json.org)
+jScrollPane (http://jscrollpane.kelvinluck.com/)
 ---------------------------------------------------------------------------
-This product bundles JSON which is available under a BSD-like license.  
-For details see http://json.org/license.html.
+This product bundles jScrollPane, which is available under an MIT
+license. For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-reset.css (http://meyerweb.com/eric/tools/css/reset/)
+jQuery Mouse Wheel (http://brandonaaron.net)
 ---------------------------------------------------------------------------
-This product bundles reset.css which is available in the public domain.
+This product bundles jQuery Mouse Wheel, which is available under an MIT
+license. For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-tooltip.js (http://flowplayer.org/tools/tooltip/)
+jQuery UI MultiSelect Widget (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/)
 ---------------------------------------------------------------------------
-This product bundles tooltip.css which is available in the public domain.
+This product bundles jQuery Multiselect Widget, which is available under an
+MIT license. For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-shred (https://github.com/pandastrike/shred)
+jQuery Placeholder (http://webcloud.se)
 ---------------------------------------------------------------------------
-This product bundles shred which is available under an MIT or ISC license.  
-For details see https://github.com/pandastrike/shred/blob/master/LICENSE.
+This product bundles jQuery Placeholder, which is available under an MIT
+license. For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-underscore (http://underscorejs.org)
+jQuery-slideto (https://github.com/Sleavely/jQuery-slideto)
 ---------------------------------------------------------------------------
-This product bundles underscore which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles jQuery-slideto, which is available under an MIT
+license. For details see http://www.opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-jquery jqGrid (https://plugins.jquery.com/jqGrid/)
+jQuery Sparklines (http://omnipotent.net/jquery.sparkline/)
 ---------------------------------------------------------------------------
-This product bundles jqGrid which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles jQuery Sparklines, which is available under a BSD-like
+license. For details, see http://opensource.org/licenses/BSD-3-Clause.
 
 ---------------------------------------------------------------------------
-html5.js (https://github.com/aFarkas/html5shiv)
+TableDnD (https://github.com/isocra/TableDnD)
 ---------------------------------------------------------------------------
-This product bundles html5 which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles TableDND, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-jquery.i18n.properties (https://github.com/jquery-i18n-properties/jquery-i18n-properties)
+Timeago (http://timeago.yarp.com/)
 ---------------------------------------------------------------------------
-This product bundles jQuery i18n which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles jQuery Timeago, which is available under an MIT
+license. For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-jquery.jscrollpane (http://jscrollpane.kelvinluck.com/)
+jQuery UI (http://jqueryui.com/about)
 ---------------------------------------------------------------------------
-This product bundles jquery.jscrollpane which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles jquery UI, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-jquery.mousewheel (http://brandonaaron.net)
+jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle)
 ---------------------------------------------------------------------------
-This product bundles jquery.mousewheel which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles jQuery Wiggle, which is available under an MIT
+license. For details see http://www.opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-jquery.placeholder (http://webcloud.se)
+zTree (http://zTree.me/)
 ---------------------------------------------------------------------------
-This product bundles jquery.placeholder which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles zTree, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-jquery.tablednd (https://github.com/isocra/TableDnD)
+JSON (http://json.org)
 ---------------------------------------------------------------------------
-This product bundles jquery.tablednd which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles JSON, which is available under a BSD-like license.
+For details, see http://json.org/license.html.
 
 ---------------------------------------------------------------------------
-jquery.timeago (http://timeago.yarp.com/)
+Normalise.css (https://necolas.github.io/normalize.css/)
 ---------------------------------------------------------------------------
-This product bundles jquery.timeago which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles Normalise.css, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.html.
 
 ---------------------------------------------------------------------------
-jquery.ztree (http://zTree.me/)
+Protocol Buffers (https://github.com/google/protobuf)
 ---------------------------------------------------------------------------
-This product bundles jquery.ztree which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles Protocol Buffers, which is available under a BSD
+license. For details, see http://opensource.org/licenses/BSD-3-Clause.
 
 ---------------------------------------------------------------------------
-jquery.multiselect (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/)
+Reset CSS (http://meyerweb.com/eric/tools/css/reset/)
 ---------------------------------------------------------------------------
-This product bundles jQuery.multiselect which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles Reset CSS, which is available in the public domain.
 
 ---------------------------------------------------------------------------
-jquery.ui (http://jqueryui.com/about)
+Respond (https://github.com/scottjehl/Respond)
 ---------------------------------------------------------------------------
-This product bundles jquery UI which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles Respond, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.html.
+
+---------------------------------------------------------------------------
+tooltip.js (http://flowplayer.org/tools/tooltip/)
+---------------------------------------------------------------------------
+This product bundles tooltip.css, which is available in the public domain.
 
 ---------------------------------------------------------------------------
-jquery.sparkline.js (http://omnipotent.net/jquery.sparkline/)
+Shred (https://github.com/pandastrike/shred)
 ---------------------------------------------------------------------------
-This product bundles jquery.sparkline which is available under a BSD-like license.
-For details see http://opensource.org/licenses/BSD-3-Clause.
+This product bundles shred, which is available under an MIT or ISC license.
+For details see https://github.com/pandastrike/shred/blob/master/LICENSE.
 
 ---------------------------------------------------------------------------
-split.js (https://github.com/nathancahill/Split.js)
+Split.js (https://github.com/nathancahill/Split.js)
 ---------------------------------------------------------------------------
-This product bundles split.js which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+This product bundles Split.js, which is available under an MIT license.
+For details, see http://opensource.org/licenses/mit-license.php.
 
 ---------------------------------------------------------------------------
-MX4J (http://mx4j.sourceforge.net)
+Underscore (http://underscorejs.org)
 ---------------------------------------------------------------------------
-This product bundles MX4JModelMBean.java which is available under the MX4J license.
-For details see http://mx4j.sourceforge.net/docs/ch01s06.html.
+This product bundles Underscore, which is available under an MIT license.
+For details see http://www.opensource.org/licenses/mit-license.php.


[14/24] incubator-geode git commit: GEODE-1025: Force the version of spring core we use

Posted by ji...@apache.org.
GEODE-1025: Force the version of spring core we use

Spring shell depends on an old version of spring-core. Once all of the
rest of the spring dependencies were removed from geode-core, the spring
shell dependency won and caused us to bundle the older version of spring
core in the lib directory.

With this change, we all always use the desired version of spring-core.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/26225108
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/26225108
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/26225108

Branch: refs/heads/feature/GEODE-17-2
Commit: 26225108623fefc6a03fec346d2fb157420b0d24
Parents: df3d10f
Author: Dan Smith <up...@apache.org>
Authored: Fri Apr 8 13:40:14 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Apr 8 13:45:18 2016 -0700

----------------------------------------------------------------------
 gradle/dependency-resolution.gradle | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/26225108/gradle/dependency-resolution.gradle
----------------------------------------------------------------------
diff --git a/gradle/dependency-resolution.gradle b/gradle/dependency-resolution.gradle
index dc247d2..91d1755 100644
--- a/gradle/dependency-resolution.gradle
+++ b/gradle/dependency-resolution.gradle
@@ -29,6 +29,7 @@ subprojects {
       force 'org.springframework:spring-web:' + project.'springframework.version'
       force 'org.springframework:spring-tx:' + project.'springframework.version'
       force 'org.springframework:spring-webmvc:' + project.'springframework.version'
+      force 'org.springframework:spring-core:' + project.'springframework.version'
       force 'jline:jline:' + project.'jline.version'
     }
   }


[23/24] incubator-geode git commit: GEODE-1163 Change support link from 'dev' to 'user'.

Posted by ji...@apache.org.
GEODE-1163 Change support link from 'dev' to 'user'.

This closes #122


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/616bc27d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/616bc27d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/616bc27d

Branch: refs/heads/feature/GEODE-17-2
Commit: 616bc27de8621224a9c7fba19a84dfc4eb4d520f
Parents: a57b7cf
Author: Nitin Lamba <nl...@apache.org>
Authored: Mon Apr 4 12:54:08 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 21:18:55 2016 -0700

----------------------------------------------------------------------
 .../java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/616bc27d/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index 1ddc973..2a939b4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -2153,7 +2153,7 @@ public class LocalizedStrings extends ParentLocalizedStrings {
   public static final StringId SwaggerConfig_VENDOR_PRODUCT_LINE = new StringId(6617, "Apache Geode Developer REST API");
   public static final StringId SwaggerConfig_DESCRIPTOR = new StringId(6618, "Developer REST API and interface to Geode''s distributed, in-memory data grid and cache.");
   public static final StringId SwaggerConfig_EULA_LINK = new StringId(6619, "http://www.apache.org/licenses/");
-  public static final StringId SwaggerConfig_SUPPORT_LINK = new StringId(6620, "dev@geode.incubator.apache.org");
+  public static final StringId SwaggerConfig_SUPPORT_LINK = new StringId(6620, "user@geode.incubator.apache.org");
   public static final StringId SwaggerConfig_DOC_TITLE = new StringId(6621, "Apache Geode Documentation");
   public static final StringId SwaggerConfig_DOC_LINK = new StringId(6622, "http://geode.incubator.apache.org/docs/");
 


[12/24] incubator-geode git commit: GEODE-904 Adds matchMedia() polyfill to MIT listings, cleanup edits

Posted by ji...@apache.org.
GEODE-904 Adds matchMedia() polyfill to MIT listings, cleanup edits

Adds matchMedia() polyfill to the MIT license and adds “.js” to end of
“Respond.js” name. Other changes are just aesthetic cleanups.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/52bca831
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/52bca831
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/52bca831

Branch: refs/heads/feature/GEODE-17-2
Commit: 52bca83171cbd251010a682f964006727b89ddd5
Parents: a18ed41
Author: Joey McAllister <jm...@pivotal.io>
Authored: Thu Apr 7 18:51:52 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:54:26 2016 -0700

----------------------------------------------------------------------
 LICENSE | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/52bca831/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 998bbcb..e1fc3cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -350,16 +350,19 @@ Apache Geode bundles the following files under the MIT license:
      TheDrunkenEpic <http://www.thedrunkenepic.com>
   - jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010
     Kelvin Luck
+  - matchMedia() polyfill (https://github.com/paulirish/matchMedia.js),
+    Copyright (c) 2012 Scott Jehl
   - Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/),
     Copyright (c) Nicolas Gallagher and Jonathan Neal
-  - Respond v1.1.0 (https://github.com/scottjehl/Respond), Copyright (c) 2012
-    Scott Jehl
+  - Respond.js v1.1.0 (https://github.com/scottjehl/Respond), Copyright (c)
+    2012 Scott Jehl
   - Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
     2015 Nathan Cahill
-  - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012 Denis
-    Howlett <de...@isocra.com>, Nick Lombard <nickl>, and other
+  - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012
+    Denis Howlett <de...@isocra.com>, Nick Lombard <nickl>, and other
     contributors
-  - Timeago v1.3.0 (http://timeago.yarp.com), Copyright (c) 2008-2015 Ryan McGeary
+  - Timeago v1.3.0 (http://timeago.yarp.com), Copyright (c) 2008-2015 Ryan
+    McGeary
   - Underscore (http://underscorejs.org), Copyright (c) 2009-2016 Jeremy
     Ashkenas, DocumentCloud, and Investigative Reporters & Editors
   - zTree v3.5.02 (http://zTree.me/), Copyright (c) 2010 Hunter.z
@@ -402,7 +405,8 @@ SIL Open Font License (https://opensource.org/licenses/OFL-1.1)
 
 Apache Geode bundles the following files under the SIL OFL 1.1 license:
 
-  - Font Awesome (font files) (http://fontawesome.io) Copyright (c) Dave Gandy
+  - Font Awesome (font files) (http://fontawesome.io) Copyright (c) Dave
+    Gandy
 
 Version 1.1 - 26 February 2007
 


[18/24] incubator-geode git commit: GEODE-386: Change xsd namespace to apache

Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd b/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
new file mode 100644
index 0000000..c9c4f91
--- /dev/null
+++ b/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
@@ -0,0 +1,1469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<xsd:schema
+    targetNamespace="http://geode.apache.org/schema/cache"
+    xmlns:gf="http://geode.apache.org/schema/cache"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+  <xsd:annotation>
+    <xsd:documentation><![CDATA[
+This is the XML Schema for the Geode distributed cache declarative
+caching XML file. All declarative cache files must include a schema
+of the following form:
+
+  <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">
+
+If you are declaring a client cache then use this schema:
+
+  <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">
+
+The contents of a declarative XML file correspond to APIs found in the
+com.gemstone.gemfire.cache and com.gemstone.gemfire.cache.client
+packages. A declarative caching XML file is used to populate a Cache
+or a ClientCache when it is created.
+
+The top-level element in this syntax is "cache" or "client-cache".
+All elements are listed here in alphabetical order.
+
+The following conventions apply to all Geode distributed cache
+declarative caching XML file elements unless indicated otherwise.
+
+- In elements that contain PCDATA, leading and trailing whitespace in
+  the data may be ignored.
+
+- In elements whose value is an "enumerated type", the value is case
+  sensitive.
+  
+  ]]></xsd:documentation>
+  </xsd:annotation>
+
+    <!--
+-->
+  <xsd:element name="cache">
+    <xsd:annotation>
+      <xsd:documentation>
+        The "cache" element is the root element of the declarative cache file on a peer or server.
+        This element configures a Geode Cache and describes the root regions it contains, if any.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element maxOccurs="1" minOccurs="0" name="cache-transaction-manager" type="gf:cache-transaction-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="dynamic-region-factory" type="gf:dynamic-region-factory-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-hub">
+          <xsd:annotation>
+            <xsd:documentation>
+              The "gateway-hub" element specifies a Gateway Hub that is
+              initialized when the Cache is declaratively initialized.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The "gateway" element specifies a Gateway that is
+                    initialized when a GatewayHub is declaratively initialized.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:choice>
+                      <xsd:element maxOccurs="unbounded" minOccurs="1" name="gateway-endpoint">
+                        <xsd:annotation>
+                          <xsd:documentation>
+                            The "gateway-endpoint" element specifies an endpoint that is
+                            initialized when a Gateway is declaratively initialized.
+                          </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:complexType>
+                          <xsd:attribute name="host" type="xsd:string" use="required" />
+                          <xsd:attribute name="id" type="xsd:string" use="required" />
+                          <xsd:attribute name="port" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                      </xsd:element>
+                      <xsd:element maxOccurs="unbounded" minOccurs="1" name="gateway-listener">
+                        <xsd:annotation>
+                          <xsd:documentation>
+                            The "gateway-listener" element specifies a listener that is
+                            initialized when a Gateway is declaratively initialized.
+                          </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:complexType>
+                          <xsd:sequence>
+                            <xsd:element name="class-name" type="gf:class-name-type" />
+                            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                          </xsd:sequence>
+                        </xsd:complexType>
+                      </xsd:element>
+                    </xsd:choice>
+                    <xsd:element maxOccurs="1" minOccurs="0" name="gateway-queue">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          The "gateway-queue" element specifies a queue that is initialized when a
+                          Gateway is declaratively initialized. As of 6.5 overflow-directory is
+                          deprecated. Use disk-store-name instead. As of 6.5 roll-oplogs is
+                          deprecated. Use disk-store-name instead.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:attribute name="alert-threshold" type="xsd:string" use="optional" />
+                        <xsd:attribute name="batch-conflation" type="xsd:boolean" use="optional" />
+                        <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+                        <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
+                        <xsd:attribute name="enable-persistence" type="xsd:boolean" use="optional" />
+                        <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+                        <xsd:attribute name="roll-oplogs" type="xsd:boolean" use="optional" />
+                        <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
+                        <xsd:attribute name="overflow-directory" type="xsd:string" use="optional" />
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute name="early-ack" type="xsd:boolean" use="optional" />
+                  <xsd:attribute name="id" type="xsd:string" use="required" />
+                  <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+                  <xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional" />
+                  <xsd:attribute name="concurrency-level" type="xsd:string" use="optional" />
+                  <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute name="id" type="xsd:string" use="required" />
+            <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
+            <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
+            <xsd:attribute name="port" type="xsd:string" use="optional" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="startup-policy" use="optional">
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                  <xsd:enumeration value="primary" />
+                  <xsd:enumeration value="secondary" />
+                  <xsd:enumeration value="none" />
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:attribute>
+            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="max-connections" type="xsd:integer" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-sender">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-event-filter" type="gf:class-with-parameters-type" />
+              <xsd:element maxOccurs="1" minOccurs="0" name="gateway-event-substitution-filter" type="gf:class-with-parameters-type" />
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-transport-filter" type="gf:class-with-parameters-type" />
+            </xsd:sequence>
+            <xsd:attribute name="id" type="xsd:string" use="required" />
+            <xsd:attribute name="remote-distributed-system-id" type="xsd:string" use="required" />
+            <xsd:attribute name="parallel" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional" />
+            <xsd:attribute name="enable-batch-conflation" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
+            <xsd:attribute name="enable-persistence" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+            <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
+            <xsd:attribute name="alert-threshold" type="xsd:string" use="optional" />
+            <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
+            <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-receiver">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-transport-filter" type="gf:class-with-parameters-type" />
+            </xsd:sequence>
+            <xsd:attribute name="start-port" type="xsd:string" use="optional" />
+            <xsd:attribute name="end-port" type="xsd:string" use="optional" />
+            <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
+            <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="hostname-for-senders" type="xsd:string" use="optional" />
+            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="1" minOccurs="0" name="gateway-conflict-resolver">
+          <xsd:annotation>
+            <xsd:documentation>
+              A "gateway-conflict-resolver" element describes a region's GatewayConflictResolver.
+              It is used to resolve inter-system concurrency conflicts.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="class-name" type="gf:class-name-type" />
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="async-event-queue">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-event-filter" type="gf:class-with-parameters-type" />
+              <xsd:element maxOccurs="1" minOccurs="0" name="gateway-event-substitution-filter" type="gf:class-with-parameters-type" />
+              <xsd:element name="async-event-listener" type="gf:class-with-parameters-type">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    A "async-event-listener" element describes a region's AsyncEventListener.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute name="id" type="xsd:string" use="required" />
+            <xsd:attribute name="parallel" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+            <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
+            <xsd:attribute name="enable-batch-conflation" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
+            <xsd:attribute name="persistent" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+            <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
+            <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
+            <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
+          </xsd:complexType>
+        </xsd:element>
+
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="cache-server">
+          <xsd:annotation>
+            <xsd:documentation>
+              The "cache-server" element specifies a Cache Server that will accept requests from
+              clients and that is started when the Cache is declaratively initialized.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:complexContent>
+              <xsd:extension base="gf:server-type">
+                <xsd:attribute name="tcp-no-delay" type="xsd:boolean" use="optional" />
+              </xsd:extension>
+            </xsd:complexContent>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="pool" type="gf:pool-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="disk-store" type="gf:disk-store-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="hdfs-store" type="gf:hdfs-store-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="pdx" type="gf:pdx-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+          <xsd:element name="jndi-bindings" type="gf:jndi-bindings-type" />
+          <xsd:element name="region" type="gf:region-type" />
+          <xsd:element name="vm-root-region" type="gf:region-type">
+            <xsd:annotation>
+              <xsd:appinfo>deprecated</xsd:appinfo>
+              <xsd:documentation>
+                A "vm-root-region" element is the same as "region". This element exists for
+                backwards compatiblity and should not be used in new xml files.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:choice>
+        <xsd:element maxOccurs="1" minOccurs="0" name="function-service" type="gf:function-service-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="resource-manager" type="gf:resource-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="serialization-registration" type="gf:serialization-registration-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="backup" type="xsd:string">
+          <xsd:annotation>
+            <xsd:documentation>
+              The backup element defines files or directories that should be backed up when the
+              system wide backup command is invoked. Disk stores with persistent data are
+              automatically backed up, they do not need to be listed with this element.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element maxOccurs="1" minOccurs="0" name="initializer" type="gf:initializer-type" />
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="copy-on-read" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="is-server" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="lock-timeout" type="xsd:string" use="optional" />
+      <xsd:attribute name="lock-lease" type="xsd:string" use="optional" />
+      <xsd:attribute name="message-sync-interval" type="xsd:string" use="optional" />
+      <xsd:attribute name="search-timeout" type="xsd:string" use="optional" />
+      <xsd:attribute name="version" type="gf:versionType" use="required" fixed="1.0" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="client-cache">
+    <xsd:annotation>
+      <xsd:documentation>
+        The "client-cache" element is the root element of the declarative cache file on a client.
+        This element configures a Geode ClientCache and describes the root regions it contains, if any.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element maxOccurs="1" minOccurs="0" name="cache-transaction-manager" type="gf:cache-transaction-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="dynamic-region-factory" type="gf:dynamic-region-factory-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="pool" type="gf:pool-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="disk-store" type="gf:disk-store-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="pdx" type="gf:pdx-type" />
+        <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+          <xsd:element name="jndi-bindings" type="gf:jndi-bindings-type" />
+          <xsd:element name="region" type="gf:region-type" />
+        </xsd:choice>
+        <xsd:element maxOccurs="1" minOccurs="0" name="function-service" type="gf:function-service-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="resource-manager" type="gf:resource-manager-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="serialization-registration" type="gf:serialization-registration-type" />
+        <xsd:element maxOccurs="1" minOccurs="0" name="initializer" type="gf:initializer-type" />
+      </xsd:sequence>
+      <xsd:attribute name="copy-on-read" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="version" type="gf:versionType" use="required" fixed="1.0" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="region-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "region" element describes a region (and its entries) in Geode distributed cache.
+        It may be used to create a new region or may be used to add new entries to an existing
+        region. Note that the "name" attribute specifies the simple name of the region; it
+        cannot contain a "/". If "refid" is set then it defines the default region attributes
+        to use for this region. A nested "region-attributes" element can override these defaults.
+        If the nested "region-attributes" element has its own "refid" then it will cause the
+        "refid" on the region to be ignored. "refid" can be set to the name of a RegionShortcut
+        or a ClientRegionShortcut (see the javadocs of those enum classes for their names).
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="index">
+        <xsd:annotation>
+          <xsd:documentation>
+            An "index" element describes an index to be created on a region.
+            The index node, if any, should all come immediately after the
+            "region-attributes" node. There can be any number of functional types
+            of index on a Region, but only at max one index of type "primary-key". The
+            "name" attribute is a required field which identifies the name of the index.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:choice minOccurs="0">
+            <xsd:element name="functional">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A functional type of index needs a from-clause, expression which are mandatory.
+                  The import string is used for specifying the type of Object in the region or
+                  the type of Object which the indexed expression evaluates to.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="expression" type="xsd:string" use="required" />
+                <xsd:attribute name="from-clause" type="xsd:string" use="required" />
+                <xsd:attribute name="imports" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="primary-key">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A primary-key type of index needs a field attribute which is mandatory.
+                  There should be only one or zero primary-index defined for a region
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="field" type="xsd:string" use="required" />
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:choice>
+          <xsd:attribute name="name" type="xsd:string" use="required" />
+          <xsd:attribute name="expression" type="xsd:string" use="optional" />
+          <xsd:attribute name="from-clause" type="xsd:string" use="optional" />
+          <xsd:attribute name="imports" type="xsd:string" use="optional" />
+          <xsd:attribute name="key-index" type="xsd:boolean" use="optional" />
+          <xsd:attribute default="range" name="type" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="range" />
+                <xsd:enumeration value="hash" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="entry">
+        <xsd:annotation>
+          <xsd:documentation>
+            An "entry" element desribes an entry to be added to a region. Note
+            that if an entry with the given key already exists in the region,
+            it will be replaced.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="key">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "key" element describes the key in a Region entry.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:choice>
+                  <xsd:element name="string" type="gf:string-type" />
+                  <xsd:element name="declarable" type="gf:declarable-type" />
+                </xsd:choice>
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="value">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "value" element describes the value in a Region entry
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:choice>
+                  <xsd:element name="string" type="gf:string-type" />
+                  <xsd:element name="declarable" type="gf:declarable-type" />
+                </xsd:choice>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="region" type="gf:region-type" />
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="refid" type="xsd:string" use="optional" />
+  </xsd:complexType>
+    <!-- ======================================================= -->
+    <!--
+A "region-attributes" element describes the attributes of a region to
+be created.
+As of 6.5 disk-dirs is deprecated on region-attributes. Use disk-store-name instead.
+-->
+  <xsd:complexType name="region-attributes-type">
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="key-constraint">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "key-constraint" element specifies the name of a class to which the
+            keys of a region are constrained.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="value-constraint" type="xsd:string">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "value-constraint" element specifies the name of a class to which the
+            values of a region are constrained.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="region-time-to-live">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "region-time-to-live" element specifies a Region's time to live.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="region-idle-time">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "region-idle-time" element specifies a Region's idle time.
+            Note that the APIs that correspond to this element add "out" to their
+            name. See getRegionIdleTimeout and setRegionIdleTimeout.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="entry-time-to-live">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "entry-time-to-live" element specifies a Region's entries' time to
+            live.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="entry-idle-time">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "entry-idle-time" element specifies a Region's entries' idle time.
+            Note that the APIs that correspond to this element add "out" to
+            their name. See getEntryIdleTimeout and setEntryIdleTimeout.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-write-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "disk-write-attributes" element describes how entry data is written
+            to disk. Deprecated as of 6.5 use disk-store instead.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:choice>
+            <xsd:element name="asynchronous-writes">
+              <xsd:annotation>
+                <xsd:documentation>
+                  An "asynchronous-writes" element specifies how entry data should be
+                  written to disk asynchronous. Deprecated as of 6.5 use disk-store instead.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="bytes-threshold" type="xsd:string" use="required" />
+                <xsd:attribute name="time-interval" type="xsd:string" use="required" />
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="synchronous-writes">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "synchronous-writes" element specifies that entry data should be
+                  written to disk synchronously.
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:choice>
+          <xsd:attribute name="max-oplog-size" type="xsd:string" use="optional" />
+          <xsd:attribute name="roll-oplogs" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dirs" type="gf:disk-dirs-type" />
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="partition-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "partition-attributes" element configures a region for partitioned
+            data storage.
+
+            local-max-memory attribute added to partition-attributes in release 5.1
+            total-max-memory attribute added to partition-attributes in release 5.1
+            total-num-buckets attribute added to partition-attributes in release 5.1
+            partition-resolver attribute added to partition-attributes in release 5.7
+            partition-listener attribute added to partition-attributes in release 6.1
+            colocated-with attribute added to partition-attributes in release 5.7
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="1" minOccurs="0" name="partition-resolver">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "partition-resolver" element describes a partitioned region's custom
+                  PartitionResolver.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+                <xsd:attribute name="name" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="partition-listener">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "partition-listener" element describes a partitioned region's custom
+                  PartitionListener.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="fixed-partition-attributes">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "fixed-partition-attributes" element describes characteristics of a
+                  partition in a Fixed Partitioned Region.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="partition-name" type="xsd:string" use="required" />
+                <xsd:attribute name="is-primary" type="xsd:boolean" use="optional" />
+                <xsd:attribute name="num-buckets" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+          </xsd:sequence>
+          <xsd:attribute name="local-max-memory" type="xsd:string" use="optional" />
+          <xsd:attribute name="recovery-delay" type="xsd:string" use="optional" />
+          <xsd:attribute name="redundant-copies" type="xsd:string" use="optional" />
+          <xsd:attribute name="startup-recovery-delay" type="xsd:string" use="optional" />
+          <xsd:attribute name="total-max-memory" type="xsd:string" use="optional" />
+          <xsd:attribute name="total-num-buckets" type="xsd:string" use="optional" />
+          <xsd:attribute name="colocated-with" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="membership-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "membership-attributes" element configures a region for membership
+            constraints based on required roles.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="required-role">
+              <xsd:annotation>
+                <xsd:documentation>
+                  A "required-role" element specifies a role that is required for reliable
+                  access to the region
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="name" type="xsd:string" use="required" />
+              </xsd:complexType>
+            </xsd:element>
+
+          </xsd:sequence>
+          <xsd:attribute name="loss-action" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="full-access" />
+                <xsd:enumeration value="limited-access" />
+                <xsd:enumeration value="no-access" />
+                <xsd:enumeration value="reconnect" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="resumption-action" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="none" />
+                <xsd:enumeration value="reinitialize" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="subscription-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "subscription-attributes" element configures how a region subscribes
+            to remote distributed regions.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="interest-policy" use="optional">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="all" />
+                <xsd:enumeration value="cache-content" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="cache-loader" type="gf:cache-loader-type" />
+      <xsd:element maxOccurs="1" minOccurs="0" name="cache-writer" type="gf:cache-writer-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="cache-listener">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "cache-listener" element describes a region's CacheListener.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="compressor">
+        <xsd:annotation>
+          <xsd:documentation>
+            A compressor registers a custom class which extends Compressor to support compression on a region.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="1" minOccurs="0" name="eviction-attributes">
+        <xsd:annotation>
+          <xsd:documentation>
+            Create eviction attributes that monitor and control the size of the Region.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:choice>
+            <xsd:element name="lru-entry-count">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Create an LRU eviction controller which performs the action if the
+                  Region has more than the maximum number of Entries in the Region.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
+                <xsd:attribute name="maximum" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="lru-heap-percentage">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Create an LRU which evicts entries using the specified action
+                  when the heap is over the resource manager critical heap/off-heap percentage.
+                  When the threshold has been exceeded each create or put operation
+                  is required to evict the same size of data which was added. The
+                  optional class-name and parameters allow for the declaration
+                  of an ObjectSizer, which will be used to determine data size.
+                  The class must implement the ObjectSizer interface.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence minOccurs="0">
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="lru-memory-size">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Create an LRU that performs the action when the memory size of the Region is
+                  over the maximum. The optional class-name and parameters allow for the
+                  declaration an ObjectSizer, which is used to measure the size of each Object
+                  in the Region. The class must implement the ObjectSizer interface.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:complexType>
+                <xsd:sequence minOccurs="0">
+                  <xsd:element name="class-name" type="gf:class-name-type" />
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+                </xsd:sequence>
+                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
+                <xsd:attribute name="maximum" type="xsd:string" use="optional" />
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:choice>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="concurrency-level" type="xsd:string" use="optional" />
+    <xsd:attribute name="data-policy" type="gf:region-attributesData-policy" use="optional" />
+    <xsd:attribute name="early-ack" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="enable-async-conflation" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="enable-gateway" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="enable-subscription-conflation" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="gateway-sender-ids" type="xsd:string" use="optional" />
+    <xsd:attribute name="async-event-queue-ids" type="xsd:string" use="optional" />
+    <xsd:attribute name="hub-id" type="xsd:string" use="optional" />
+    <xsd:attribute name="id" type="xsd:string" use="optional" />
+    <xsd:attribute name="ignore-jta" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="index-update-type" type="gf:region-attributesIndex-update-type" use="optional" />
+    <xsd:attribute name="initial-capacity" type="xsd:string" use="optional" />
+    <xsd:attribute name="is-lock-grantor" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="load-factor" type="xsd:string" use="optional" />
+    <xsd:attribute name="mirror-type" type="gf:region-attributesMirror-type" use="optional" />
+    <xsd:attribute name="multicast-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="persist-backup" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="pool-name" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="hdfs-store-name" type="xsd:string" use="optional" />
+    <xsd:attribute name="hdfs-write-only" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="publisher" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="refid" type="xsd:string" use="optional" />
+    <xsd:attribute name="scope" type="gf:region-attributesScope" use="optional" />
+    <xsd:attribute name="statistics-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="cloning-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute default="true" name="concurrency-checks-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="off-heap" type="xsd:boolean" use="optional" />
+  </xsd:complexType>
+  <xsd:simpleType name="region-attributesData-policy">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="empty" />
+      <xsd:enumeration value="normal" />
+      <xsd:enumeration value="partition" />
+      <xsd:enumeration value="persistent-replicate" />
+      <xsd:enumeration value="preloaded" />
+      <xsd:enumeration value="replicate" />
+      <xsd:enumeration value="persistent-partition" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="region-attributesIndex-update-type">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="asynchronous" />
+      <xsd:enumeration value="synchronous" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="region-attributesMirror-type">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="keys" />
+      <xsd:enumeration value="keys-values" />
+      <xsd:enumeration value="none" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="region-attributesScope">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="distributed-ack" />
+      <xsd:enumeration value="distributed-no-ack" />
+      <xsd:enumeration value="global" />
+      <xsd:enumeration value="local" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="enum-readable-writable">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="readable" />
+      <xsd:enumeration value="writable" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!--
+-->
+    <!-- ======================================================= -->
+    <!-- ======================================================= -->
+
+  <xsd:complexType name="server-type">
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="group" type="xsd:string">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "group" element specifies a single server group.
+            Deprecated as of 7.0 use the groups Geode property instead.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="client-subscription">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "client-subscription" element describes the eviction policy, capacity and
+            overflow-directory for client subscription config. The overflow-directory attribute
+            is deprecated as of 6.5 use disk-store-name instead.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="eviction-policy" use="required">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="entry" />
+                <xsd:enumeration value="mem" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="capacity" type="xsd:string" use="required" />
+          <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+          <xsd:attribute name="overflow-directory" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="custom-load-probe">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "custom-load-probe" element describes a callback that reports the load on a cache-server.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
+    <xsd:attribute name="hostname-for-clients" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-connections" type="xsd:string" use="optional" />
+    <xsd:attribute name="maximum-message-count" type="xsd:string" use="optional" />
+    <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-threads" type="xsd:string" use="optional" />
+    <xsd:attribute name="message-time-to-live" type="xsd:string" use="optional" />
+    <xsd:attribute name="notify-by-subscription" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="port" type="xsd:string" use="optional" />
+    <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="load-poll-interval" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="resource-manager-type">
+    <xsd:annotation>
+      <xsd:appinfo>deprecated</xsd:appinfo>
+      <xsd:documentation>
+        The "resource manager" element configures the behavior of the resource manager.
+        The resource manager provides support for resource management of its associated Cache.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="critical-heap-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="eviction-heap-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="critical-off-heap-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="eviction-off-heap-percentage" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="function-service-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        The "function service" element configures the behavior of the function service.
+        The function service allows users to execute functions on data stored in Geode.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="function">
+        <xsd:annotation>
+          <xsd:documentation>
+            The "function" element defines a function for registration in the function service.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="cache-loader-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "cache-loader" element describes a region's CacheLoader.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="cache-transaction-manager-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "cache-transaction-manager" element allows insertion of cache-level transaction listeners.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="transaction-listener">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "transaction-listener" describes a TransactionListener.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="1" minOccurs="0" name="transaction-writer">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "transaction-writer" describes a TransactionWriter.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="cache-writer-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "cache-writer" element describes a region's CacheWriter.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="serialization-registration-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A serialization-registration contains a set of serializer or instantiator tags to
+        register customer DataSerializer extensions or DataSerializable implementations respectively.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="serializer">
+        <xsd:annotation>
+          <xsd:documentation>
+            A serializer registers a custom class which extends DataSerializer to support custom
+            serialization of non-modifiable object types inside Geode. The class must have a
+            public zero-arg constructor.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="instantiator">
+        <xsd:annotation>
+          <xsd:documentation>
+            An instantiator registers a custom class which implements the DataSerializable interface
+            to support custom object serialization inside Geode. The class must have a public
+            zero-arg constructor.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+          </xsd:sequence>
+          <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The id that the instantiator should associate with the DataSerializable type.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:simpleType name="class-name-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "class-name" element specifies the name of a class, an instance of which is created
+        when a declarative cache XML file is read.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:complexType name="disk-store-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "disk-store" element specifies a DiskStore for persistence.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dirs" type="gf:disk-dirs-type" />
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="auto-compact" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="compaction-threshold" type="xsd:string" use="optional" />
+    <xsd:attribute name="allow-force-compaction" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="max-oplog-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="time-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="write-buffer-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="queue-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-usage-warning-percentage" type="xsd:string" use="optional" />
+    <xsd:attribute name="disk-usage-critical-percentage" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType mixed="true" name="hdfs-store-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "hdfs-store" element specifies a HdfsStore for persistence.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="namenode-url" type="xsd:string" use="optional" />
+    <xsd:attribute name="home-dir" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-memory" type="xsd:string" use="optional" />
+    <xsd:attribute name="read-cache-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="batch-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
+    <xsd:attribute name="buffer-persistent" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="disk-store" type="xsd:string" use="optional" />
+    <xsd:attribute name="synchronous-disk-write" type="xsd:string" use="optional" />
+    <xsd:attribute name="hdfs-client-config-file" type="xsd:string" use="optional" />
+    <xsd:attribute name="purge-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="major-compaction" type="xsd:string" use="optional" />
+    <xsd:attribute name="major-compaction-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="major-compaction-threads" type="xsd:integer" use="optional" />
+    <xsd:attribute name="minor-compaction" type="xsd:string" use="optional" />
+    <xsd:attribute name="minor-compaction-threads" type="xsd:integer" use="optional" />
+    <xsd:attribute name="max-write-only-file-size" type="xsd:integer" use="optional" />
+    <xsd:attribute name="write-only-file-rollover-interval" type="xsd:string" use="optional" />    
+  </xsd:complexType>
+
+  <xsd:complexType name="pdx-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "pdx" element specifies the configuration for the portable data exchange (PDX) method of
+        serialization. The "read-serialized" attribute is "early access".
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="pdx-serializer">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "pdx-serializer" element describes a serializer used to serialize objects in the
+            portable data exchange format.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="read-serialized" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="ignore-unread-fields" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="persistent" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="pool-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "pool" element specifies a client to server connection pool.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice>
+      <xsd:element maxOccurs="unbounded" minOccurs="1" name="locator">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "locator" element specifies the host and port that a server locator is listening on
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="host" type="xsd:string" use="required" />
+          <xsd:attribute name="port" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element maxOccurs="unbounded" minOccurs="1" name="server">
+        <xsd:annotation>
+          <xsd:documentation>
+            A "server" element specifies the host and port that a cache server is listening on
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="host" type="xsd:string" use="required" />
+          <xsd:attribute name="port" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:choice>
+    <xsd:attribute name="free-connection-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="load-conditioning-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="min-connections" type="xsd:string" use="optional" />
+    <xsd:attribute name="max-connections" type="xsd:string" use="optional" />
+    <xsd:attribute name="retry-attempts" type="xsd:string" use="optional" />
+    <xsd:attribute name="idle-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="ping-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="read-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="server-group" type="xsd:string" use="optional" />
+    <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
+    <xsd:attribute name="subscription-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="subscription-message-tracking-timeout" type="xsd:string" use="optional" />
+    <xsd:attribute name="subscription-ack-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="subscription-redundancy" type="xsd:string" use="optional" />
+    <xsd:attribute name="statistic-interval" type="xsd:string" use="optional" />
+    <xsd:attribute name="thread-local-connections" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="pr-single-hop-enabled" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="multiuser-authentication" type="xsd:boolean" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="declarable-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "declarable" element specifies a Declarable object to be placed in a Region entry.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="disk-dir-type" mixed="true">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "disk-dir" element specifies one of a region or diskstore's disk directories.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="dir-size" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="disk-dirs-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "disk-dirs" element specifies the region's disk directories.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="1" name="disk-dir" type="gf:disk-dir-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="dynamic-region-factory-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "dynamic-region-factory" element configures a dynamic region factory for
+        this cache. If this optional element is missing then the cache does not
+        support dynamic regions.
+
+        The optional "disk-dir" sub-element can be used to specify the directory to
+        store the persistent files that are used for dynamic region bookkeeping.
+        It defaults to the current directory.
+
+        The pool-name attribute can be used to set the name of the connection pool used
+        by client applications in a client/server cache configuration. It should not be
+        specified in servers or peers.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dir" type="gf:disk-dir-type" />
+    </xsd:sequence>
+    <xsd:attribute name="disable-persist-backup" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="disable-register-interest" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="pool-name" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <xsd:complexType name="expiration-attributes-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        An "expiration-attributes" element describes expiration.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="1" minOccurs="0" name="custom-expiry">
+        <xsd:annotation>
+          <xsd:documentation>
+            The "custom-expiry" element specifies a callback that specifies
+            custom expiration attributes. See the CustomExpiry class.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="class-name" type="gf:class-name-type" />
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+
+    <xsd:attribute name="action" use="optional">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="destroy" />
+          <xsd:enumeration value="invalidate" />
+          <xsd:enumeration value="local-destroy" />
+          <xsd:enumeration value="local-invalidate" />
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="timeout" type="xsd:string" use="required" />
+  </xsd:complexType>
+
+  <xsd:complexType name="initializer-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "initializer" element specifies a Declarable object whose init method
+        will be called after all other cache.xml initialization is
+        complete.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="class-with-parameters-type">
+    <xsd:sequence>
+      <xsd:element name="class-name" type="gf:class-name-type" />
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="jndi-bindings-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A jndi-bindings element will contain the jndi-binding for each of the
+        datasources which are to be bound with the JNDI Context.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element maxOccurs="unbounded" minOccurs="0" name="jndi-binding">
+        <xsd:annotation>
+          <xsd:documentation>
+            For every datasource which is bound to the JNDI tree, there will exist one
+            jndi-binding tag. This tag will describe the property and configuration of the
+            datasource. The attributes of jndi-binding are used for configuration by
+            Geode, while the property element is used to configure the custom property
+            for the datasource.
+
+            The "xa-datasource-class" must be set when type is XAPooledDataSource,
+            "conn-pooled-datasource-class" must be set when type is PooledDataSource,
+            and "jdbc-driver-class" msut be set when the type is SimpleDataSource. It is
+            advisable to set the user-name and password as attributes rather than as a
+            property element. Alternatively, they may both be set as attributes of the
+            jndi-binding tag as well as an attribute of the property tag.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="config-property">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="config-property-name" type="xsd:string" />
+                  <xsd:element name="config-property-type" type="xsd:string" />
+                  <xsd:element name="config-property-value" type="xsd:string" />
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+
+          </xsd:sequence>
+          <xsd:attribute name="blocking-timeout-seconds" type="xsd:string" use="optional" />
+          <xsd:attribute name="conn-pooled-datasource-class" type="xsd:string" use="optional" />
+          <xsd:attribute name="connection-url" type="xsd:string" use="optional" />
+          <xsd:attribute name="idle-timeout-seconds" type="xsd:string" use="optional" />
+          <xsd:attribute name="init-pool-size" type="xsd:string" use="optional" />
+          <xsd:attribute name="jdbc-driver-class" type="xsd:string" use="optional" />
+          <xsd:attribute name="jndi-name" type="xsd:string" use="required" />
+          <xsd:attribute name="login-timeout-seconds" type="xsd:string" use="optional" />
+          <xsd:attribute name="managed-conn-factory-class" type="xsd:string" use="optional" />
+          <xsd:attribute name="max-pool-size" type="xsd:string" use="optional" />
+          <xsd:attribute name="password" type="xsd:string" use="optional" />
+          <xsd:attribute name="transaction-type" type="xsd:string" use="optional" />
+          <xsd:attribute name="type" use="required">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="ManagedDataSource" />
+                <xsd:enumeration value="SimpleDataSource" />
+                <xsd:enumeration value="PooledDataSource" />
+                <xsd:enumeration value="XAPooledDataSource" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="user-name" type="xsd:string" use="optional" />
+          <xsd:attribute name="xa-datasource-class" type="xsd:string" use="optional" />
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:simpleType name="enum-action-destroy-overflow">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="local-destroy" />
+      <xsd:enumeration value="overflow-to-disk" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:complexType name="parameter-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "parameter" element describes a parameter used to initialize a Declarable object.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice>
+      <xsd:element name="string" type="gf:string-type" />
+      <xsd:element name="declarable" type="gf:declarable-type" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+  </xsd:complexType>
+
+  <xsd:complexType name="string-type">
+    <xsd:annotation>
+      <xsd:documentation>
+        A "string" element specifies a String to be placed in a Region entry.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string"></xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+  <xsd:simpleType name="versionType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Decimal version type.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:token">
+      <xsd:pattern value="\.?[0-9]+(\.[0-9]+)*" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- TODO -->
+    <!-- Will put refid later.....refid   IDREF #IMPLIED -->
+
+</xsd:schema>


[03/24] incubator-geode git commit: GEODE-914: Added specific NOTICE files for war projects

Posted by ji...@apache.org.
GEODE-914: Added specific NOTICE files for war projects

Since the war projects (geode-web, geode-web-api, geode-pulse)
are distributed on Maven, added a NOTICE file specific to each
war based on the bundled jars.

Also added the source LICENSE to all jar-type artifacts.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/12efa36d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/12efa36d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/12efa36d

Branch: refs/heads/feature/GEODE-17-2
Commit: 12efa36db9899754b24068f26916b6629b2bbdb1
Parents: a096644
Author: Anthony Baker <ab...@apache.org>
Authored: Fri Apr 8 08:19:45 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:27:29 2016 -0700

----------------------------------------------------------------------
 .../src/main/webapp/META-INF/MANIFEST.MF        |  3 -
 geode-pulse/src/main/webapp/META-INF/NOTICE     | 90 ++++++++++++++++++++
 geode-web-api/src/main/webapp/META-INF/NOTICE   | 89 +++++++++++++++++++
 geode-web/src/main/webapp/META-INF/NOTICE       | 36 ++++++++
 gradle/java.gradle                              |  5 +-
 5 files changed, 219 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12efa36d/geode-pulse/src/main/webapp/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/META-INF/MANIFEST.MF b/geode-pulse/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e94951..0000000
--- a/geode-pulse/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12efa36d/geode-pulse/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/META-INF/NOTICE b/geode-pulse/src/main/webapp/META-INF/NOTICE
new file mode 100644
index 0000000..25a229d
--- /dev/null
+++ b/geode-pulse/src/main/webapp/META-INF/NOTICE
@@ -0,0 +1,90 @@
+Apache Geode (incubating) 
+Copyright 2016 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+The following NOTICEs pertain to software distributed with this project.
+
+stream-lib
+Copyright 2016 AddThis
+
+   This product includes software developed by AddThis.
+
+   This product also includes code adapted from:
+
+   Apache Solr (http://lucene.apache.org/solr/)
+   Copyright 2014 The Apache Software Foundation
+
+This product includes software developed by the MX4J
+project (http://mx4j.sourceforge.net).
+
+Apache Commons BeanUtils
+Copyright 2000-2010 The Apache Software Foundation
+
+Apache Commons Collections
+Copyright 2001-2015 The Apache Software Foundation
+
+Apache Commons Digester
+Copyright 2001-2010 The Apache Software Foundation
+
+Apache Commons Lang
+Copyright 2001-2010 The Apache Software Foundation
+
+Apache Commons Logging
+Copyright 2003-2014 The Apache Software Foundation
+
+Jackson Core 2.2.0
+
+  # Jackson JSON processor
+  
+  Jackson is a high-performance, Free/Open Source JSON processing library.
+  It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+  been in development since 2007.
+  It is currently developed by a community of developers, as well as supported
+  commercially by FasterXML.com.
+  
+  ## Licensing
+  
+  Jackson core and extension components may licensed under different licenses.
+  To find the details that apply to this artifact see the accompanying LICENSE file.
+  For more information, including possible other licensing options, contact
+  FasterXML.com (http://fasterxml.com).
+  
+  ## Credits
+  
+  A list of contributors may be found from CREDITS file, which is included
+  in some artifacts (usually source distributions); but is always available
+  from the source code management (SCM) system project uses.
+
+Spring Framework 4.2.4.RELEASE
+Copyright (c) 2002-2015 Pivotal, Inc.
+
+  This product is licensed to you under the Apache License, Version 2.0
+  (the "License"). You may not use this product except in compliance with
+  the License.
+  
+  This product may include a number of subcomponents with separate
+  copyright notices and license terms. Your use of the source code for
+  these subcomponents is subject to the terms and conditions of the
+  subcomponent's license, as noted in the license.txt file.
+
+Spring LDAP Core 1.3.2.RELEASE
+
+   ======================================================================
+   == NOTICE file corresponding to section 4 d of the Apache License,  ==
+   == Version 2.0, for the Spring LDAP distribution.                   ==
+   ======================================================================
+
+   This product includes software developed by
+   the Apache Software Foundation (http://www.apache.org).
+
+   The end-user documentation included with a redistribution, if any,
+   must include the following acknowledgement:
+
+     "This product includes software developed by the Spring LDAP
+      Project (http://www.springframework.org/ldap)."
+
+   Alternately, this acknowledgement may appear in the software itself,
+   if and wherever such third-party acknowledgements normally appear.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12efa36d/geode-web-api/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/META-INF/NOTICE b/geode-web-api/src/main/webapp/META-INF/NOTICE
new file mode 100644
index 0000000..b62c5dc
--- /dev/null
+++ b/geode-web-api/src/main/webapp/META-INF/NOTICE
@@ -0,0 +1,89 @@
+Apache Geode (incubating) 
+Copyright 2016 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+The following NOTICEs pertain to software distributed with this project.
+
+stream-lib
+Copyright 2016 AddThis
+
+   This product includes software developed by AddThis.
+
+   This product also includes code adapted from:
+
+   Apache Solr (http://lucene.apache.org/solr/)
+   Copyright 2014 The Apache Software Foundation
+
+This product includes software developed by the MX4J
+project (http://mx4j.sourceforge.net).
+
+Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@iki.fi)
+
+  Other developers who have contributed code are:
+  
+  * Brian Langel
+
+Apache Commons FileUpload
+Copyright 2002-2014 The Apache Software Foundation
+
+Apache Commons Lang
+Copyright 2001-2010 The Apache Software Foundation
+
+Jackson Core 2.2.0
+
+  # Jackson JSON processor
+  
+  Jackson is a high-performance, Free/Open Source JSON processing library.
+  It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+  been in development since 2007.
+  It is currently developed by a community of developers, as well as supported
+  commercially by FasterXML.com.
+  
+  ## Licensing
+  
+  Jackson core and extension components may licensed under different licenses.
+  To find the details that apply to this artifact see the accompanying LICENSE file.
+  For more information, including possible other licensing options, contact
+  FasterXML.com (http://fasterxml.com).
+  
+  ## Credits
+  
+  A list of contributors may be found from CREDITS file, which is included
+  in some artifacts (usually source distributions); but is always available
+  from the source code management (SCM) system project uses.
+
+Spring Framework 4.2.4.RELEASE
+Copyright (c) 2002-2015 Pivotal, Inc.
+
+  This product is licensed to you under the Apache License, Version 2.0
+  (the "License"). You may not use this product except in compliance with
+  the License.
+  
+  This product may include a number of subcomponents with separate
+  copyright notices and license terms. Your use of the source code for
+  these subcomponents is subject to the terms and conditions of the
+  subcomponent's license, as noted in the license.txt file.
+
+Spring Hateoas 0.12
+Copyright (c) [2012-2014] Pivotal Software, Inc.
+
+  This product is licensed to you under the Apache License, Version 2.0 (the "License").  
+  You may not use this product except in compliance with the License.  
+  
+  This product may include a number of subcomponents with
+  separate copyright notices and license terms. Your use of the source
+  code for the these subcomponents is subject to the terms and
+  conditions of the subcomponent's license, as noted in the LICENSE file.Spring Framework 4.2.4.RELEASE
+  Copyright (c) 2002-2015 Pivotal, Inc.
+  
+  This product is licensed to you under the Apache License, Version 2.0
+  (the "License"). You may not use this product except in compliance with
+  the License.
+  
+  This product may include a number of subcomponents with separate
+  copyright notices and license terms. Your use of the source code for
+  these subcomponents is subject to the terms and conditions of the
+  subcomponent's license, as noted in the license.txt file.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12efa36d/geode-web/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-web/src/main/webapp/META-INF/NOTICE b/geode-web/src/main/webapp/META-INF/NOTICE
new file mode 100644
index 0000000..1369396
--- /dev/null
+++ b/geode-web/src/main/webapp/META-INF/NOTICE
@@ -0,0 +1,36 @@
+Apache Geode (incubating) 
+Copyright 2016 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+The following NOTICEs pertain to software distributed with this project.
+
+stream-lib
+Copyright 2016 AddThis
+
+   This product includes software developed by AddThis.
+
+   This product also includes code adapted from:
+
+   Apache Solr (http://lucene.apache.org/solr/)
+   Copyright 2014 The Apache Software Foundation
+
+This product includes software developed by the MX4J
+project (http://mx4j.sourceforge.net).
+
+Apache Commons FileUpload
+Copyright 2002-2014 The Apache Software Foundation
+
+Spring Framework 4.2.4.RELEASE
+Copyright (c) 2002-2015 Pivotal, Inc.
+
+  This product is licensed to you under the Apache License, Version 2.0
+  (the "License"). You may not use this product except in compliance with
+  the License.
+  
+  This product may include a number of subcomponents with separate
+  copyright notices and license terms. Your use of the source code for
+  these subcomponents is subject to the terms and conditions of the
+  subcomponent's license, as noted in the license.txt file.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12efa36d/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 85e18d8..4acb4da 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -43,7 +43,10 @@ subprojects {
         }
 
         metaInf {
-          from("$rootDir/NOTICE")
+          from("$rootDir/LICENSE")
+          if (!jar.source.contains('NOTICE')) {
+            from("$rootDir/NOTICE")
+          }
         }
       }
     }


[22/24] incubator-geode git commit: GEODE-1163 Fix branding in Swagger UI

Posted by ji...@apache.org.
GEODE-1163 Fix branding in Swagger UI


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0a98fa62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0a98fa62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0a98fa62

Branch: refs/heads/feature/GEODE-17-2
Commit: 0a98fa62084ba116a19764162279cb1ae9dbb08c
Parents: c23ec7a
Author: Nitin Lamba <nl...@apache.org>
Authored: Sat Apr 2 00:40:58 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 21:18:55 2016 -0700

----------------------------------------------------------------------
 .../gemfire/internal/i18n/LocalizedStrings.java        |  8 ++++++++
 .../internal/web/swagger/config/SwaggerConfig.java     | 13 +++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a98fa62/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index 8365f1a..e923ed5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -2149,6 +2149,14 @@ public class LocalizedStrings extends ParentLocalizedStrings {
   public static final StringId AbstractGatewaySenderEventProcessor_ATTEMPT_TO_SET_BATCH_SIZE_FAILED = new StringId(6615, "Attempting to set the batch size from {0} to {1} events failed. Instead it was set to 1.");
   public static final StringId GatewaySenderEventRemoteDispatcher_MESSAGE_TOO_LARGE_EXCEPTION = new StringId(6616, "The following exception occurred attempting to send a batch of {0} events. The batch will be tried again after reducing the batch size to {1} events.");
 
+  // Developer REST interface
+  public static final StringId SwaggerConfig_VENDOR_PRODUCT_LINE = new StringId(6617, "Apache Geode Developer REST API");
+  public static final StringId SwaggerConfig_DESCRIPTOR = new StringId(6618, "Developer REST API and interface to Geode's distributed, in-memory data grid and cache.");
+  public static final StringId SwaggerConfig_EULA_LINK = new StringId(6619, "http://www.apache.org/licenses/");
+  public static final StringId SwaggerConfig_SUPPORT_LINK = new StringId(6620, "dev@geode.incubator.apache.org");
+  public static final StringId SwaggerConfig_DOC_TITLE = new StringId(6621, "Apache Geode Documentation");
+  public static final StringId SwaggerConfig_DOC_LINK = new StringId(6622, "http://geode.incubator.apache.org/docs/");
+
   /** Testing strings, messageId 90000-99999 **/
   
   /** These are simple messages for testing, translated with Babelfish. **/

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a98fa62/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/SwaggerConfig.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/SwaggerConfig.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/SwaggerConfig.java
index b57c056..3c70991 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/SwaggerConfig.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/SwaggerConfig.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.mangofactory.swagger.configuration.JacksonScalaSupport;
 import com.mangofactory.swagger.configuration.SpringSwaggerConfig;
 import com.mangofactory.swagger.configuration.SpringSwaggerModelConfig;
@@ -59,12 +60,12 @@ public class SwaggerConfig {
    */
   private ApiInfo apiInfo() {
     return new ApiInfo(
-        "Pivotal" + "\u2122" + " GemFire" + "\u00AE" + " Developer REST API",
-        "Developer REST API and interface to GemFire's distributed, in-memory data grid and cache.",
-        "https://network.pivotal.io/pivotal_software_eula",
-        "support@pivotal.io",
-        "Pivotal GemFire Documentation",
-        "http://gemfire.docs.pivotal.io/index.html");
+        LocalizedStrings.SwaggerConfig_VENDOR_PRODUCT_LINE.toLocalizedString(),
+        LocalizedStrings.SwaggerConfig_DESCRIPTOR.toLocalizedString(),
+        LocalizedStrings.SwaggerConfig_EULA_LINK.toLocalizedString(),
+        LocalizedStrings.SwaggerConfig_SUPPORT_LINK.toLocalizedString(),
+        LocalizedStrings.SwaggerConfig_DOC_TITLE.toLocalizedString(),
+        LocalizedStrings.SwaggerConfig_DOC_LINK.toLocalizedString());
   }
 
   /**


[04/24] incubator-geode git commit: GEODE-914: Reworked NOTICE for binary distribution

Posted by ji...@apache.org.
GEODE-914: Reworked NOTICE for binary distribution

Update binary NOTICE to match changes to bundled jar files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a0966443
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a0966443
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a0966443

Branch: refs/heads/feature/GEODE-17-2
Commit: a09664434685fb1ca01f50b4c27fa76414c3dbf2
Parents: 178e9f5
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Apr 7 21:18:52 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:27:29 2016 -0700

----------------------------------------------------------------------
 NOTICE                              |   8 +-
 geode-assembly/src/main/dist/NOTICE | 658 +++++++++++++------------------
 2 files changed, 270 insertions(+), 396 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a0966443/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 4e0e8ad..df53e0e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,12 +10,12 @@ The following NOTICEs pertain to software distributed with this project.
 stream-lib
 Copyright 2016 AddThis
 
-This product includes software developed by AddThis.
+   This product includes software developed by AddThis.
 
-This product also includes code adapted from:
+   This product also includes code adapted from:
 
-Apache Solr (http://lucene.apache.org/solr/)
-Copyright 2014 The Apache Software Foundation
+   Apache Solr (http://lucene.apache.org/solr/)
+   Copyright 2014 The Apache Software Foundation
 
 This product includes software developed by the MX4J
 project (http://mx4j.sourceforge.net).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a0966443/geode-assembly/src/main/dist/NOTICE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE
index ec14cda..f054cf5 100644
--- a/geode-assembly/src/main/dist/NOTICE
+++ b/geode-assembly/src/main/dist/NOTICE
@@ -7,57 +7,68 @@ The Apache Software Foundation (http://www.apache.org/).
 
 The following NOTICEs pertain to software distributed with this project.
 
-Apache Commons FileUpload
-Copyright 2002-2014 The Apache Software Foundation
+stream-lib
+Copyright 2016 AddThis
 
-Apache Commons IO
-Copyright 2002-2012 The Apache Software Foundation
-
-Apache Commons Lang
-Copyright 2001-2010 The Apache Software Foundation
+   This product includes software developed by AddThis.
 
-// ------------------------------------------------------------------
-// NOTICE file corresponding to the section 4d of The Apache License,
-// Version 2.0, in this case for Commons Logging
-// ------------------------------------------------------------------
+   This product also includes code adapted from:
 
-Commons Logging
-Copyright 2001-2007 The Apache Software Foundation
+   Apache Solr (http://lucene.apache.org/solr/)
+   Copyright 2014 The Apache Software Foundation
 
-This product includes/uses software(s) developed by 'an unknown organization'
-  - Unnamed - avalon-framework:avalon-framework:jar:4.1.3
-  - Unnamed - log4j:log4j:jar:1.2.12
-  - Unnamed - logkit:logkit:jar:1.0.1
-
-HBase
-Copyright 2015 The Apache Software Foundation
+This product includes software developed by the MX4J
+project (http://mx4j.sourceforge.net).
 
-# Jackson JSON processor
+Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@iki.fi)
 
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
+  Other developers who have contributed code are:
+  
+  * Brian Langel
 
-## Licensing
+Apache Commons BeanUtils
+Copyright 2000-2010 The Apache Software Foundation
 
-Jackson core and extension components may licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
+Apache Commons Collections
+Copyright 2001-2015 The Apache Software Foundation
 
-## Credits
+Apache Commons Digester
+Copyright 2001-2010 The Apache Software Foundation
 
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
+Apache Commons FileUpload
+Copyright 2002-2014 The Apache Software Foundation
 
-Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@iki.fi)
+Apache Commons IO
+Copyright 2002-2012 The Apache Software Foundation
 
-Other developers who have contributed code are:
+Apache Commons Lang
+Copyright 2001-2010 The Apache Software Foundation
 
-* Brian Langel
+Apache Commons Logging
+Copyright 2003-2014 The Apache Software Foundation
+
+Jackson Core 2.2.0
+
+  # Jackson JSON processor
+
+  Jackson is a high-performance, Free/Open Source JSON processing library.
+  It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+  been in development since 2007.
+  It is currently developed by a community of developers, as well as supported
+  commercially by FasterXML.com.
+  
+  ## Licensing
+  
+  Jackson core and extension components may licensed under different licenses.
+  To find the details that apply to this artifact see the accompanying LICENSE file.
+  For more information, including possible other licensing options, contact
+  FasterXML.com (http://fasterxml.com).
+  
+  ## Credits
+  
+  A list of contributors may be found from CREDITS file, which is included
+  in some artifacts (usually source distributions); but is always available
+  from the source code management (SCM) system project uses.
 
 Apache Log4j API
 Copyright 1999-2015 Apache Software Foundation
@@ -65,9 +76,9 @@ Copyright 1999-2015 Apache Software Foundation
 Apache Log4j Core
 Copyright 1999-2012 Apache Software Foundation
 
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
+  ResolverUtil.java
+  Copyright 2005-2006 Tim Fennell
+  
 Apache Log4j Commons Logging Bridge
 Copyright 1999-2015 Apache Software Foundation
 
@@ -80,351 +91,220 @@ Copyright 1999-2015 Apache Software Foundation
 Apache Lucene
 Copyright 2014 The Apache Software Foundation
 
-Includes software from other Apache Software Foundation projects,
-including, but not limited to:
- - Apache Ant
- - Apache Jakarta Regexp
- - Apache Commons
- - Apache Xerces
-
-ICU4J, (under analysis/icu) is licensed under an MIT styles license
-and Copyright (c) 1995-2008 International Business Machines Corporation and others
-
-Some data files (under analysis/icu/src/data) are derived from Unicode data such
-as the Unicode Character Database. See http://unicode.org/copyright.html for more
-details.
-
-Brics Automaton (under core/src/java/org/apache/lucene/util/automaton) is 
-BSD-licensed, created by Anders Møller. See http://www.brics.dk/automaton/
-
-The levenshtein automata tables (under core/src/java/org/apache/lucene/util/automaton) were
-automatically generated with the moman/finenight FSA library, created by
-Jean-Philippe Barrette-LaPierre. This library is available under an MIT license,
-see http://sites.google.com/site/rrettesite/moman and 
-http://bitbucket.org/jpbarrette/moman/overview/
-
-The class org.apache.lucene.util.WeakIdentityMap was derived from
-the Apache CXF project and is Apache License 2.0.
-
-The Google Code Prettify is Apache License 2.0.
-See http://code.google.com/p/google-code-prettify/
-
-JUnit (junit-4.10) is licensed under the Common Public License v. 1.0
-See http://junit.sourceforge.net/cpl-v10.html
-
-This product includes code (JaspellTernarySearchTrie) from Java Spelling Checkin
-g Package (jaspell): http://jaspell.sourceforge.net/
-License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
-
-The snowball stemmers in
-  analysis/common/src/java/net/sf/snowball
-were developed by Martin Porter and Richard Boulton.
-The snowball stopword lists in
-  analysis/common/src/resources/org/apache/lucene/analysis/snowball
-were developed by Martin Porter and Richard Boulton.
-The full snowball package is available from
-  http://snowball.tartarus.org/
-
-The KStem stemmer in
-  analysis/common/src/org/apache/lucene/analysis/en
-was developed by Bob Krovetz and Sergio Guzman-Lara (CIIR-UMass Amherst)
-under the BSD-license.
-
-The Arabic,Persian,Romanian,Bulgarian, and Hindi analyzers (common) come with a default
-stopword list that is BSD-licensed created by Jacques Savoy.  These files reside in:
-analysis/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt,
-analysis/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt,
-analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt,
-analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt,
-analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
-See http://members.unine.ch/jacques.savoy/clef/index.html.
-
-The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers
-(common) are based on BSD-licensed reference implementations created by Jacques Savoy and
-Ljiljana Dolamic. These files reside in:
-analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java
-analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java
-
-The Stempel analyzer (stempel) includes BSD-licensed software developed 
-by the Egothor project http://egothor.sf.net/, created by Leo Galambos, Martin Kvapil,
-and Edmond Nolan.
-
-The Polish analyzer (stempel) comes with a default
-stopword list that is BSD-licensed created by the Carrot2 project. The file resides
-in stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt.
-See http://project.carrot2.org/license.html.
-
-The SmartChineseAnalyzer source code (smartcn) was
-provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
-
-WordBreakTestUnicode_*.java (under modules/analysis/common/src/test/) 
-is derived from Unicode data such as the Unicode Character Database. 
-See http://unicode.org/copyright.html for more details.
-
-The Morfologik analyzer (morfologik) includes BSD-licensed software
-developed by Dawid Weiss and Marcin Miłkowski (http://morfologik.blogspot.com/).
-
-Morfologik uses data from Polish ispell/myspell dictionary
-(http://www.sjp.pl/slownik/en/) licenced on the terms of (inter alia)
-LGPL and Creative Commons ShareAlike.
-
-Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
-(http://sgjp.pl/morfeusz/)
-
-Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
-source code for this can be found at http://www.eclipse.org/jetty/downloads.php
-
-===========================================================================
-Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration
-===========================================================================
-
-This software includes a binary and/or source version of data from
-
-  mecab-ipadic-2.7.0-20070801
-
-which can be obtained from
-
-  http://atilika.com/releases/mecab-ipadic/mecab-ipadic-2.7.0-20070801.tar.gz
-
-or
-
-  http://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz
-
-===========================================================================
-mecab-ipadic-2.7.0-20070801 Notice
-===========================================================================
-
-Nara Institute of Science and Technology (NAIST),
-the copyright holders, disclaims all warranties with regard to this
-software, including all implied warranties of merchantability and
-fitness, in no event shall NAIST be liable for
-any special, indirect or consequential damages or any damages
-whatsoever resulting from loss of use, data or profits, whether in an
-action of contract, negligence or other tortuous action, arising out
-of or in connection with the use or performance of this software.
-
-A large portion of the dictionary entries
-originate from ICOT Free Software.  The following conditions for ICOT
-Free Software applies to the current dictionary as well.
-
-Each User may also freely distribute the Program, whether in its
-original form or modified, to any third party or parties, PROVIDED
-that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
-on, or be attached to, the Program, which is distributed substantially
-in the same form as set out herein and that such intended
-distribution, if actually made, will neither violate or otherwise
-contravene any of the laws and regulations of the countries having
-jurisdiction over the User or the intended distribution itself.
-
-NO WARRANTY
-
-The program was produced on an experimental basis in the course of the
-research and development conducted during the project and is provided
-to users as so produced on an experimental basis.  Accordingly, the
-program is provided without any warranty whatsoever, whether express,
-implied, statutory or otherwise.  The term "warranty" used herein
-includes, but is not limited to, any warranty of the quality,
-performance, merchantability and fitness for a particular purpose of
-the program and the nonexistence of any infringement or violation of
-any right of any third party.
-
-Each user of the program will agree and understand, and be deemed to
-have agreed and understood, that there is no warranty whatsoever for
-the program and, accordingly, the entire risk arising from or
-otherwise connected with the program is assumed by the user.
-
-Therefore, neither ICOT, the copyright holder, or any other
-organization that participated in or was otherwise related to the
-development of the program and their respective officials, directors,
-officers and other employees shall be held liable for any and all
-damages, including, without limitation, general, special, incidental
-and consequential damages, arising out of or otherwise in connection
-with the use or inability to use the program or any product, material
-or result produced or otherwise obtained by using the program,
-regardless of whether they have been advised of, or otherwise had
-knowledge of, the possibility of such damages at any time during the
-project or thereafter.  Each user will be deemed to have agreed to the
-foregoing by his or her commencement of use of the program.  The term
-"use" as used herein includes, but is not limited to, the use,
-modification, copying and distribution of the program and the
-production of secondary products from the program.
-
-In the case where the program, whether in its original form or
-modified, was distributed or delivered to or received by a user from
-any person, organization or entity other than ICOT, unless it makes or
-grants independently of ICOT any specific warranty to the user in
-writing, such person, organization or entity, will also be exempted
-from and not be held liable to the user for any such damages as noted
-above as far as the program is concerned.
-
-
-                            The Netty Project
-                            =================
-
-Please visit the Netty web site for more information:
-
-  * http://netty.io/
-
-Copyright 2011 The Netty Project
-
-The Netty Project licenses this file to you under the Apache License,
-version 2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at:
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based  
-WebSocket and HTTP server, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.webbit.txt (BSD License)
-  * HOMEPAGE:
-    * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.slf4j.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.slf4j.org/
-
-
-This product contains a modified version of Roland Kuhn's ASL2
-AbstractNodeQueue, which is based on Dmitriy Vyukov's non-intrusive MPSC queue.
-It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.abstractnodequeue.txt (Public Domain)
-  * HOMEPAGE:
-    * https://github.com/akka/akka/blob/wip-2.2.3-for-scala-2.11/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jctools.txt (ASL2 License)
-  * HOMEPAGE:
-    * https://github.com/JCTools/JCTools
-
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.protobuf.txt (New BSD License)
-  * HOMEPAGE:
-    * http://code.google.com/p/protobuf/
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality.  It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.bouncycastle.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.snappy.txt (New BSD License)
-  * HOMEPAGE:
-    * http://code.google.com/p/snappy/
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
-  * HOMEPAGE:
-    * http://www.jboss.org/jbossmarshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.caliper.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://code.google.com/p/caliper/
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-logging.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.log4j.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://logging.apache.org/log4j/
-
-Spring Framework 3.2.12.RELEASE
-Copyright (c) 2002-2014 Pivotal, Inc.
-
-This product is licensed to you under the Apache License, Version 2.0
-(the "License"). You may not use this product except in compliance with
-the License.
-
-This product may include a number of subcomponents with separate
-copyright notices and license terms. Your use of the source code for
-these subcomponents is subject to the terms and conditions of the
-subcomponent's license, as noted in the license.txt file.
+  Includes software from other Apache Software Foundation projects,
+  including, but not limited to:
+   - Apache Ant
+   - Apache Jakarta Regexp
+   - Apache Commons
+   - Apache Xerces
+  
+  ICU4J, (under analysis/icu) is licensed under an MIT styles license
+  and Copyright (c) 1995-2008 International Business Machines Corporation and others
+  
+  Some data files (under analysis/icu/src/data) are derived from Unicode data such
+  as the Unicode Character Database. See http://unicode.org/copyright.html for more
+  details.
+  
+  Brics Automaton (under core/src/java/org/apache/lucene/util/automaton) is 
+  BSD-licensed, created by Anders Møller. See http://www.brics.dk/automaton/
+  
+  The levenshtein automata tables (under core/src/java/org/apache/lucene/util/automaton) were
+  automatically generated with the moman/finenight FSA library, created by
+  Jean-Philippe Barrette-LaPierre. This library is available under an MIT license,
+  see http://sites.google.com/site/rrettesite/moman and 
+  http://bitbucket.org/jpbarrette/moman/overview/
+  
+  The class org.apache.lucene.util.WeakIdentityMap was derived from
+  the Apache CXF project and is Apache License 2.0.
+  
+  The Google Code Prettify is Apache License 2.0.
+  See http://code.google.com/p/google-code-prettify/
+  
+  JUnit (junit-4.10) is licensed under the Common Public License v. 1.0
+  See http://junit.sourceforge.net/cpl-v10.html
+  
+  This product includes code (JaspellTernarySearchTrie) from Java Spelling Checkin
+  g Package (jaspell): http://jaspell.sourceforge.net/
+  License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
+  
+  The snowball stemmers in
+    analysis/common/src/java/net/sf/snowball
+  were developed by Martin Porter and Richard Boulton.
+  The snowball stopword lists in
+    analysis/common/src/resources/org/apache/lucene/analysis/snowball
+  were developed by Martin Porter and Richard Boulton.
+  The full snowball package is available from
+    http://snowball.tartarus.org/
+  
+  The KStem stemmer in
+    analysis/common/src/org/apache/lucene/analysis/en
+  was developed by Bob Krovetz and Sergio Guzman-Lara (CIIR-UMass Amherst)
+  under the BSD-license.
+  
+  The Arabic,Persian,Romanian,Bulgarian, and Hindi analyzers (common) come with a default
+  stopword list that is BSD-licensed created by Jacques Savoy.  These files reside in:
+  analysis/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt,
+  analysis/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt,
+  analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt,
+  analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt,
+  analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
+  See http://members.unine.ch/jacques.savoy/clef/index.html.
+  
+  The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers
+  (common) are based on BSD-licensed reference implementations created by Jacques Savoy and
+  Ljiljana Dolamic. These files reside in:
+  analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java
+  analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java
+  
+  The Stempel analyzer (stempel) includes BSD-licensed software developed 
+  by the Egothor project http://egothor.sf.net/, created by Leo Galambos, Martin Kvapil,
+  and Edmond Nolan.
+  
+  The Polish analyzer (stempel) comes with a default
+  stopword list that is BSD-licensed created by the Carrot2 project. The file resides
+  in stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt.
+  See http://project.carrot2.org/license.html.
+  
+  The SmartChineseAnalyzer source code (smartcn) was
+  provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
+  
+  WordBreakTestUnicode_*.java (under modules/analysis/common/src/test/) 
+  is derived from Unicode data such as the Unicode Character Database. 
+  See http://unicode.org/copyright.html for more details.
+  
+  The Morfologik analyzer (morfologik) includes BSD-licensed software
+  developed by Dawid Weiss and Marcin Miłkowski (http://morfologik.blogspot.com/).
+  
+  Morfologik uses data from Polish ispell/myspell dictionary
+  (http://www.sjp.pl/slownik/en/) licenced on the terms of (inter alia)
+  LGPL and Creative Commons ShareAlike.
+  
+  Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
+  (http://sgjp.pl/morfeusz/)
+  
+  Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
+  source code for this can be found at http://www.eclipse.org/jetty/downloads.php
+  
+  ===========================================================================
+  Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration
+  ===========================================================================
+  
+  This software includes a binary and/or source version of data from
+  
+    mecab-ipadic-2.7.0-20070801
+  
+  which can be obtained from
+  
+    http://atilika.com/releases/mecab-ipadic/mecab-ipadic-2.7.0-20070801.tar.gz
+  
+  or
+  
+    http://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz
+  
+  ===========================================================================
+  mecab-ipadic-2.7.0-20070801 Notice
+  ===========================================================================
+  
+  Nara Institute of Science and Technology (NAIST),
+  the copyright holders, disclaims all warranties with regard to this
+  software, including all implied warranties of merchantability and
+  fitness, in no event shall NAIST be liable for
+  any special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether in an
+  action of contract, negligence or other tortuous action, arising out
+  of or in connection with the use or performance of this software.
+  
+  A large portion of the dictionary entries
+  originate from ICOT Free Software.  The following conditions for ICOT
+  Free Software applies to the current dictionary as well.
+  
+  Each User may also freely distribute the Program, whether in its
+  original form or modified, to any third party or parties, PROVIDED
+  that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+  on, or be attached to, the Program, which is distributed substantially
+  in the same form as set out herein and that such intended
+  distribution, if actually made, will neither violate or otherwise
+  contravene any of the laws and regulations of the countries having
+  jurisdiction over the User or the intended distribution itself.
+  
+  NO WARRANTY
+  
+  The program was produced on an experimental basis in the course of the
+  research and development conducted during the project and is provided
+  to users as so produced on an experimental basis.  Accordingly, the
+  program is provided without any warranty whatsoever, whether express,
+  implied, statutory or otherwise.  The term "warranty" used herein
+  includes, but is not limited to, any warranty of the quality,
+  performance, merchantability and fitness for a particular purpose of
+  the program and the nonexistence of any infringement or violation of
+  any right of any third party.
+  
+  Each user of the program will agree and understand, and be deemed to
+  have agreed and understood, that there is no warranty whatsoever for
+  the program and, accordingly, the entire risk arising from or
+  otherwise connected with the program is assumed by the user.
+  
+  Therefore, neither ICOT, the copyright holder, or any other
+  organization that participated in or was otherwise related to the
+  development of the program and their respective officials, directors,
+  officers and other employees shall be held liable for any and all
+  damages, including, without limitation, general, special, incidental
+  and consequential damages, arising out of or otherwise in connection
+  with the use or inability to use the program or any product, material
+  or result produced or otherwise obtained by using the program,
+  regardless of whether they have been advised of, or otherwise had
+  knowledge of, the possibility of such damages at any time during the
+  project or thereafter.  Each user will be deemed to have agreed to the
+  foregoing by his or her commencement of use of the program.  The term
+  "use" as used herein includes, but is not limited to, the use,
+  modification, copying and distribution of the program and the
+  production of secondary products from the program.
+  
+  In the case where the program, whether in its original form or
+  modified, was distributed or delivered to or received by a user from
+  any person, organization or entity other than ICOT, unless it makes or
+  grants independently of ICOT any specific warranty to the user in
+  writing, such person, organization or entity, will also be exempted
+  from and not be held liable to the user for any such damages as noted
+  above as far as the program is concerned.
+
+Spring Framework 4.2.4.RELEASE
+Copyright (c) 2002-2015 Pivotal, Inc.
+
+  This product is licensed to you under the Apache License, Version 2.0
+  (the "License"). You may not use this product except in compliance with
+  the License.
+  
+  This product may include a number of subcomponents with separate
+  copyright notices and license terms. Your use of the source code for
+  these subcomponents is subject to the terms and conditions of the
+  subcomponent's license, as noted in the license.txt file.
+
+Spring Hateoas 0.12
+Copyright (c) [2012-2014] Pivotal Software, Inc.
+
+  This product is licensed to you under the Apache License, Version 2.0 (the "License").  
+  You may not use this product except in compliance with the License.  
+  
+  This product may include a number of subcomponents with
+  separate copyright notices and license terms. Your use of the source
+  code for the these subcomponents is subject to the terms and
+  conditions of the subcomponent's license, as noted in the LICENSE file.
+
+Spring LDAP Core 1.3.2
 
    ======================================================================
    == NOTICE file corresponding to section 4 d of the Apache License,  ==
-   == Version 2.0, for the Spring Framework distribution.              ==
+   == Version 2.0, for the Spring LDAP distribution.                   ==
    ======================================================================
 
    This product includes software developed by
@@ -433,16 +313,13 @@ subcomponent's license, as noted in the license.txt file.
    The end-user documentation included with a redistribution, if any,
    must include the following acknowledgement:
 
-     "This product includes software developed by the Spring Framework
-      Project (http://www.springframework.org)."
+     "This product includes software developed by the Spring LDAP
+      Project (http://www.springframework.org/ldap)."
 
    Alternately, this acknowledgement may appear in the software itself,
    if and wherever such third-party acknowledgements normally appear.
 
-   The names "Spring", "Spring Framework", and "Spring GemFire" must
-   not be used to endorse or promote products derived from this
-   software without prior written permission. For written permission,
-   please contact enquiries@springsource.com.
+Spring Shell 1.1.0
 
    ======================================================================
    == NOTICE file corresponding to section 4 d of the Apache License,  ==
@@ -465,6 +342,3 @@ subcomponent's license, as noted in the license.txt file.
    not be used to endorse or promote products derived from this
    software without prior written permission. For written permission,
    please contact enquiries@springsource.com.
-
-This product includes software developed by the MX4J 
-project (http://mx4j.sourceforge.net).


[19/24] incubator-geode git commit: GEODE-386: Change xsd namespace to apache

Posted by ji...@apache.org.
GEODE-386: Change xsd namespace to apache


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c1cf90eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c1cf90eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c1cf90eb

Branch: refs/heads/feature/GEODE-17-2
Commit: c1cf90eb884522a40e9a196c633c10dd12e9fbd7
Parents: 2622510
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Apr 6 07:41:41 2016 -0700
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Fri Apr 8 14:55:07 2016 -0700

----------------------------------------------------------------------
 .../release/conf/cache-client.xml               |    6 +-
 .../release/conf/cache-peer.xml                 |    6 +-
 .../release/conf/cache-server.xml               |    6 +-
 .../internal/SharedConfiguration.java           |    4 +-
 .../internal/cache/xmlcache/CacheXml.java       |   63 +-
 .../cache/xmlcache/CacheXmlGenerator.java       |  148 +-
 .../internal/cache/xmlcache/CacheXmlParser.java |    2 +-
 .../cache/xmlcache/CacheXmlVersion.java         |   56 +-
 .../cache/xmlcache/GeodeEntityResolver.java     |    2 +-
 .../configuration/domain/CacheElement.java      |    4 +-
 .../configuration/domain/XmlEntity.java         |    7 +-
 .../internal/configuration/utils/XmlUtils.java  |    6 +-
 .../geode.apache.org/schema/cache/cache-1.0.xsd | 1469 +++++++++++++++++
 .../gemfire/cache/cache-9.0.xsd                 | 1519 ------------------
 .../gemfire/cache30/CacheXml58DUnitTest.java    |    4 +-
 .../gemfire/cache30/CacheXml90DUnitTest.java    |  234 ---
 .../cache30/CacheXmlGeode10DUnitTest.java       |  234 +++
 .../internal/SharedConfigurationJUnitTest.java  |    2 +-
 .../xmlcache/AbstractEntityResolverTest.java    |  140 ++
 .../xmlcache/CacheXmlVersionJUnitTest.java      |   30 +-
 .../xmlcache/GeodeEntityResolverJUnitTest.java  |   49 +
 .../PivotalEntityResolverJUnitTest.java         |  118 +-
 .../domain/CacheElementJUnitTest.java           |    4 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java      |   26 +-
 .../configuration/utils/XmlUtilsJUnitTest.java  |   12 +-
 .../codeAnalysis/sanctionedSerializables.txt    |    2 +-
 .../domain/CacheElementJUnitTest.xml            |    6 +-
 ...dNewNodeJUnitTest.testAddNewNodeNewNamed.xml |    6 +-
 ...ewNodeJUnitTest.testAddNewNodeNewUnnamed.xml |    6 +-
 ...itTest.testAddNewNodeNewUnnamedExtension.xml |    6 +-
 ...NodeJUnitTest.testAddNewNodeReplaceNamed.xml |    6 +-
 ...deJUnitTest.testAddNewNodeReplaceUnnamed.xml |    6 +-
 ...st.testAddNewNodeReplaceUnnamedExtension.xml |    6 +-
 ...ddNewNodeJUnitTest.testDeleteNodeUnnamed.xml |    6 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.xml       |    6 +-
 ...Test.testBuildSchemaLocationMapAttribute.xml |    6 +-
 ...testBuildSchemaLocationMapEmptyAttribute.xml |    4 +-
 ...ationMapMapOfStringListOfStringAttribute.xml |    6 +-
 ....testBuildSchemaLocationMapNullAttribute.xml |    4 +-
 ...XmlUtilsJUnitTest.testQuerySingleElement.xml |    6 +-
 .../geode.apache.org/lucene/lucene-1.0.xsd      |   12 +-
 ...erIntegrationJUnitTest.createIndex.cache.xml |    8 +-
 ...serIntegrationJUnitTest.parseIndex.cache.xml |    8 +-
 .../util/AutoBalancerIntegrationJUnitTest.java  |   12 +-
 .../website/content/schema/cache/cache-1.0.xsd  | 1469 +++++++++++++++++
 45 files changed, 3638 insertions(+), 2104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/extensions/geode-modules-assembly/release/conf/cache-client.xml
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-assembly/release/conf/cache-client.xml b/extensions/geode-modules-assembly/release/conf/cache-client.xml
index 3ae9ba7..c36e0ef 100755
--- a/extensions/geode-modules-assembly/release/conf/cache-client.xml
+++ b/extensions/geode-modules-assembly/release/conf/cache-client.xml
@@ -16,10 +16,10 @@
 	limitations under the License.
 -->
 <client-cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.0">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
 
   <!-- The default pool connects to a cache server running on  localhost at
        port 40404. To connect to a different server host and port, modify

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/extensions/geode-modules-assembly/release/conf/cache-peer.xml
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-assembly/release/conf/cache-peer.xml b/extensions/geode-modules-assembly/release/conf/cache-peer.xml
index 1f62cb1..84fb67a 100755
--- a/extensions/geode-modules-assembly/release/conf/cache-peer.xml
+++ b/extensions/geode-modules-assembly/release/conf/cache-peer.xml
@@ -16,10 +16,10 @@
 	limitations under the License.
 -->
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.0">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
 
   <!-- Uncomment the following disk-store element to modify the default disk store directory -->
   <!--

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/extensions/geode-modules-assembly/release/conf/cache-server.xml
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-assembly/release/conf/cache-server.xml b/extensions/geode-modules-assembly/release/conf/cache-server.xml
index b9d8c2c..9dad75f 100755
--- a/extensions/geode-modules-assembly/release/conf/cache-server.xml
+++ b/extensions/geode-modules-assembly/release/conf/cache-server.xml
@@ -16,10 +16,10 @@
 	limitations under the License.
 -->
 <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
+    xmlns="http://geode.apache.org/schema/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.0">
+    xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+    version="1.0">
 
   <!-- Uncomment the following gateway-hub element to create a gateway hub -->
   <!--

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index a8f331a..8f190eb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -266,8 +266,8 @@ public class SharedConfiguration {
   // UnitTest SharedConfigurationJUnitTest.testCreateAndUpgradeDocumentFromXml
   static Document createAndUpgradeDocumentFromXml(final String xmlContent) throws SAXException, ParserConfigurationException, IOException, XPathExpressionException {
     Document doc = XmlUtils.createDocumentFromXml(xmlContent);
-    if (!CacheXml.VERSION_LATEST.equals(XmlUtils.getAttribute(doc.getDocumentElement(), CacheXml.VERSION, CacheXml.NAMESPACE))) {
-      doc = XmlUtils.upgradeSchema(doc, CacheXml.NAMESPACE, CacheXml.LATEST_SCHEMA_LOCATION, CacheXml.VERSION_LATEST);
+    if (!CacheXml.VERSION_LATEST.equals(XmlUtils.getAttribute(doc.getDocumentElement(), CacheXml.VERSION, CacheXml.GEODE_NAMESPACE))) {
+      doc = XmlUtils.upgradeSchema(doc, CacheXml.GEODE_NAMESPACE, CacheXml.LATEST_SCHEMA_LOCATION, CacheXml.VERSION_LATEST);
     }
     return doc;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
index 4f1facb..c6b0509 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
@@ -45,31 +45,38 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * This always refers to the latest GemFire version, in those cases where
    * we default to the current released version of GemFire.
    *
-   * WHenever you upgrade the DTD, you will need to search for occurrences of
+   * Whenever you upgrade the DTD, you will need to search for occurrences of
    * the previous version strings and upgrade them as well.
    *
    * @since 5.5
    */
-  public static final String VERSION_LATEST = CacheXml.VERSION_9_0;
+  public static final String VERSION_LATEST = CacheXml.VERSION_1_0;
   
   /**
-   * @deprecated As of 8.1 use {@link #NAMESPACE}
+   * @deprecated As of 8.1 use {@link #GEODE_NAMESPACE}
    */
   @Deprecated
   public static final String LATEST_SYSTEM_ID = CacheXml.SYSTEM_ID_8_0;
 
   /**
-   * @deprecated As of 8.1 use {@link #NAMESPACE}.
+   * @deprecated As of 8.1 use {@link #GEODE_NAMESPACE}.
    */
   @Deprecated
   public static final String LATEST_PUBLIC_ID = CacheXml.PUBLIC_ID_8_0;
-  
+
+  /**
+   * Namespace URI for older, GemFire {@link CacheXml} documents.
+   *
+   * @since 8.1
+   */
+  public static final String GEMFIRE_NAMESPACE = "http://schema.pivotal.io/gemfire/cache";
+
   /**
    * Namespace URI for {@link CacheXml} documents.
    * 
    * @since 8.1
    */
-  public static final String NAMESPACE = "http://schema.pivotal.io/gemfire/cache";
+  public static final String GEODE_NAMESPACE = "http://geode.apache.org/schema/cache";
 
   /**
    * Namespace prefix for {@link CacheXml} documents.
@@ -79,11 +86,11 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   public static final String PREFIX = "cache";
 
   /**
-   * Latest schema location for {@link #NAMESPACE}.
+   * Latest schema location for {@link #GEODE_NAMESPACE}.
    * 
    * @since 8.1
    */
-  public static final String LATEST_SCHEMA_LOCATION = CacheXml.SCHEMA_9_0_LOCATION;
+  public static final String LATEST_SCHEMA_LOCATION = CacheXml.SCHEMA_1_0_LOCATION;
   
   /**
    * Location of the latest DTD file for Gemfire
@@ -101,11 +108,11 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   public static final String VERSION_8_1 = "8.1";
   
   /**
-   * Version string for GemFire 9.0
+   * Version string for Geode 1.0
    * 
-   * @since 9.0
+   * @since 1.0
    */
-  public static final String VERSION_9_0 = "9.0";
+  public static final String VERSION_1_0 = "1.0";
   
   /**
    * The location of the GemFire 8.1 schema file.
@@ -114,11 +121,11 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    */
   protected static final String SCHEMA_8_1_LOCATION = "http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd";
   /**
-   * The location of the GemFire 9.0 schema file.
+   * The location of the Geeode 1.0 schema file.
    * 
-   * @since 9.0
+   * @since 1.0
    */
-  protected static final String SCHEMA_9_0_LOCATION = "http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd";
+  protected static final String SCHEMA_1_0_LOCATION = "http://geode.apache.org/schema/cache/cache-1.0.xsd";
 
   //---------------------------------
   /** Version string for GemFire 8.0 */
@@ -815,59 +822,59 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
     String location;
     if (SYSTEM_ID_3_0.equals(systemId) || PUBLIC_ID_3_0.equals(publicId)) {
       location = DTD_3_0_LOCATION;
-      version = CacheXmlVersion.VERSION_3_0;
+      version = CacheXmlVersion.GEMFIRE_3_0;
     }
     else if (SYSTEM_ID_4_0.equals(systemId) || PUBLIC_ID_4_0.equals(publicId)) {
       location = DTD_4_0_LOCATION;
-      version = CacheXmlVersion.VERSION_4_0;
+      version = CacheXmlVersion.GEMFIRE_4_0;
     }
     else if (SYSTEM_ID_4_1.equals(systemId) || PUBLIC_ID_4_1.equals(publicId)) {
       location = DTD_4_1_LOCATION;
-      version = CacheXmlVersion.VERSION_4_1;
+      version = CacheXmlVersion.GEMFIRE_4_1;
     }
     else if (SYSTEM_ID_5_0.equals(systemId) || PUBLIC_ID_5_0.equals(publicId)) {
       location = DTD_5_0_LOCATION;
-      version = CacheXmlVersion.VERSION_5_0;
+      version = CacheXmlVersion.GEMFIRE_5_0;
     }
     else if (SYSTEM_ID_5_1.equals(systemId) || PUBLIC_ID_5_1.equals(publicId)) {
       location = DTD_5_1_LOCATION;
-      version = CacheXmlVersion.VERSION_5_1;
+      version = CacheXmlVersion.GEMFIRE_5_1;
     }
     else if (SYSTEM_ID_5_5.equals(systemId) || PUBLIC_ID_5_5.equals(publicId)) {
       location = DTD_5_5_LOCATION;
-      version = CacheXmlVersion.VERSION_5_5;
+      version = CacheXmlVersion.GEMFIRE_5_5;
     }
     else if (SYSTEM_ID_5_7.equals(systemId) || PUBLIC_ID_5_7.equals(publicId)) {
       location = DTD_5_7_LOCATION;
-      version = CacheXmlVersion.VERSION_5_7;
+      version = CacheXmlVersion.GEMFIRE_5_7;
     }
     else if (SYSTEM_ID_5_8.equals(systemId) || PUBLIC_ID_5_8.equals(publicId)) {
       location = DTD_5_8_LOCATION;
-      version = CacheXmlVersion.VERSION_5_8;
+      version = CacheXmlVersion.GEMFIRE_5_8;
     }
     else if (SYSTEM_ID_6_0.equals(systemId) || PUBLIC_ID_6_0.equals(publicId)) {
       location = DTD_6_0_LOCATION;
-      version = CacheXmlVersion.VERSION_6_0;
+      version = CacheXmlVersion.GEMFIRE_6_0;
     }
     else if (SYSTEM_ID_6_1.equals(systemId) || PUBLIC_ID_6_1.equals(publicId)) {
       location = DTD_6_1_LOCATION;
-      version = CacheXmlVersion.VERSION_6_1;
+      version = CacheXmlVersion.GEMFIRE_6_1;
     }
     else if (SYSTEM_ID_6_5.equals(systemId) || PUBLIC_ID_6_5.equals(publicId)) {
       location = DTD_6_5_LOCATION;
-      version = CacheXmlVersion.VERSION_6_5;
+      version = CacheXmlVersion.GEMFIRE_6_5;
     }
     else if (SYSTEM_ID_6_6.equals(systemId) || PUBLIC_ID_6_6.equals(publicId)) {
       location = DTD_6_6_LOCATION;
-      version = CacheXmlVersion.VERSION_6_6;
+      version = CacheXmlVersion.GEMFIRE_6_6;
     }
     else if (SYSTEM_ID_7_0.equals(systemId) || PUBLIC_ID_7_0.equals(publicId)) {
       location = DTD_7_0_LOCATION;
-      version = CacheXmlVersion.VERSION_7_0;
+      version = CacheXmlVersion.GEMFIRE_7_0;
     }
     else if (SYSTEM_ID_8_0.equals(systemId) || PUBLIC_ID_8_0.equals(publicId)) {
       location = DTD_8_0_LOCATION;
-      version = CacheXmlVersion.VERSION_8_0;
+      version = CacheXmlVersion.GEMFIRE_8_0;
     }
     else {
       // Instruct the XML parser to open a URI connection to the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
index 57d06b0..ea3c975 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
@@ -466,10 +466,10 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
       // add schema location for cache schema.
       handler.startPrefixMapping(W3C_XML_SCHEMA_INSTANCE_PREFIX, W3C_XML_SCHEMA_INSTANCE_NS_URI);
-      addAttribute(atts, W3C_XML_SCHEMA_INSTANCE_PREFIX, W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION, NAMESPACE + " " + version.getSchemaLocation());
+      addAttribute(atts, W3C_XML_SCHEMA_INSTANCE_PREFIX, W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION, version.getNamespace() + " " + version.getSchemaLocation());
       
       // add cache schema to default prefix.
-      handler.startPrefixMapping(XmlConstants.DEFAULT_PREFIX, NAMESPACE);
+      handler.startPrefixMapping(XmlConstants.DEFAULT_PREFIX, version.getNamespace());
       addAttribute(atts, VERSION, this.version.getVersion());
     }
 
@@ -487,34 +487,34 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       atts.addAttribute("", "", SEARCH_TIMEOUT, "",
                         String.valueOf(creation.getSearchTimeout()));
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_5) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_5) >= 0) {
       // TODO
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
       // TODO
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_8) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_8) >= 0) {
       // TODO
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_6_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_0) >= 0) {
       // TODO
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_6_5) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) {
       // TODO
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_7_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_7_0) >= 0) {
       // TODO
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_7_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_7_0) >= 0) {
       // TODO
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_1) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_1) >= 0) {
       if (creation.hasMessageSyncInterval()) {
         atts.addAttribute("", "", MESSAGE_SYNC_INTERVAL, "", String
             .valueOf(creation.getMessageSyncInterval()));
       }
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_4_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_0) >= 0) {
       if (creation.hasServer()) {
         atts.addAttribute("", "", IS_SERVER, "",
                           String.valueOf(creation.isServer()));
@@ -532,14 +532,14 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     if (this.cache != null) {
       if (!isClientCache) {
           generate(this.cache.getCacheTransactionManager());
-      } else if(this.version.compareTo(CacheXmlVersion.VERSION_6_6) >= 0) {
+      } else if(this.version.compareTo(CacheXmlVersion.GEMFIRE_6_6) >= 0) {
         generate(this.cache.getCacheTransactionManager());
       }
 
       generateDynamicRegionFactory(this.cache);
 
       if (!isClientCache) {
-        if (this.version.compareTo(CacheXmlVersion.VERSION_7_0) >= 0) {
+        if (this.version.compareTo(CacheXmlVersion.GEMFIRE_7_0) >= 0) {
           Set<GatewaySender> senderSet = cache.getGatewaySenders();
           for (GatewaySender sender : senderSet) {
             generateGatewaySender(sender);
@@ -549,7 +549,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         }
       }
       
-      if (!isClientCache && this.version.compareTo(CacheXmlVersion.VERSION_7_0) >= 0) {
+      if (!isClientCache && this.version.compareTo(CacheXmlVersion.GEMFIRE_7_0) >= 0) {
         if (this.cache.getGatewayConflictResolver() != null) {
           generate(GATEWAY_CONFLICT_RESOLVER, this.cache.getGatewayConflictResolver());
         }
@@ -563,7 +563,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         }
       }
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
         Iterator pools;
         if (this.cache instanceof GemFireCacheImpl) {
           pools = PoolManager.getAll().values().iterator();
@@ -576,7 +576,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         }
       }
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_6_5) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) {
         if (this.cache instanceof GemFireCacheImpl) {
           GemFireCacheImpl gfc = (GemFireCacheImpl)this.cache;
           for (DiskStore ds: gfc.listDiskStores()) {
@@ -588,11 +588,11 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
           }
         }
       }
-      if(this.version.compareTo(CacheXmlVersion.VERSION_6_6) >= 0) {
+      if(this.version.compareTo(CacheXmlVersion.GEMFIRE_6_6) >= 0) {
         generatePdx();
       }
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_4_1) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_1) >= 0) {
         Map namedAttributes = this.cache.listRegionAttributes();
         for (Iterator iter = namedAttributes.entrySet().iterator();
              iter.hasNext(); ) {
@@ -603,7 +603,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
           // we need to exclude them in all versions.
           // It would be better if CacheCreation could only predefine them
           // for versions 6.5 and later but that is not easy to do
-          /*if (this.version.compareTo(CacheXmlVersion.VERSION_6_5) >= 0)*/ {
+          /*if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0)*/ {
             if (this.creation instanceof ClientCacheCreation) {
               try {
                 ClientRegionShortcut.valueOf(id);
@@ -639,15 +639,15 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     	  }
       }
 
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_8) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_8) >= 0) {
         generateFunctionService();
       }
-      if (this.version.compareTo(CacheXmlVersion.VERSION_6_0) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_0) >= 0) {
         generateResourceManager();
         generateSerializerRegistration();
       }
       if (!isClientCache) {
-        if (this.version.compareTo(CacheXmlVersion.VERSION_6_5) >= 0) {
+        if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) {
           if (this.cache instanceof GemFireCacheImpl) {
             GemFireCacheImpl gfc = (GemFireCacheImpl)this.cache;
             for (File file : gfc.getBackupFiles()) {
@@ -660,7 +660,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
           }
         }
       }
-      if(this.version.compareTo(CacheXmlVersion.VERSION_6_6) >= 0) {
+      if(this.version.compareTo(CacheXmlVersion.GEMFIRE_6_6) >= 0) {
         generateInitializer();
       }
     } else {
@@ -727,7 +727,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
   }
 
   private void generateRegion(Region root) throws SAXException {
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_0) >= 0) {
       generate(root, REGION);
     }
     else {
@@ -827,7 +827,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         }
       }
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_9_0) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEODE_1_0) >= 0) {
         if (this.creation.getResourceManager().hasCriticalOffHeap()) {
           float chp = this.creation.getResourceManager().getCriticalOffHeapPercentage();
           if (generateDefaults() || chp != MemoryThresholds.DEFAULT_CRITICAL_PERCENTAGE) {
@@ -861,7 +861,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
             String.valueOf(ehp));
       }
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_9_0) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEODE_1_0) >= 0) {
         {
           int chp = (int)this.cache.getResourceManager().getCriticalOffHeapPercentage();
           if (generateDefaults() || chp != MemoryThresholds.DEFAULT_CRITICAL_PERCENTAGE)
@@ -958,7 +958,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     try {
         atts.addAttribute("", "", CLIENT_SUBSCRIPTION_EVICTION_POLICY, "", csc.getEvictionPolicy());
         atts.addAttribute("", "", CLIENT_SUBSCRIPTION_CAPACITY, "", String.valueOf(csc.getCapacity()));
-        if (this.version.compareTo(CacheXmlVersion.VERSION_6_5) >= 0) {
+        if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) {
           String dsVal = csc.getDiskStoreName();
           if (dsVal != null) {
             atts.addAttribute("", "", DISK_STORE_NAME, "", dsVal);
@@ -981,7 +981,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    * @since 4.0
    */
   private void generate(CacheServer bridge) throws SAXException {
-    if (this.version.compareTo(CacheXmlVersion.VERSION_4_0) < 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_0) < 0) {
       return;
     }
     AttributesImpl atts = new AttributesImpl();
@@ -990,7 +990,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       atts.addAttribute("", "", PORT, "",
           String.valueOf(bridge.getPort()));
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_4_1) < 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_1) < 0) {
         return;
       }
       if (generateDefaults() || bridge.getMaximumTimeBetweenPings() != CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS)
@@ -1005,7 +1005,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       atts.addAttribute("", "", SOCKET_BUFFER_SIZE, "",
           String.valueOf(bridge.getSocketBufferSize()));
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_0) < 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_0) < 0) {
         return;
       }
       
@@ -1013,7 +1013,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       atts.addAttribute("", "", MAX_CONNECTIONS, "",
           String.valueOf(bridge.getMaxConnections()));
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_1) < 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_1) < 0) {
         return;
       }
 
@@ -1030,7 +1030,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       
       
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) < 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) < 0) {
         return;
       }
       
@@ -1046,7 +1046,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       if (generateDefaults() || bridge.getLoadPollInterval() != CacheServer.DEFAULT_LOAD_POLL_INTERVAL)
       atts.addAttribute("", "", LOAD_POLL_INTERVAL, "", String.valueOf(bridge.getLoadPollInterval()));
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_8_0) < 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_8_0) < 0) {
         return;
       }
 
@@ -1055,13 +1055,13 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
 
     } finally {
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
         handler.startElement("", CACHE_SERVER, CACHE_SERVER, atts);
       } else {
         handler.startElement("", BRIDGE_SERVER, BRIDGE_SERVER, atts);
       }
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
         String[] groups = bridge.getGroups();
         if (groups.length > 0) {
           for (int i = 0; i < groups.length; i++) {
@@ -1083,7 +1083,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         
         
       }
-      if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
         handler.endElement("", "", CACHE_SERVER);
       } else {
         handler.endElement("", "", BRIDGE_SERVER);
@@ -1097,7 +1097,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    * @since prPersistSprint2
    */
   private void generate(DiskStore ds) throws SAXException {
-    if (this.version.compareTo(CacheXmlVersion.VERSION_6_5) < 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) < 0) {
       return;
     }
     AttributesImpl atts = new AttributesImpl();
@@ -1153,7 +1153,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
             String.valueOf(ds.getQueueSize()));
       }
       
-      if (this.version.compareTo(CacheXmlVersion.VERSION_8_0) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_8_0) >= 0) {
         if ((!(ds instanceof DiskStoreAttributesCreation) ||
             ((DiskStoreAttributesCreation) ds).hasDiskUsageWarningPercentage())) {
           if (generateDefaults() || ds.getDiskUsageWarningPercentage() != DiskStoreFactory.DEFAULT_DISK_USAGE_WARNING_PERCENTAGE)
@@ -1220,7 +1220,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    * @since 5.7
    */
   private void generate(Pool cp) throws SAXException {
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) < 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) < 0) {
       return;
     }
     if (((PoolImpl)cp).isUsedByGateway()) {
@@ -1279,13 +1279,13 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       atts.addAttribute("", "", THREAD_LOCAL_CONNECTIONS, "",
                         String.valueOf(cp.getThreadLocalConnections()));
 
-      if (this.version.compareTo(CacheXmlVersion.VERSION_6_1) > 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_1) > 0) {
         if (generateDefaults() || cp.getPRSingleHopEnabled() != PoolFactory.DEFAULT_PR_SINGLE_HOP_ENABLED)
         atts.addAttribute("", "", PR_SINGLE_HOP_ENABLED, "",
             String.valueOf(cp.getPRSingleHopEnabled()));  
       }
 
-      if (this.version.compareTo(CacheXmlVersion.VERSION_6_1) > 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_1) > 0) {
         if (generateDefaults() || cp.getMultiuserAuthentication() != PoolFactory.DEFAULT_MULTIUSER_AUTHENTICATION)
         atts.addAttribute("", "", MULTIUSER_SECURE_MODE_ENABLED, "", String.valueOf(cp
             .getMultiuserAuthentication()));
@@ -1324,7 +1324,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    * @since 4.0
    */
   private void generate(CacheTransactionManager txMgr) throws SAXException {
-    if (this.version.compareTo(CacheXmlVersion.VERSION_4_0) < 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_0) < 0) {
       return;
     }
 
@@ -1355,7 +1355,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    * @since 4.3
    */
   private void generateDynamicRegionFactory(Cache c) throws SAXException {
-    if (this.version.compareTo(CacheXmlVersion.VERSION_4_1) < 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_1) < 0) {
       return;
     }
     DynamicRegionFactory.Config cfg;
@@ -1463,7 +1463,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
          generateGatewayEventFilter(gef);
       }
 
-      if (this.version.compareTo(CacheXmlVersion.VERSION_8_0) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_8_0) >= 0) {
         if (sender.getGatewayEventSubstitutionFilter() != null) {
           generateGatewayEventSubstitutionFilter(sender.getGatewayEventSubstitutionFilter());
         }
@@ -1534,7 +1534,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     	  }
       }
 
-      if (this.version.compareTo(CacheXmlVersion.VERSION_8_0) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_8_0) >= 0) {
         if (asyncEventQueue.getGatewayEventSubstitutionFilter() != null) {
           generateGatewayEventSubstitutionFilter(asyncEventQueue.getGatewayEventSubstitutionFilter());
         }
@@ -1581,7 +1581,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
           atts.addAttribute("", "", SOCKET_BUFFER_SIZE, "",
               String.valueOf(receiver.getSocketBufferSize()));
 
-        if (this.version.compareTo(CacheXmlVersion.VERSION_8_0) < 0) {
+        if (this.version.compareTo(CacheXmlVersion.GEMFIRE_8_0) < 0) {
           return;
         }
         // manual-start
@@ -1905,11 +1905,11 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
                         String.valueOf(attrs.getEnableAsyncConflation()));
     }
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_0) >= 0) {
       
       if ((!(attrs instanceof RegionAttributesCreation) ||
            ((RegionAttributesCreation) attrs).hasEnableSubscriptionConflation())) {
-        if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) >= 0) {
+        if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
           // starting with 5.7 it is enable-subscription-conflation
           if (generateDefaults() || attrs.getEnableSubscriptionConflation())
           atts.addAttribute("", "", ENABLE_SUBSCRIPTION_CONFLATION, "",
@@ -1939,7 +1939,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         } else if (dp == DataPolicy.PERSISTENT_PARTITION) {
           dpString = PERSISTENT_PARTITION_DP;
         } else if (dp.isPartition()) {
-          if (this.version.compareTo(CacheXmlVersion.VERSION_5_1) >= 0) {
+          if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_1) >= 0) {
             dpString = PARTITION_DP;
           }
           else {
@@ -1953,8 +1953,8 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         if (generateDefaults() || !dp.equals(DataPolicy.DEFAULT))
         atts.addAttribute("", "", DATA_POLICY, "", dpString);
       } // hasDataPolicy
-    } // VERSION_5_0 >= 0
-    else { // VERSION_5_0 < 0
+    } // GEMFIRE_5_0 >= 0
+    else { // GEMFIRE_5_0 < 0
       if ((!(attrs instanceof RegionAttributesCreation) ||
           ((RegionAttributesCreation) attrs).hasEnableSubscriptionConflation())) {
        if (generateDefaults() || attrs.getEnableSubscriptionConflation())
@@ -1981,7 +1981,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         atts.addAttribute("", "", PERSIST_BACKUP, "",
                           String.valueOf(attrs.getDataPolicy() == DataPolicy.PERSISTENT_REPLICATE));
       }
-    } // VERSION_5_0 < 0
+    } // GEMFIRE_5_0 < 0
 
     if ((!(attrs instanceof RegionAttributesCreation) ||
          ((RegionAttributesCreation) attrs).hasInitialCapacity())) {
@@ -2004,7 +2004,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
                         String.valueOf(attrs.getConcurrencyLevel()));
     }
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_7_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_7_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
           ((RegionAttributesCreation) attrs).hasConcurrencyChecksEnabled())) {
        if (generateDefaults() || attrs.getConcurrencyChecksEnabled() != true/*fixes bug 46654*/)
@@ -2029,7 +2029,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
                         String.valueOf(attrs.getIgnoreJTA()));
     }
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_4_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
            ((RegionAttributesCreation) attrs).hasIsLockGrantor())) {
         if (generateDefaults() || attrs.isLockGrantor())
@@ -2037,7 +2037,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
                           String.valueOf(attrs.isLockGrantor()));
       }
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_7) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
            ((RegionAttributesCreation) attrs).hasPoolName())) {
         String cpVal = attrs.getPoolName();
@@ -2048,7 +2048,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         atts.addAttribute("", "", POOL_NAME, "", cpVal);
       }
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_6_5) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
           ((RegionAttributesCreation) attrs).hasDiskStoreName())) {
         String dsVal = attrs.getDiskStoreName();
@@ -2062,7 +2062,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
         atts.addAttribute("", "", DISK_SYNCHRONOUS, "", String.valueOf(attrs.isDiskSynchronous()));
       }
     }
-    if(this.version.compareTo(CacheXmlVersion.VERSION_6_1) >= 0)
+    if(this.version.compareTo(CacheXmlVersion.GEMFIRE_6_1) >= 0)
       if ((!(attrs instanceof RegionAttributesCreation)||
           ((RegionAttributesCreation) attrs).hasCloningEnabled())) {
         if (generateDefaults() || attrs.getCloningEnabled())
@@ -2070,7 +2070,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
             String.valueOf(attrs.getCloningEnabled()));
      }
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_7_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_7_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) || ((RegionAttributesCreation)attrs)
           .hasGatewaySenderId())) {
         Set<String> senderIds = new HashSet<String>(attrs
@@ -2089,7 +2089,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
     }
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_7_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_7_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) || ((RegionAttributesCreation)attrs)
           .hasAsyncEventListeners())) {
         Set<String> asyncEventQueueIds = new HashSet<String>(attrs
@@ -2108,7 +2108,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
     }
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_9_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEODE_1_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
           ((RegionAttributesCreation) attrs).hasOffHeap())) {
         if (generateDefaults() || attrs.getOffHeap()) {
@@ -2157,7 +2157,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
           attrs.getCustomEntryIdleTimeout());
     }
 
-    if (attrs.getDiskStoreName() == null && (generateDefaults() || this.version.compareTo(CacheXmlVersion.VERSION_6_5) < 0)) {
+    if (attrs.getDiskStoreName() == null && (generateDefaults() || this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) < 0)) {
     if ((!(attrs instanceof RegionAttributesCreation) ||
          ((RegionAttributesCreation) attrs).hasDiskWriteAttributes())) {
       generate(attrs.getDiskWriteAttributes());
@@ -2186,7 +2186,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     }
     } // pre 6.5
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
           ((RegionAttributesCreation) attrs).hasPartitionAttributes())) {
         PartitionAttributes p = attrs.getPartitionAttributes();
@@ -2196,14 +2196,14 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
     }
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_0) >= 0) {
       MembershipAttributes p = attrs.getMembershipAttributes();
       if (p != null && p.hasRequiredRoles()) {
         generate(p);
       }
     }
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
           ((RegionAttributesCreation) attrs).hasSubscriptionAttributes())) {
        SubscriptionAttributes sa = attrs.getSubscriptionAttributes();
@@ -2230,7 +2230,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
     }
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_8_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_8_0) >= 0) {
       if ((!(attrs instanceof RegionAttributesCreation) ||
           ((RegionAttributesCreation) attrs).hasCompressor())) {
        generate(COMPRESSOR, attrs.getCompressor());
@@ -2326,7 +2326,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     } else if (ea.getAlgorithm() == EvictionAlgorithm.LRU_HEAP) {
       handler.startElement("", LRU_HEAP_PERCENTAGE,
           LRU_HEAP_PERCENTAGE, atts);
-      if (this.version.compareTo(CacheXmlVersion.VERSION_6_0) >= 0) {
+      if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_0) >= 0) {
         ObjectSizer os = ea.getObjectSizer();
         if (!(os instanceof SizeClassOnceObjectSizer)) {
           if (os != null) {
@@ -2432,7 +2432,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     atts.addAttribute("", "", PARTITION_REDUNDANT_COPIES, "",
         String.valueOf(pa.getRedundantCopies()));
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_1) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_1) >= 0) {
       if (generateDefaults() || pa.getLocalMaxMemory() != ((PartitionAttributesImpl) pa).getLocalMaxMemoryDefault())
       atts.addAttribute("", "", LOCAL_MAX_MEMORY, "",
           String.valueOf(pa.getLocalMaxMemory()));
@@ -2442,15 +2442,15 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       if (generateDefaults() || pa.getTotalNumBuckets() != PartitionAttributesFactory.GLOBAL_MAX_BUCKETS_DEFAULT)
       atts.addAttribute("", "", TOTAL_NUM_BUCKETS, "",
           String.valueOf(pa.getTotalNumBuckets()));
-    } // VERSION_5_1
+    } // GEMFIRE_5_1
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_8) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_8) >= 0) {
       if(pa.getColocatedWith() != null)
         atts.addAttribute("", "", PARTITION_COLOCATED_WITH, "",
             pa.getColocatedWith());
       
     }
-    if (this.version.compareTo(CacheXmlVersion.VERSION_6_0) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_0) >= 0) {
       if (generateDefaults() || pa.getRecoveryDelay() != PartitionAttributesFactory.RECOVERY_DELAY_DEFAULT)
         atts.addAttribute("", "", RECOVERY_DELAY, "",
             String.valueOf(pa.getRecoveryDelay()));
@@ -2469,14 +2469,14 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     handler.startElement("", PARTITION_ATTRIBUTES,
                            PARTITION_ATTRIBUTES, atts);
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_8) >= 0) {      
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_8) >= 0) {
       PartitionResolver rr = pa.getPartitionResolver();
       if (rr != null) {
         generate(PARTITION_RESOLVER, rr);        
       }
     }
     
-    if (this.version.compareTo(CacheXmlVersion.VERSION_6_1) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_1) >= 0) {
       PartitionListener[] listeners = pa.getPartitionListeners();
       for (int i = 0; i < listeners.length; i++) {
         PartitionListener listener = listeners[i];
@@ -2486,7 +2486,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
     }   
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_6_6) >= 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_6) >= 0) {
       List<FixedPartitionAttributes> staticAttrs = pa
           .getFixedPartitionAttributes();
       if (staticAttrs != null) {
@@ -2494,7 +2494,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
       }
     }
 
-    if (this.version.compareTo(CacheXmlVersion.VERSION_5_1) < 0) {
+    if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_1) < 0) {
       Properties p = pa.getLocalProperties();
       generate(p, LOCAL_PROPERTIES);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
index 69899fd..e6c0b60 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
@@ -1663,7 +1663,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
     RegionAttributesCreation rattrs = peekRegionAttributesContext(PARTITION_ATTRIBUTES);
     // change the 5.0 default data policy (EMPTY) to the current default
     if (rattrs.hasDataPolicy() && rattrs.getDataPolicy().isEmpty()
-        && (this.version.compareTo(CacheXmlVersion.VERSION_5_0) == 0)) {
+        && (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_0) == 0)) {
       rattrs.setDataPolicy(PartitionedRegionHelper.DEFAULT_DATA_POLICY);
     }
     rattrs.setPartitionAttributes(paf);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
index 51e840a..716b983 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
@@ -28,22 +28,25 @@ import java.util.HashMap;
  */
 // TODO future - replace constants in CacheXml with this Enum completely
 public enum CacheXmlVersion {
-  VERSION_3_0(CacheXml.VERSION_3_0, null, CacheXml.PUBLIC_ID_3_0, CacheXml.SYSTEM_ID_3_0),
-  VERSION_4_0(CacheXml.VERSION_4_0, null, CacheXml.PUBLIC_ID_4_0, CacheXml.SYSTEM_ID_4_0),
-  VERSION_4_1(CacheXml.VERSION_4_1, null, CacheXml.PUBLIC_ID_4_1, CacheXml.SYSTEM_ID_4_1),
-  VERSION_5_0(CacheXml.VERSION_5_0, null, CacheXml.PUBLIC_ID_5_0, CacheXml.SYSTEM_ID_5_0),
-  VERSION_5_1(CacheXml.VERSION_5_1, null, CacheXml.PUBLIC_ID_5_1, CacheXml.SYSTEM_ID_5_1),
-  VERSION_5_5(CacheXml.VERSION_5_5, null, CacheXml.PUBLIC_ID_5_5, CacheXml.SYSTEM_ID_5_5),
-  VERSION_5_7(CacheXml.VERSION_5_7, null, CacheXml.PUBLIC_ID_5_7, CacheXml.SYSTEM_ID_5_7),
-  VERSION_5_8(CacheXml.VERSION_5_8, null, CacheXml.PUBLIC_ID_5_8, CacheXml.SYSTEM_ID_5_8),
-  VERSION_6_0(CacheXml.VERSION_6_0, null, CacheXml.PUBLIC_ID_6_0, CacheXml.SYSTEM_ID_6_0),
-  VERSION_6_1(CacheXml.VERSION_6_1, null, CacheXml.PUBLIC_ID_6_1, CacheXml.SYSTEM_ID_6_1),
-  VERSION_6_5(CacheXml.VERSION_6_5, null, CacheXml.PUBLIC_ID_6_5, CacheXml.SYSTEM_ID_6_5),
-  VERSION_6_6(CacheXml.VERSION_6_6, null, CacheXml.PUBLIC_ID_6_6, CacheXml.SYSTEM_ID_6_6),
-  VERSION_7_0(CacheXml.VERSION_7_0, null, CacheXml.PUBLIC_ID_7_0, CacheXml.SYSTEM_ID_7_0),
-  VERSION_8_0(CacheXml.VERSION_8_0, null, CacheXml.PUBLIC_ID_8_0, CacheXml.SYSTEM_ID_8_0),
-  VERSION_8_1(CacheXml.VERSION_8_1, CacheXml.SCHEMA_8_1_LOCATION, null, null),
-  VERSION_9_0(CacheXml.VERSION_9_0, CacheXml.SCHEMA_9_0_LOCATION, null, null);
+  GEMFIRE_3_0(CacheXml.VERSION_3_0, CacheXml.PUBLIC_ID_3_0, CacheXml.SYSTEM_ID_3_0, null, null),
+  GEMFIRE_4_0(CacheXml.VERSION_4_0, CacheXml.PUBLIC_ID_4_0, CacheXml.SYSTEM_ID_4_0, null, null),
+  GEMFIRE_4_1(CacheXml.VERSION_4_1, CacheXml.PUBLIC_ID_4_1, CacheXml.SYSTEM_ID_4_1, null, null),
+  GEMFIRE_5_0(CacheXml.VERSION_5_0, CacheXml.PUBLIC_ID_5_0, CacheXml.SYSTEM_ID_5_0, null, null),
+  GEMFIRE_5_1(CacheXml.VERSION_5_1, CacheXml.PUBLIC_ID_5_1, CacheXml.SYSTEM_ID_5_1, null, null),
+  GEMFIRE_5_5(CacheXml.VERSION_5_5, CacheXml.PUBLIC_ID_5_5, CacheXml.SYSTEM_ID_5_5, null, null),
+  GEMFIRE_5_7(CacheXml.VERSION_5_7, CacheXml.PUBLIC_ID_5_7, CacheXml.SYSTEM_ID_5_7, null, null),
+  GEMFIRE_5_8(CacheXml.VERSION_5_8, CacheXml.PUBLIC_ID_5_8, CacheXml.SYSTEM_ID_5_8, null, null),
+  GEMFIRE_6_0(CacheXml.VERSION_6_0, CacheXml.PUBLIC_ID_6_0, CacheXml.SYSTEM_ID_6_0, null, null),
+  GEMFIRE_6_1(CacheXml.VERSION_6_1, CacheXml.PUBLIC_ID_6_1, CacheXml.SYSTEM_ID_6_1, null, null),
+  GEMFIRE_6_5(CacheXml.VERSION_6_5, CacheXml.PUBLIC_ID_6_5, CacheXml.SYSTEM_ID_6_5, null, null),
+  GEMFIRE_6_6(CacheXml.VERSION_6_6, CacheXml.PUBLIC_ID_6_6, CacheXml.SYSTEM_ID_6_6, null, null),
+  GEMFIRE_7_0(CacheXml.VERSION_7_0, CacheXml.PUBLIC_ID_7_0, CacheXml.SYSTEM_ID_7_0, null, null),
+  GEMFIRE_8_0(CacheXml.VERSION_8_0, CacheXml.PUBLIC_ID_8_0, CacheXml.SYSTEM_ID_8_0, null, null),
+  GEMFIRE_8_1(CacheXml.VERSION_8_1, null, null, CacheXml.SCHEMA_8_1_LOCATION, CacheXml.GEMFIRE_NAMESPACE),
+
+  // Ordinality matters here, so keep the 1.0 version after the 8.x versions
+  // Version 1.0 is the start of Geode versions. In terms of releases, Geode 1.0 > GemFire 8.x.
+  GEODE_1_0(CacheXml.VERSION_1_0, null, null, CacheXml.SCHEMA_1_0_LOCATION, CacheXml.GEODE_NAMESPACE);
 
   private static final HashMap<String, CacheXmlVersion> valuesForVersion = new HashMap<>();
   static {
@@ -54,14 +57,16 @@ public enum CacheXmlVersion {
 
   private final String version;
   private final String schemaLocation;
+  private final String namespace;
   private final String publicId;
   private final String systemId;
 
-  private CacheXmlVersion(String version, String schemaLocation, String publicId, String systemId) {
+  private CacheXmlVersion(String version, String publicId, String systemId, String schemaLocation, String namespace) {
     this.version = version;
-    this.schemaLocation = schemaLocation;
     this.publicId = publicId;
     this.systemId = systemId;
+    this.schemaLocation = schemaLocation;
+    this.namespace = namespace;
   }
 
   /**
@@ -79,9 +84,9 @@ public enum CacheXmlVersion {
 
   /**
    * The schema file location.
-   * 
+   *
    * @return the schemaLocation if schema exists, otherwise null.
-   * 
+   *
    * @since 8.1
    */
   public String getSchemaLocation() {
@@ -89,6 +94,15 @@ public enum CacheXmlVersion {
   }
 
   /**
+   * The namespace.
+   * 
+   * @return the namespace if schema exists, otherwise null.
+   */
+  public String getNamespace() {
+    return namespace;
+  }
+
+  /**
    * The DTD public id.
    * 
    * @return the publicId if DTD exists, otherwise null.
@@ -111,7 +125,7 @@ public enum CacheXmlVersion {
   /**
    * Get {@link CacheXmlVersion} for given <code>version</code> string. Use
    * constants from {@link CacheXml} for example:
-   * <code>CacheXmlVersion.valueForVersion(CacheXml.VERSION_8_1);</code>
+   * <code>CacheXmlVersion.valueForVersion(CacheXml.GEMFIRE_8_1);</code>
    * 
    * @param version
    *          string to lookup.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
index 59d5860..d7c2a72 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
@@ -37,7 +37,7 @@ import org.xml.sax.ext.EntityResolver2;
  */
 public final class GeodeEntityResolver extends DefaultEntityResolver2 {
 
-  private static final String SYSTEM_ID_ROOT = "http://geode.apache.org/schema";
+  private static final String SYSTEM_ID_ROOT = "http://geode.apache.org/";
 
   private static final String CLASSPATH_ROOT = "/META-INF/schemas/geode.apache.org/";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
index 2da5796..a674d56 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
@@ -94,7 +94,7 @@ public class CacheElement {
 
   /**
    * Build <code>cache</code> element map for given <cod>doc</code>'s
-   * schemaLocation for {@link CacheXml#NAMESPACE}.
+   * schemaLocation for {@link CacheXml#GEODE_NAMESPACE}.
    * 
    * @param doc
    *          {@link Document} to parse schema for.
@@ -111,7 +111,7 @@ public class CacheElement {
 
     final LinkedHashMap<String, CacheElement> elementMap = new LinkedHashMap<String, CacheElement>();
 
-    buildElementMapCacheType(elementMap, resolveSchema(schemaLocationMap, CacheXml.NAMESPACE));
+    buildElementMapCacheType(elementMap, resolveSchema(schemaLocationMap, CacheXml.GEODE_NAMESPACE));
 
     // if we are ever concerned with the order of extensions or children process them here.
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
index 8517fc6..f8da915 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
@@ -35,7 +35,6 @@ import javax.xml.xpath.XPathExpressionException;
 import org.apache.logging.log4j.Logger;
 import org.springframework.util.Assert;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -70,7 +69,7 @@ public class XmlEntity implements DataSerializable {
 
   private String prefix = CacheXml.PREFIX;
 
-  private String namespace = CacheXml.NAMESPACE;
+  private String namespace = CacheXml.GEODE_NAMESPACE;
 
   /**
    * Default constructor for serialization only.
@@ -308,7 +307,7 @@ public class XmlEntity implements DataSerializable {
   }
 
   /**
-   * Gets the namespace for the element. Defaults to {@link CacheXml#NAMESPACE}
+   * Gets the namespace for the element. Defaults to {@link CacheXml#GEODE_NAMESPACE}
    * if not set.
    * 
    * @return XML element namespace
@@ -457,7 +456,7 @@ public class XmlEntity implements DataSerializable {
      * Sets the element prefix and namespace as returned by
      * {@link XmlEntity#getPrefix()} and {@link XmlEntity#getNamespace()}
      * respectively. Defaults are {@link CacheXml#PREFIX} and
-     * {@link CacheXml#NAMESPACE} respectively.
+     * {@link CacheXml#GEODE_NAMESPACE} respectively.
      * 
      * @param prefix
      *          Prefix of element

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
index 37b7321..7860eab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
@@ -21,9 +21,7 @@ import static com.gemstone.gemfire.management.internal.configuration.utils.XmlCo
 import static javax.xml.XMLConstants.NULL_NS_URI;
 import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
@@ -198,7 +196,7 @@ public class XmlUtils {
    * @since 8.1
    */
   private static boolean isMultiple(final LinkedHashMap<String, CacheElement> elementOrderMap, final String namespace, final String type) {
-    if (CacheXml.NAMESPACE.equals(namespace)) {
+    if (CacheXml.GEODE_NAMESPACE.equals(namespace)) {
       // We only keep the cache elements in elementOrderMap
       final CacheElement cacheElement = elementOrderMap.get(type);
       if (null != cacheElement) {
@@ -220,7 +218,7 @@ public class XmlUtils {
    * @since 8.1
    */
   private static int getElementOrder(final LinkedHashMap<String, CacheElement> elementOrderMap, final String namespace, final String type) {
-    if (CacheXml.NAMESPACE.equals(namespace)) {
+    if (CacheXml.GEODE_NAMESPACE.equals(namespace)) {
       // We only keep the cache elements in elementOrderMap
       final CacheElement cacheElement = elementOrderMap.get(type);
       if (null != cacheElement) {


[05/24] incubator-geode git commit: GEODE-914: Removed unnecessary declarations from NOTICE

Posted by ji...@apache.org.
GEODE-914: Removed unnecessary declarations from NOTICE

Removed spring-petclinic, Apache MyFaces, and fastutil from
NOTICE.  None of these project contain a NOTICE with content
that needs to be propagated.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/178e9f58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/178e9f58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/178e9f58

Branch: refs/heads/feature/GEODE-17-2
Commit: 178e9f5803b97e06fdb63920b4c09efabeb82d46
Parents: 5a291b6
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Apr 7 11:47:43 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:27:29 2016 -0700

----------------------------------------------------------------------
 NOTICE | 9 ---------
 1 file changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/178e9f58/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 4f7b479..4e0e8ad 100644
--- a/NOTICE
+++ b/NOTICE
@@ -17,14 +17,5 @@ This product also includes code adapted from:
 Apache Solr (http://lucene.apache.org/solr/)
 Copyright 2014 The Apache Software Foundation
 
-fastutil
-Copyright (C) 2002-2014 Sebastiano Vigna
-
-Apache Myfaces (https://myfaces.apache.org/)
-Copyright 2015 Apache Software Foundation
-
-spring-petclinic (https://github.com/spring-projects/spring-petclinic)
-Copyright 2002-2013
-
 This product includes software developed by the MX4J
 project (http://mx4j.sourceforge.net).


[11/24] incubator-geode git commit: GEODE-904 Reformatted LICENSE around Licenses

Posted by ji...@apache.org.
GEODE-904 Reformatted LICENSE around Licenses

Using Apache Samza LICENSE as a guide, separated components by license
and added versions (where available), copyright dates (where
applicable), copyright owners, and texts of component licenses.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a18ed412
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a18ed412
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a18ed412

Branch: refs/heads/feature/GEODE-17-2
Commit: a18ed4120ae760f5cdf6da5ae80581a924a92d2d
Parents: 83fd4bf
Author: Joey McAllister <jm...@pivotal.io>
Authored: Wed Apr 6 19:28:52 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:54:26 2016 -0700

----------------------------------------------------------------------
 LICENSE | 464 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 266 insertions(+), 198 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a18ed412/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index f719a08..998bbcb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,222 +201,290 @@
    limitations under the License.
 
 ===========================================================================
+Apache Geode Subcomponents
+===========================================================================
 
 Apache Geode includes a number of components and libraries with separate
 copyright notices and license terms. Your use of those components are
 subject to the terms and conditions of the following licenses.
 
 ---------------------------------------------------------------------------
-ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html)
----------------------------------------------------------------------------
-This product bundles ANSIBuffer, which is available under a BSD license.
-For details, see http://opensource.org/licenses/BSD-3-Clause.
-
----------------------------------------------------------------------------
-Backbone.js (http://backbonejs.org)
----------------------------------------------------------------------------
-This product bundles Backbone.js, which is available under an MIT license.
-For details see http://opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-Bootflat (http://bootflat.github.io/)
----------------------------------------------------------------------------
-This product bundles Bootflat, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.html.
-
----------------------------------------------------------------------------
-Bootstrap (http://getbootstrap.com/)
----------------------------------------------------------------------------
-This product bundles Bootstrap, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.html.
-
----------------------------------------------------------------------------
-CompactConcurrentHashSet2 (http://gee.cs.oswego.edu/dl/concurrency-interest)
----------------------------------------------------------------------------
-This product bundles CompactConcurrentHashSet2, derived from JSR-166
-ConcurrentHashMap v1.43, which is available in the public domain.
-
----------------------------------------------------------------------------
-Font Awesome (https://fortawesome.github.io/Font-Awesome/)
----------------------------------------------------------------------------
-This product bundles Font Awesome, which is available under the SIL OFL 1.1
-license (font) and the MIT license (code). For details, see
-http://scripts.sil.org/OFL and http://opensource.org/licenses/mit-license.html.
-
----------------------------------------------------------------------------
-Handlebars (http://handlebarsjs.com)
----------------------------------------------------------------------------
-This product bundles Handlebars, which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-HeadJS (http://headjs.com/)
----------------------------------------------------------------------------
-This product bundles HeadJS, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.html.
-
----------------------------------------------------------------------------
-highlight.js (https://highlightjs.org)
----------------------------------------------------------------------------
-This product bundles highlight.js, which is available under a BSD 3-clause
-license. For details see http://opensource.org/licenses/BSD-3-Clause.
-
----------------------------------------------------------------------------
-HTML5 Shiv (https://github.com/aFarkas/html5shiv)
----------------------------------------------------------------------------
-This product bundles HTML5 Shiv, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.html.
-
----------------------------------------------------------------------------
-iCheck (http://icheck.fronteed.com/)
----------------------------------------------------------------------------
-This product bundles iCheck, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.html.
-
----------------------------------------------------------------------------
-JOpt Simple (http://pholser.github.io/jopt-simple/)
----------------------------------------------------------------------------
-This product bundles JOpt Simple, which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery (https://jquery.com)
----------------------------------------------------------------------------
-This product bundles jQuery, which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery BBQ (http://benalman.com/projects/jquery-bbq-plugin/)
----------------------------------------------------------------------------
-This product bundles jQuery BBQ, which is available under an MIT and GPL
-dual license. For details see http://benalman.com/about/license.
-
----------------------------------------------------------------------------
-jQuery.i18n.properties (https://github.com/jquery-i18n-properties/jquery-i18n-properties)
----------------------------------------------------------------------------
-This product bundles jQuery.i18n.properties, which is available under an
-MIT license. For details, see http://opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery jqGrid (https://plugins.jquery.com/jqGrid/)
+The BSD 3-Clause License (http://opensource.org/licenses/BSD-3-Clause)
 ---------------------------------------------------------------------------
-This product bundles jQuery jqGrid, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.php.
 
----------------------------------------------------------------------------
-jScrollPane (http://jscrollpane.kelvinluck.com/)
----------------------------------------------------------------------------
-This product bundles jScrollPane, which is available under an MIT
-license. For details, see http://opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery Mouse Wheel (http://brandonaaron.net)
----------------------------------------------------------------------------
-This product bundles jQuery Mouse Wheel, which is available under an MIT
-license. For details, see http://opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery UI MultiSelect Widget (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/)
----------------------------------------------------------------------------
-This product bundles jQuery Multiselect Widget, which is available under an
-MIT license. For details, see http://opensource.org/licenses/mit-license.php.
+Apache Geode bundles the following files under the BSD 3-Clause License:
 
----------------------------------------------------------------------------
-jQuery Placeholder (http://webcloud.se)
----------------------------------------------------------------------------
-This product bundles jQuery Placeholder, which is available under an MIT
-license. For details, see http://opensource.org/licenses/mit-license.php.
+  - ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html),
+    Copyright (c) 2002-2007 Marc Prud'hommeaux.
+  - highlight.js v7.3 (https://highlightjs.org), Copyright (c) 2006, Ivan
+    Sagalaev
+  - jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/), Copyright
+    (c) 2012 Splunk Inc.
+  - Protocol Buffers (https://github.com/google/protobuf), Copyright (c) 2014
+    Google Inc.
 
----------------------------------------------------------------------------
-jQuery-slideto (https://github.com/Sleavely/jQuery-slideto)
----------------------------------------------------------------------------
-This product bundles jQuery-slideto, which is available under an MIT
-license. For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery Sparklines (http://omnipotent.net/jquery.sparkline/)
----------------------------------------------------------------------------
-This product bundles jQuery Sparklines, which is available under a BSD-like
-license. For details, see http://opensource.org/licenses/BSD-3-Clause.
-
----------------------------------------------------------------------------
-TableDnD (https://github.com/isocra/TableDnD)
----------------------------------------------------------------------------
-This product bundles TableDND, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-Timeago (http://timeago.yarp.com/)
----------------------------------------------------------------------------
-This product bundles jQuery Timeago, which is available under an MIT
-license. For details, see http://opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery UI (http://jqueryui.com/about)
----------------------------------------------------------------------------
-This product bundles jquery UI, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.php.
+All rights reserved.
 
----------------------------------------------------------------------------
-jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle)
----------------------------------------------------------------------------
-This product bundles jQuery Wiggle, which is available under an MIT
-license. For details see http://www.opensource.org/licenses/mit-license.php.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
----------------------------------------------------------------------------
-zTree (http://zTree.me/)
----------------------------------------------------------------------------
-This product bundles zTree, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.php.
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
 
----------------------------------------------------------------------------
-JSON (http://json.org)
----------------------------------------------------------------------------
-This product bundles JSON, which is available under a BSD-like license.
-For details, see http://json.org/license.html.
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
 
----------------------------------------------------------------------------
-Normalise.css (https://necolas.github.io/normalize.css/)
----------------------------------------------------------------------------
-This product bundles Normalise.css, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.html.
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
 
----------------------------------------------------------------------------
-Protocol Buffers (https://github.com/google/protobuf)
----------------------------------------------------------------------------
-This product bundles Protocol Buffers, which is available under a BSD
-license. For details, see http://opensource.org/licenses/BSD-3-Clause.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---------------------------------------------------------------------------
+The ISC License (http://opensource.org/licenses/ISC)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following file under the ISC license:
+
+  - Shred (https://github.com/pandastrike/shred), Copyright (c) 2012-2015
+    Panda Strike, LLC and Dan Yoder <da...@pandastrike.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+---------------------------------------------------------------------------
+The JSON License (http://www.json.org/license.html)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following file under the JSON license:
+
+  - JSON (http://www.json.org), Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
+---------------------------------------------------------------------------
+The MIT License (http://opensource.org/licenses/mit-license.html)
+---------------------------------------------------------------------------
 
----------------------------------------------------------------------------
-Reset CSS (http://meyerweb.com/eric/tools/css/reset/)
----------------------------------------------------------------------------
-This product bundles Reset CSS, which is available in the public domain.
+Apache Geode bundles the following files under the MIT license:
 
----------------------------------------------------------------------------
-Respond (https://github.com/scottjehl/Respond)
----------------------------------------------------------------------------
-This product bundles Respond, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.html.
+  - Backbone.js v0.9.2 (http://backbonejs.org), Copyright (c) 2010-2012
+    Jeremy Ashkenas, DocumentCloud Inc.
+  - Bootflat v1.0.1 (http://bootflat.github.io/), Copyright (c) 2014
+    bootflat
+  - Bootstrap v3.0.0 (http://getbootstrap.com/), Copyright (c) 2011-2016
+    Twitter, Inc.
+  - Font Awesome v4.0.3 (code files) (http://fontawesome.io), Copyright (c)
+    Dave Gandy
+  - Handlebars v1.0.0 (http://handlebarsjs.com), Copyright (c) 2011, Yehuda
+    Katz
+  - HeadJS v0.96 (http://headjs.com/), Copyright (c) 2013 Tero Piirainen
+    (tipiirai)
+  - HTML5 Shiv v3.6.2pre (https://github.com/aFarkas/html5shiv), Copyright
+    (c) 2014 Alexander Farkas (aFarkas)
+  - iCheck v0.8 (http://icheck.fronteed.com/), Copyright (c) 2013 Damir
+    Foy, http://damirfoy.com
+  - JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c)
+    2004-2015 Paul R. Holser, Jr.
+  - jQuery JavaScript Library v.1.7.2 (https://jquery.com), Copyright (c)
+    jQuery Foundation and other contributors, http://jquery.org
+  - jQuery BBQ v1.2.1 (http://benalman.com/projects/jquery-bbq-plugin/),
+    Copyright (c) 2010, "Cowboy" Ben Alman
+  - jQuery.i18n.properties v1.0.x
+    (https://github.com/jquery-i18n-properties/jquery-i18n-properties),
+    Copyright (c) 2011 Nuno Miguel Correia Serra Fernandes
+    <nf...@gmail.com>
+  - jQuery jqGrid v4.4.0 (https://plugins.jquery.com/jqGrid/), Copyright
+    (c) 2008 Tony Tomov, tony@trirand.com
+  - jQuery Mouse Wheel v3.0.6 (http://brandonaaron.net), Copyright (c) 2011
+    Brandon Aaron
+  - jQuery Placeholder (http://webcloud.se), Copyright (c) 2010 Daniel
+    Stocks
+  - jQuery-slideto (https://github.com/Sleavely/jQuery-slideto), Copyright
+    (c) 2015 Joakim Hedlund
+  - jQuery UI MultiSelect Widget v1.14pre
+    (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/),
+    Copyright (c) 2011 Eric Hynds
+  - jQuery UI v1.8.18 (http://jqueryui.com/about), Copyright (c) jQuery
+    Foundation and other contributors, http://jquery.org
+  - jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle),
+    Copyright (c) 2011 Wilhelm Murdoch <wi...@gmail.com>,
+     TheDrunkenEpic <http://www.thedrunkenepic.com>
+  - jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010
+    Kelvin Luck
+  - Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/),
+    Copyright (c) Nicolas Gallagher and Jonathan Neal
+  - Respond v1.1.0 (https://github.com/scottjehl/Respond), Copyright (c) 2012
+    Scott Jehl
+  - Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
+    2015 Nathan Cahill
+  - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012 Denis
+    Howlett <de...@isocra.com>, Nick Lombard <nickl>, and other
+    contributors
+  - Timeago v1.3.0 (http://timeago.yarp.com), Copyright (c) 2008-2015 Ryan McGeary
+  - Underscore (http://underscorejs.org), Copyright (c) 2009-2016 Jeremy
+    Ashkenas, DocumentCloud, and Investigative Reporters & Editors
+  - zTree v3.5.02 (http://zTree.me/), Copyright (c) 2010 Hunter.z
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
+---------------------------------------------------------------------------
+Public Domain
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files, which are available in the public
+domain:
+
+  - CompactConcurrentHashSet2, derived from JSR-166 ConcurrentHashMap v1.43
+    (http://gee.cs.oswego.edu/dl/concurrency-interest).
+  - Reset CSS (http://meyerweb.com/eric/tools/css/reset/)
+  - tooltip.js v1.2.6 (https://github.com/jquerytools/jquerytools)
+
+
+---------------------------------------------------------------------------
+SIL Open Font License (https://opensource.org/licenses/OFL-1.1)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the SIL OFL 1.1 license:
+
+  - Font Awesome (font files) (http://fontawesome.io) Copyright (c) Dave Gandy
+
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
 
----------------------------------------------------------------------------
-tooltip.js (https://github.com/jquerytools/jquerytools)
----------------------------------------------------------------------------
-This product bundles tooltip.css, which is available in the public domain.
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
 
----------------------------------------------------------------------------
-Shred (https://github.com/pandastrike/shred)
----------------------------------------------------------------------------
-This product bundles shred, which is available under an MIT or ISC license.
-For details see https://github.com/pandastrike/shred/blob/master/LICENSE.
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
 
----------------------------------------------------------------------------
-Split.js (https://github.com/nathancahill/Split.js)
----------------------------------------------------------------------------
-This product bundles Split.js, which is available under an MIT license.
-For details, see http://opensource.org/licenses/mit-license.php.
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
 
----------------------------------------------------------------------------
-Underscore (http://underscorejs.org)
----------------------------------------------------------------------------
-This product bundles Underscore, which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.


[24/24] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-17-2

Posted by ji...@apache.org.
Merge branch 'develop' into feature/GEODE-17-2


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7ec4bad4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7ec4bad4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7ec4bad4

Branch: refs/heads/feature/GEODE-17-2
Commit: 7ec4bad471c942c95cdf3b9e1e462347e20e2791
Parents: a0f6f22 616bc27
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Apr 11 08:12:46 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Apr 11 08:12:46 2016 -0700

----------------------------------------------------------------------
 LICENSE                                         |  429 +++--
 NOTICE                                          |   20 +-
 .../release/conf/cache-client.xml               |    6 +-
 .../release/conf/cache-peer.xml                 |    6 +-
 .../release/conf/cache-server.xml               |    6 +-
 geode-assembly/src/main/dist/LICENSE            |  894 ++++++++---
 geode-assembly/src/main/dist/NOTICE             |  658 +++-----
 .../internal/SharedConfiguration.java           |    4 +-
 .../internal/cache/xmlcache/CacheXml.java       |   63 +-
 .../cache/xmlcache/CacheXmlGenerator.java       |  148 +-
 .../internal/cache/xmlcache/CacheXmlParser.java |    2 +-
 .../cache/xmlcache/CacheXmlVersion.java         |   56 +-
 .../cache/xmlcache/GeodeEntityResolver.java     |    2 +-
 .../gemfire/internal/i18n/LocalizedStrings.java |    8 +
 .../configuration/domain/CacheElement.java      |    4 +-
 .../configuration/domain/XmlEntity.java         |    7 +-
 .../internal/configuration/utils/XmlUtils.java  |    6 +-
 .../geode.apache.org/schema/cache/cache-1.0.xsd | 1469 +++++++++++++++++
 .../gemfire/cache/cache-9.0.xsd                 | 1519 ------------------
 .../gemfire/cache30/CacheXml58DUnitTest.java    |    4 +-
 .../gemfire/cache30/CacheXml90DUnitTest.java    |  234 ---
 .../cache30/CacheXmlGeode10DUnitTest.java       |  234 +++
 .../internal/SharedConfigurationJUnitTest.java  |    2 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |    2 +
 .../xmlcache/AbstractEntityResolverTest.java    |  140 ++
 .../xmlcache/CacheXmlVersionJUnitTest.java      |   30 +-
 .../xmlcache/GeodeEntityResolverJUnitTest.java  |   49 +
 .../PivotalEntityResolverJUnitTest.java         |  118 +-
 .../domain/CacheElementJUnitTest.java           |    4 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java      |   26 +-
 .../configuration/utils/XmlUtilsJUnitTest.java  |   12 +-
 .../codeAnalysis/sanctionedSerializables.txt    |    2 +-
 .../domain/CacheElementJUnitTest.xml            |    6 +-
 ...dNewNodeJUnitTest.testAddNewNodeNewNamed.xml |    6 +-
 ...ewNodeJUnitTest.testAddNewNodeNewUnnamed.xml |    6 +-
 ...itTest.testAddNewNodeNewUnnamedExtension.xml |    6 +-
 ...NodeJUnitTest.testAddNewNodeReplaceNamed.xml |    6 +-
 ...deJUnitTest.testAddNewNodeReplaceUnnamed.xml |    6 +-
 ...st.testAddNewNodeReplaceUnnamedExtension.xml |    6 +-
 ...ddNewNodeJUnitTest.testDeleteNodeUnnamed.xml |    6 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.xml       |    6 +-
 ...Test.testBuildSchemaLocationMapAttribute.xml |    6 +-
 ...testBuildSchemaLocationMapEmptyAttribute.xml |    4 +-
 ...ationMapMapOfStringListOfStringAttribute.xml |    6 +-
 ....testBuildSchemaLocationMapNullAttribute.xml |    4 +-
 ...XmlUtilsJUnitTest.testQuerySingleElement.xml |    6 +-
 .../internal/cache/PutAllCSDUnitTest.java       |  325 ++--
 .../geode.apache.org/lucene/lucene-1.0.xsd      |   12 +-
 ...erIntegrationJUnitTest.createIndex.cache.xml |    8 +-
 ...serIntegrationJUnitTest.parseIndex.cache.xml |    8 +-
 .../src/main/webapp/META-INF/MANIFEST.MF        |    3 -
 geode-pulse/src/main/webapp/META-INF/NOTICE     |   90 ++
 .../util/AutoBalancerIntegrationJUnitTest.java  |   12 +-
 .../website/content/schema/cache/cache-1.0.xsd  | 1469 +++++++++++++++++
 geode-site/website/layouts/footer.html          |   12 -
 geode-site/website/layouts/header.html          |   12 +
 .../gemfire/internal/cache/wan/WANTestBase.java |    6 +-
 .../web/swagger/config/SwaggerConfig.java       |   13 +-
 geode-web-api/src/main/webapp/META-INF/NOTICE   |   89 +
 geode-web/src/main/webapp/META-INF/NOTICE       |   36 +
 gradle/dependency-resolution.gradle             |    1 +
 gradle/java.gradle                              |    5 +-
 62 files changed, 5253 insertions(+), 3092 deletions(-)
----------------------------------------------------------------------



[17/24] incubator-geode git commit: GEODE-386: Change xsd namespace to apache

Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd b/geode-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd
deleted file mode 100644
index 1cd3567..0000000
--- a/geode-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+++ /dev/null
@@ -1,1519 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<xsd:schema
-    targetNamespace="http://schema.pivotal.io/gemfire/cache"
-    xmlns:gf="http://schema.pivotal.io/gemfire/cache"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="9.0">
-  <xsd:annotation>
-    <xsd:documentation><![CDATA[
-This is the XML Schema for the GemFire distributed cache declarative
-caching XML file.  All declarative cache files must include a schema
-of the following form:
-
-  <cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.0">
-
-If you are declaring a client cache then use this schema:
-
-  <client-cache
-    xmlns="http://schema.pivotal.io/gemfire/cache"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"
-    version="9.0">
-
-The contents of a declarative XML file correspond to APIs found in the
-com.gemstone.gemfire.cache and com.gemstone.gemfire.cache.client
-packages.  A declarative caching XML file is used to populate a Cache
-or a ClientCache when it is created.
-
-The top-level element in this syntax is "cache" or "client-cache".
-All elements are listed here in alphabetical order.
-
-The following conventions apply to all GemFire distributed cache
-declarative caching XML file elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace in
-  the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is case
-  sensitive.
-  
-  ]]></xsd:documentation>
-  </xsd:annotation>
-
-    <!--
--->
-  <xsd:element name="cache">
-    <xsd:annotation>
-      <xsd:documentation>
-        The "cache" element is the root element of the declarative cache file on a peer or server. This element configures a GemFire Cache and
-        describes the root regions it contains, if any.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element maxOccurs="1" minOccurs="0" name="cache-transaction-manager" type="gf:cache-transaction-manager-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="dynamic-region-factory" type="gf:dynamic-region-factory-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-hub">
-          <xsd:annotation>
-            <xsd:documentation>
-              The "gateway-hub" element specifies a Gateway Hub that is
-              initialized when the Cache is declaratively initialized.
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway">
-                <xsd:annotation>
-                  <xsd:documentation>
-                    The "gateway" element specifies a Gateway that is
-                    initialized when a GatewayHub is declaratively initialized.
-                  </xsd:documentation>
-                </xsd:annotation>
-                <xsd:complexType>
-                  <xsd:sequence>
-                    <xsd:choice>
-                      <xsd:element maxOccurs="unbounded" minOccurs="1" name="gateway-endpoint">
-                        <xsd:annotation>
-                          <xsd:documentation>
-                            The "gateway-endpoint" element specifies an endpoint that is
-                            initialized when a Gateway is declaratively
-                            initialized.
-                          </xsd:documentation>
-                        </xsd:annotation>
-                        <xsd:complexType>
-                          <xsd:attribute name="host" type="xsd:string" use="required" />
-                          <xsd:attribute name="id" type="xsd:string" use="required" />
-                          <xsd:attribute name="port" type="xsd:string" use="required" />
-                        </xsd:complexType>
-                      </xsd:element>
-                      <xsd:element maxOccurs="unbounded" minOccurs="1" name="gateway-listener">
-                        <xsd:annotation>
-                          <xsd:documentation>
-                            The "gateway-listener" element specifies a listener that is
-                            initialized when a Gateway is declaratively initialized.
-                          </xsd:documentation>
-                        </xsd:annotation>
-                        <xsd:complexType>
-                          <xsd:sequence>
-                            <xsd:element name="class-name" type="gf:class-name-type" />
-                            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-                          </xsd:sequence>
-                        </xsd:complexType>
-                      </xsd:element>
-                    </xsd:choice>
-                    <xsd:element maxOccurs="1" minOccurs="0" name="gateway-queue">
-                      <xsd:annotation>
-                        <xsd:documentation>
-                          The "gateway-queue" element specifies a queue that is
-                          initialized when a Gateway is declaratively initialized.
-                          As of
-                          6.5 overflow-directory is deprecated. Use disk-store-name instead.
-                          As of 6.5 roll-oplogs is deprecated. Use disk-store-name instead.
-                        </xsd:documentation>
-                      </xsd:annotation>
-                      <xsd:complexType>
-                        <xsd:attribute name="alert-threshold" type="xsd:string" use="optional" />
-                        <xsd:attribute name="batch-conflation" type="xsd:boolean" use="optional" />
-                        <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
-                        <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
-                        <xsd:attribute name="enable-persistence" type="xsd:boolean" use="optional" />
-                        <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
-                        <xsd:attribute name="roll-oplogs" type="xsd:boolean" use="optional" />
-                        <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
-                        <xsd:attribute name="overflow-directory" type="xsd:string" use="optional" />
-                      </xsd:complexType>
-                    </xsd:element>
-                  </xsd:sequence>
-                  <xsd:attribute name="early-ack" type="xsd:boolean" use="optional" />
-                  <xsd:attribute name="id" type="xsd:string" use="required" />
-                  <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
-                  <xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional" />
-                  <xsd:attribute name="concurrency-level" type="xsd:string" use="optional" />
-                  <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
-                </xsd:complexType>
-              </xsd:element>
-            </xsd:sequence>
-            <xsd:attribute name="id" type="xsd:string" use="required" />
-            <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
-            <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
-            <xsd:attribute name="port" type="xsd:string" use="optional" />
-            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
-            <xsd:attribute name="startup-policy" use="optional">
-              <xsd:simpleType>
-                <xsd:restriction base="xsd:string">
-                  <xsd:enumeration value="primary" />
-                  <xsd:enumeration value="secondary" />
-                  <xsd:enumeration value="none" />
-                </xsd:restriction>
-              </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="max-connections" type="xsd:integer" use="optional" />
-          </xsd:complexType>
-        </xsd:element>
-
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-sender">
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-event-filter" type="gf:class-with-parameters-type" />
-              <xsd:element maxOccurs="1" minOccurs="0" name="gateway-event-substitution-filter" type="gf:class-with-parameters-type" />
-              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-transport-filter" type="gf:class-with-parameters-type" />
-            </xsd:sequence>
-            <xsd:attribute name="id" type="xsd:string" use="required" />
-            <xsd:attribute name="remote-distributed-system-id" type="xsd:string" use="required" />
-            <xsd:attribute name="parallel" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
-            <xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional" />
-            <xsd:attribute name="enable-batch-conflation" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
-            <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
-            <xsd:attribute name="enable-persistence" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
-            <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
-            <xsd:attribute name="alert-threshold" type="xsd:string" use="optional" />
-            <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
-            <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
-          </xsd:complexType>
-        </xsd:element>
-
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-receiver">
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-transport-filter" type="gf:class-with-parameters-type" />
-            </xsd:sequence>
-            <xsd:attribute name="start-port" type="xsd:string" use="optional" />
-            <xsd:attribute name="end-port" type="xsd:string" use="optional" />
-            <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
-            <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
-            <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
-            <xsd:attribute name="hostname-for-senders" type="xsd:string" use="optional" />
-            <xsd:attribute name="manual-start" type="xsd:boolean" use="optional" />
-          </xsd:complexType>
-        </xsd:element>
-
-        <xsd:element maxOccurs="1" minOccurs="0" name="gateway-conflict-resolver">
-          <xsd:annotation>
-            <xsd:documentation>
-              A "gateway-conflict-resolver" element describes a region's GatewayConflictResolver.
-              It is used to resolve inter-system concurrency
-              conflicts.
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element name="class-name" type="gf:class-name-type" />
-              <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-            </xsd:sequence>
-          </xsd:complexType>
-        </xsd:element>
-
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="async-event-queue">
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element maxOccurs="unbounded" minOccurs="0" name="gateway-event-filter" type="gf:class-with-parameters-type" />
-              <xsd:element maxOccurs="1" minOccurs="0" name="gateway-event-substitution-filter" type="gf:class-with-parameters-type" />
-              <xsd:element name="async-event-listener" type="gf:class-with-parameters-type">
-                <xsd:annotation>
-                  <xsd:documentation>
-                    A "async-event-listener" element describes a region's AsyncEventListener.
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-            </xsd:sequence>
-            <xsd:attribute name="id" type="xsd:string" use="required" />
-            <xsd:attribute name="parallel" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
-            <xsd:attribute name="batch-time-interval" type="xsd:string" use="optional" />
-            <xsd:attribute name="enable-batch-conflation" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional" />
-            <xsd:attribute name="persistent" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
-            <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
-            <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
-            <xsd:attribute name="order-policy" type="xsd:string" use="optional" />
-          </xsd:complexType>
-        </xsd:element>
-
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="cache-server">
-          <xsd:annotation>
-            <xsd:documentation>
-              The "cache-server" element specifies a Cache Server that will accept requests from clients and that is started when the Cache is
-              declaratively initialized.
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:complexType>
-            <xsd:complexContent>
-              <xsd:extension base="gf:server-type">
-                <xsd:attribute name="tcp-no-delay" type="xsd:boolean" use="optional" />
-              </xsd:extension>
-            </xsd:complexContent>
-          </xsd:complexType>
-        </xsd:element>
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="pool" type="gf:pool-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="disk-store" type="gf:disk-store-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="hdfs-store" type="gf:hdfs-store-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="pdx" type="gf:pdx-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-          <xsd:element name="jndi-bindings" type="gf:jndi-bindings-type" />
-          <xsd:element name="region" type="gf:region-type" />
-          <xsd:element name="vm-root-region" type="gf:region-type">
-            <xsd:annotation>
-              <xsd:appinfo>deprecated</xsd:appinfo>
-              <xsd:documentation>
-                A "vm-root-region" element is the same as "region".
-                This element exists for backwards compatiblity and should not be used
-                in new xml files.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:element>
-        </xsd:choice>
-        <xsd:element maxOccurs="1" minOccurs="0" name="function-service" type="gf:function-service-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="resource-manager" type="gf:resource-manager-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="serialization-registration" type="gf:serialization-registration-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="backup" type="xsd:string">
-          <xsd:annotation>
-            <xsd:documentation>
-              The backup element defines files or directories that should
-              be backed up when the system wide backup command is invoked.
-              Disk
-              stores with persistent data are automatically backed up,
-              they do not need to be listed with this element.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element maxOccurs="1" minOccurs="0" name="initializer" type="gf:initializer-type" />
-        <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="copy-on-read" type="xsd:boolean" use="optional" />
-      <xsd:attribute name="is-server" type="xsd:boolean" use="optional" />
-      <xsd:attribute name="lock-timeout" type="xsd:string" use="optional" />
-      <xsd:attribute name="lock-lease" type="xsd:string" use="optional" />
-      <xsd:attribute name="message-sync-interval" type="xsd:string" use="optional" />
-      <xsd:attribute name="search-timeout" type="xsd:string" use="optional" />
-      <xsd:attribute name="version" type="gf:versionType" use="required" fixed="9.0" />
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="client-cache">
-    <xsd:annotation>
-      <xsd:documentation>
-        The "client-cache" element is the root element of the declarative cache file on a client. This element configures a GemFire ClientCache
-        and describes the root regions it contains, if any.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element maxOccurs="1" minOccurs="0" name="cache-transaction-manager" type="gf:cache-transaction-manager-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="dynamic-region-factory" type="gf:dynamic-region-factory-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="pool" type="gf:pool-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="disk-store" type="gf:disk-store-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="pdx" type="gf:pdx-type" />
-        <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-          <xsd:element name="jndi-bindings" type="gf:jndi-bindings-type" />
-          <xsd:element name="region" type="gf:region-type" />
-        </xsd:choice>
-        <xsd:element maxOccurs="1" minOccurs="0" name="function-service" type="gf:function-service-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="resource-manager" type="gf:resource-manager-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="serialization-registration" type="gf:serialization-registration-type" />
-        <xsd:element maxOccurs="1" minOccurs="0" name="initializer" type="gf:initializer-type" />
-      </xsd:sequence>
-      <xsd:attribute name="copy-on-read" type="xsd:boolean" use="optional" />
-      <xsd:attribute name="version" type="gf:versionType" use="required" fixed="9.0" />
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="region-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "region" element describes a region (and its entries) in GemFire
-        distributed cache. It may be used to create a new region or may be
-        used to add new entries to an existing region. Note that the "name"
-        attribute specifies the simple name of the region; it cannot contain a
-        "/".
-        If "refid"
-        is set then it defines the default region attributes to use for this region.
-        A nested "region-attributes" element can override these defaults.
-        If the
-        nested "region-attributes" element has its own "refid" then it will cause the
-        "refid" on the region to be ignored.
-        "refid" can be set to the name of a
-        RegionShortcut or a ClientRegionShortcut
-        (see the javadocs of those enum classes for their names).
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="region-attributes" type="gf:region-attributes-type" />
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="index">
-        <xsd:annotation>
-          <xsd:documentation>
-            An "index" element describes an index to be created on a region.
-            The index node, if any, should all come immediately after the
-            "region-attributes" node. There can be any number of functional types
-            of index on a Region, but only at max one index of type "primary-key". The
-            "name" attribute is a required field which identifies the name of the index.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:choice minOccurs="0">
-            <xsd:element name="functional">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A functional type of index needs a from-clause, expression which are mandatory.
-                  The import string is used for specifying the
-                  type of Object in the region or
-                  the type of Object which the indexed expression evaluates to.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="expression" type="xsd:string" use="required" />
-                <xsd:attribute name="from-clause" type="xsd:string" use="required" />
-                <xsd:attribute name="imports" type="xsd:string" use="optional" />
-              </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element name="primary-key">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A primary-key type of index needs a field attribute which is mandatory.
-                  There should be only one or zero primary-index defined
-                  for a region
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="field" type="xsd:string" use="required" />
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:choice>
-          <xsd:attribute name="name" type="xsd:string" use="required" />
-          <xsd:attribute name="expression" type="xsd:string" use="optional" />
-          <xsd:attribute name="from-clause" type="xsd:string" use="optional" />
-          <xsd:attribute name="imports" type="xsd:string" use="optional" />
-          <xsd:attribute name="key-index" type="xsd:boolean" use="optional" />
-          <xsd:attribute default="range" name="type" use="optional">
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="range" />
-                <xsd:enumeration value="hash" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="entry">
-        <xsd:annotation>
-          <xsd:documentation>
-            An "entry" element desribes an entry to be added to a region. Note
-            that if an entry with the given key already exists in the region,
-            it
-            will be replaced.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="key">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A "key" element describes the key in a Region entry.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:choice>
-                  <xsd:element name="string" type="gf:string-type" />
-                  <xsd:element name="declarable" type="gf:declarable-type" />
-                </xsd:choice>
-              </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="value">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A "value" element describes the value in a Region entry
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:choice>
-                  <xsd:element name="string" type="gf:string-type" />
-                  <xsd:element name="declarable" type="gf:declarable-type" />
-                </xsd:choice>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="region" type="gf:region-type" />
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required" />
-    <xsd:attribute name="refid" type="xsd:string" use="optional" />
-  </xsd:complexType>
-    <!-- ======================================================= -->
-    <!--
-A "region-attributes" element describes the attributes of a region to
-be created.
-As of 6.5 disk-dirs is deprecated on region-attributes. Use disk-store-name instead.
--->
-  <xsd:complexType name="region-attributes-type">
-    <xsd:sequence>
-      <xsd:element maxOccurs="1" minOccurs="0" name="key-constraint">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "key-constraint" element specifies the name of a class to which the
-            keys of a region are constrained.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element maxOccurs="1" minOccurs="0" name="value-constraint" type="xsd:string">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "value-constraint" element specifies the name of a class to which the
-            values of a region are constrained.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element maxOccurs="1" minOccurs="0" name="region-time-to-live">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "region-time-to-live" element specifies a Region's time to live.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="region-idle-time">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "region-idle-time" element specifies a Region's idle time.
-            Note that the APIs that correspond to this element add "out" to their
-            name.
-            See getRegionIdleTimeout and setRegionIdleTimeout.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="entry-time-to-live">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "entry-time-to-live" element specifies a Region's entries' time to
-            live.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="entry-idle-time">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "entry-idle-time" element specifies a Region's entries' idle time.
-            Note that the APIs that correspond to this element add "out" to
-            their name.
-            See getEntryIdleTimeout and setEntryIdleTimeout.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="expiration-attributes" type="gf:expiration-attributes-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="disk-write-attributes">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "disk-write-attributes" element describes how entry data is written
-            to disk. Deprecated as of 6.5 use disk-store instead.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:choice>
-            <xsd:element name="asynchronous-writes">
-              <xsd:annotation>
-                <xsd:documentation>
-                  An "asynchronous-writes" element specifies how entry data should be
-                  written to disk asynchronous.
-                  Deprecated as of 6.5 use
-                  disk-store instead.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="bytes-threshold" type="xsd:string" use="required" />
-                <xsd:attribute name="time-interval" type="xsd:string" use="required" />
-              </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="synchronous-writes">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A "synchronous-writes" element specifies that entry data should be
-                  written to disk synchronously.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:choice>
-          <xsd:attribute name="max-oplog-size" type="xsd:string" use="optional" />
-          <xsd:attribute name="roll-oplogs" type="xsd:string" use="optional" />
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dirs" type="gf:disk-dirs-type" />
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="partition-attributes">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "partition-attributes" element configures a region for partitioned
-            data storage.
-
-            local-max-memory attribute added to
-            partition-attributes in release 5.1
-            total-max-memory attribute added to partition-attributes in release 5.1
-            total-num-buckets attribute added to
-            partition-attributes in release 5.1
-            partition-resolver attribute added to partition-attributes in release 5.7
-            partition-listener attribute added to
-            partition-attributes in release 6.1
-            colocated-with attribute added to partition-attributes in release 5.7
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="0" name="partition-resolver">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A "partition-resolver" element describes a partitioned region's custom
-                  PartitionResolver.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="class-name" type="gf:class-name-type" />
-                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-                </xsd:sequence>
-                <xsd:attribute name="name" type="xsd:string" use="optional" />
-              </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="partition-listener">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A "partition-listener" element describes a partitioned region's custom
-                  PartitionListener.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="class-name" type="gf:class-name-type" />
-                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="fixed-partition-attributes">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A "fixed-partition-attributes" element describes characteristics of a
-                  partition in a Fixed Partitioned Region.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="partition-name" type="xsd:string" use="required" />
-                <xsd:attribute name="is-primary" type="xsd:boolean" use="optional" />
-                <xsd:attribute name="num-buckets" type="xsd:string" use="optional" />
-              </xsd:complexType>
-            </xsd:element>
-
-          </xsd:sequence>
-          <xsd:attribute name="local-max-memory" type="xsd:string" use="optional" />
-          <xsd:attribute name="recovery-delay" type="xsd:string" use="optional" />
-          <xsd:attribute name="redundant-copies" type="xsd:string" use="optional" />
-          <xsd:attribute name="startup-recovery-delay" type="xsd:string" use="optional" />
-          <xsd:attribute name="total-max-memory" type="xsd:string" use="optional" />
-          <xsd:attribute name="total-num-buckets" type="xsd:string" use="optional" />
-          <xsd:attribute name="colocated-with" type="xsd:string" use="optional" />
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="membership-attributes">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "membership-attributes" element configures a region for membership
-            constraints based on required roles.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="required-role">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A "required-role" element specifies a role that is required for reliable
-                  access to the region
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="name" type="xsd:string" use="required" />
-              </xsd:complexType>
-            </xsd:element>
-
-          </xsd:sequence>
-          <xsd:attribute name="loss-action" use="optional">
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="full-access" />
-                <xsd:enumeration value="limited-access" />
-                <xsd:enumeration value="no-access" />
-                <xsd:enumeration value="reconnect" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-          <xsd:attribute name="resumption-action" use="optional">
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="none" />
-                <xsd:enumeration value="reinitialize" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="subscription-attributes">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "subscription-attributes" element configures how a region subscribes
-            to remote distributed regions.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="interest-policy" use="optional">
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="all" />
-                <xsd:enumeration value="cache-content" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="cache-loader" type="gf:cache-loader-type" />
-      <xsd:element maxOccurs="1" minOccurs="0" name="cache-writer" type="gf:cache-writer-type" />
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="cache-listener">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "cache-listener" element describes a region's CacheListener.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="compressor">
-        <xsd:annotation>
-          <xsd:documentation>
-            A compressor registers a custom class which extends Compressor
-            to support compression on a region.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="1" minOccurs="0" name="eviction-attributes">
-        <xsd:annotation>
-          <xsd:documentation>
-            Create eviction attributes that monitor and control the size of the Region.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:choice>
-            <xsd:element name="lru-entry-count">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Create an LRU eviction controller which performs the action if the
-                  Region has more than the maximum number of Entries in the
-                  Region.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
-                <xsd:attribute name="maximum" type="xsd:string" use="optional" />
-              </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element name="lru-heap-percentage">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Create an LRU which evicts entries using the specified action
-                  when the heap is over the resource manager
-                  critical heap/off-heap percentage.
-                  When the threshold has been exceeded each create or put operation
-                  is required to evict the same size of data which was
-                  added. The
-                  optional class-name and parameters allow for the declaration
-                  of an ObjectSizer, which will be used to determine data size.
-                  The class
-                  must implement the ObjectSizer interface.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence minOccurs="0">
-                  <xsd:element name="class-name" type="gf:class-name-type" />
-                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-                </xsd:sequence>
-                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
-              </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element name="lru-memory-size">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Create an LRU that performs the action when the memory size of the Region is
-                  over the maximum. The optional class-name and
-                  parameters allow for the
-                  declaration an ObjectSizer, which is used to measure the size of each Object
-                  in the Region. The class must implement
-                  the ObjectSizer interface.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence minOccurs="0">
-                  <xsd:element name="class-name" type="gf:class-name-type" />
-                  <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-                </xsd:sequence>
-                <xsd:attribute name="action" type="gf:enum-action-destroy-overflow" use="optional" />
-                <xsd:attribute name="maximum" type="xsd:string" use="optional" />
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:choice>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="concurrency-level" type="xsd:string" use="optional" />
-    <xsd:attribute name="data-policy" type="gf:region-attributesData-policy" use="optional" />
-    <xsd:attribute name="early-ack" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="enable-async-conflation" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="enable-gateway" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="enable-subscription-conflation" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="gateway-sender-ids" type="xsd:string" use="optional" />
-    <xsd:attribute name="async-event-queue-ids" type="xsd:string" use="optional" />
-    <xsd:attribute name="hub-id" type="xsd:string" use="optional" />
-    <xsd:attribute name="id" type="xsd:string" use="optional" />
-    <xsd:attribute name="ignore-jta" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="index-update-type" type="gf:region-attributesIndex-update-type" use="optional" />
-    <xsd:attribute name="initial-capacity" type="xsd:string" use="optional" />
-    <xsd:attribute name="is-lock-grantor" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="load-factor" type="xsd:string" use="optional" />
-    <xsd:attribute name="mirror-type" type="gf:region-attributesMirror-type" use="optional" />
-    <xsd:attribute name="multicast-enabled" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="persist-backup" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="pool-name" type="xsd:string" use="optional" />
-    <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
-    <xsd:attribute name="disk-synchronous" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="hdfs-store-name" type="xsd:string" use="optional" />
-    <xsd:attribute name="hdfs-write-only" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="publisher" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="refid" type="xsd:string" use="optional" />
-    <xsd:attribute name="scope" type="gf:region-attributesScope" use="optional" />
-    <xsd:attribute name="statistics-enabled" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="cloning-enabled" type="xsd:boolean" use="optional" />
-    <xsd:attribute default="true" name="concurrency-checks-enabled" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="off-heap" type="xsd:boolean" use="optional" />
-  </xsd:complexType>
-  <xsd:simpleType name="region-attributesData-policy">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="empty" />
-      <xsd:enumeration value="normal" />
-      <xsd:enumeration value="partition" />
-      <xsd:enumeration value="persistent-replicate" />
-      <xsd:enumeration value="preloaded" />
-      <xsd:enumeration value="replicate" />
-      <xsd:enumeration value="persistent-partition" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="region-attributesIndex-update-type">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="asynchronous" />
-      <xsd:enumeration value="synchronous" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="region-attributesMirror-type">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="keys" />
-      <xsd:enumeration value="keys-values" />
-      <xsd:enumeration value="none" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="region-attributesScope">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="distributed-ack" />
-      <xsd:enumeration value="distributed-no-ack" />
-      <xsd:enumeration value="global" />
-      <xsd:enumeration value="local" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="enum-readable-writable">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="readable" />
-      <xsd:enumeration value="writable" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-    <!-- ======================================================= -->
-    <!--
--->
-    <!-- ======================================================= -->
-    <!--
--->
-    <!-- ======================================================= -->
-    <!--
--->
-    <!-- ======================================================= -->
-    <!--
--->
-    <!-- ======================================================= -->
-    <!--
--->
-    <!-- ======================================================= -->
-    <!--
--->
-    <!-- ======================================================= -->
-    <!-- ======================================================= -->
-
-  <xsd:complexType name="server-type">
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="group" type="xsd:string">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "group" element specifies a single server group.
-            Deprecated as of 7.0 use the groups gemfire property instead.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element maxOccurs="1" minOccurs="0" name="client-subscription">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "client-subscription" element describes the eviction policy, capacity and overflow-directory for client subscription
-            config. The
-            overflow-directory attribute is deprecated as of 6.5 use disk-store-name instead.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="eviction-policy" use="required">
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="entry" />
-                <xsd:enumeration value="mem" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-          <xsd:attribute name="capacity" type="xsd:string" use="required" />
-          <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
-          <xsd:attribute name="overflow-directory" type="xsd:string" use="optional" />
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element maxOccurs="1" minOccurs="0" name="custom-load-probe">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "custom-load-probe" element describes a callback that reports the load on a cache-server.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="bind-address" type="xsd:string" use="optional" />
-    <xsd:attribute name="hostname-for-clients" type="xsd:string" use="optional" />
-    <xsd:attribute name="max-connections" type="xsd:string" use="optional" />
-    <xsd:attribute name="maximum-message-count" type="xsd:string" use="optional" />
-    <xsd:attribute name="maximum-time-between-pings" type="xsd:string" use="optional" />
-    <xsd:attribute name="max-threads" type="xsd:string" use="optional" />
-    <xsd:attribute name="message-time-to-live" type="xsd:string" use="optional" />
-    <xsd:attribute name="notify-by-subscription" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="port" type="xsd:string" use="optional" />
-    <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
-    <xsd:attribute name="load-poll-interval" type="xsd:string" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType name="resource-manager-type">
-    <xsd:annotation>
-      <xsd:appinfo>deprecated</xsd:appinfo>
-      <xsd:documentation>
-        The "resource manager" element configures the behavior of the resource manager.
-        The resource manager provides support for resource
-        management of its associated Cache
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="critical-heap-percentage" type="xsd:string" use="optional" />
-    <xsd:attribute name="eviction-heap-percentage" type="xsd:string" use="optional" />
-    <xsd:attribute name="critical-off-heap-percentage" type="xsd:string" use="optional" />
-    <xsd:attribute name="eviction-off-heap-percentage" type="xsd:string" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType name="function-service-type">
-    <xsd:annotation>
-      <xsd:documentation>The "function service" element configures the behavior of the function service.
-        The function service allows users to execute functions
-        on data stored in
-        GemFire
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="function">
-        <xsd:annotation>
-          <xsd:documentation>
-            The "function" element defines a function for registration in the function service
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="cache-loader-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "cache-loader" element describes a region's CacheLoader.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class-name" type="gf:class-name-type" />
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="cache-transaction-manager-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "cache-transaction-manager" element allows insertion of cache-level
-        transaction listeners.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="transaction-listener">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "transaction-listener" describes a TransactionListener.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element maxOccurs="1" minOccurs="0" name="transaction-writer">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "transaction-writer" describes a TransactionWriter.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="cache-writer-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "cache-writer" element describes a region's CacheWriter.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class-name" type="gf:class-name-type" />
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="serialization-registration-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A serialization-registration contains a set of serializer or
-        instantiator tags to register customer DataSerializer extensions
-        or
-        DataSerializable implementations respectively.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="serializer">
-        <xsd:annotation>
-          <xsd:documentation>
-            A serializer registers a custom class which extends DataSerializer
-            to support custom serialization of non-modifiable object types
-            inside
-            GemFire. The class must have a public zero-arg constructor.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="instantiator">
-        <xsd:annotation>
-          <xsd:documentation>
-            An instantiator registers a custom class which implements the
-            DataSerializable interface to support custom object serialization
-            inside GemFire. The class must have a public zero-arg constructor.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-          </xsd:sequence>
-          <xsd:attribute name="id" type="xsd:string" use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The id that the instantiator should associate with the DataSerializable
-                type.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:simpleType name="class-name-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "class-name" element specifies the name of a class, an
-        instance of which is created when a declarative cache XML file is
-        read.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="disk-store-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "disk-store" element specifies a DiskStore for persistence.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dirs" type="gf:disk-dirs-type" />
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required" />
-    <xsd:attribute name="auto-compact" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="compaction-threshold" type="xsd:string" use="optional" />
-    <xsd:attribute name="allow-force-compaction" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="max-oplog-size" type="xsd:string" use="optional" />
-    <xsd:attribute name="time-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="write-buffer-size" type="xsd:string" use="optional" />
-    <xsd:attribute name="queue-size" type="xsd:string" use="optional" />
-    <xsd:attribute name="disk-usage-warning-percentage" type="xsd:string" use="optional" />
-    <xsd:attribute name="disk-usage-critical-percentage" type="xsd:string" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType mixed="true" name="hdfs-store-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "hdfs-store" element specifies a HdfsStore for persistence.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required" />
-    <xsd:attribute name="namenode-url" type="xsd:string" use="optional" />
-    <xsd:attribute name="home-dir" type="xsd:string" use="optional" />
-    <xsd:attribute name="max-memory" type="xsd:string" use="optional" />
-    <xsd:attribute name="read-cache-size" type="xsd:string" use="optional" />
-    <xsd:attribute name="batch-size" type="xsd:string" use="optional" />
-    <xsd:attribute name="batch-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional" />
-    <xsd:attribute name="buffer-persistent" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="disk-store" type="xsd:string" use="optional" />
-    <xsd:attribute name="synchronous-disk-write" type="xsd:string" use="optional" />
-    <xsd:attribute name="hdfs-client-config-file" type="xsd:string" use="optional" />
-    <xsd:attribute name="purge-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="major-compaction" type="xsd:string" use="optional" />
-    <xsd:attribute name="major-compaction-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="major-compaction-threads" type="xsd:integer" use="optional" />
-    <xsd:attribute name="minor-compaction" type="xsd:string" use="optional" />
-    <xsd:attribute name="minor-compaction-threads" type="xsd:integer" use="optional" />
-    <xsd:attribute name="max-write-only-file-size" type="xsd:integer" use="optional" />
-    <xsd:attribute name="write-only-file-rollover-interval" type="xsd:string" use="optional" />    
-  </xsd:complexType>
-
-  <xsd:complexType name="pdx-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "pdx" element specifies the configuration for the portable data exchange (PDX) method of serialization.
-        The "read-serialized"
-        attribute is "early access".
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="1" minOccurs="0" name="pdx-serializer">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "pdx-serializer" element describes a serializer used to serialize objects in the portable data exchange format.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="read-serialized" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="ignore-unread-fields" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="persistent" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="disk-store-name" type="xsd:string" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType name="pool-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "pool" element specifies a client to server connection pool.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element maxOccurs="unbounded" minOccurs="1" name="locator">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "locator" element specifies the host and port that a server locator is listening on
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="host" type="xsd:string" use="required" />
-          <xsd:attribute name="port" type="xsd:string" use="required" />
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element maxOccurs="unbounded" minOccurs="1" name="server">
-        <xsd:annotation>
-          <xsd:documentation>
-            A "server" element specifies the host and port that a cache server is listening on
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="host" type="xsd:string" use="required" />
-          <xsd:attribute name="port" type="xsd:string" use="required" />
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-    <xsd:attribute name="free-connection-timeout" type="xsd:string" use="optional" />
-    <xsd:attribute name="load-conditioning-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="min-connections" type="xsd:string" use="optional" />
-    <xsd:attribute name="max-connections" type="xsd:string" use="optional" />
-    <xsd:attribute name="retry-attempts" type="xsd:string" use="optional" />
-    <xsd:attribute name="idle-timeout" type="xsd:string" use="optional" />
-    <xsd:attribute name="ping-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="name" type="xsd:string" use="required" />
-    <xsd:attribute name="read-timeout" type="xsd:string" use="optional" />
-    <xsd:attribute name="server-group" type="xsd:string" use="optional" />
-    <xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" />
-    <xsd:attribute name="subscription-enabled" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="subscription-message-tracking-timeout" type="xsd:string" use="optional" />
-    <xsd:attribute name="subscription-ack-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="subscription-redundancy" type="xsd:string" use="optional" />
-    <xsd:attribute name="statistic-interval" type="xsd:string" use="optional" />
-    <xsd:attribute name="thread-local-connections" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="pr-single-hop-enabled" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="multiuser-authentication" type="xsd:boolean" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType name="declarable-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "declarable" element specifies a Declarable object to be placed in a
-        Region entry.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class-name" type="gf:class-name-type" />
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="disk-dir-type" mixed="true">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "disk-dir" element specifies one of a region or diskstore's disk directories.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="dir-size" type="xsd:string" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType name="disk-dirs-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "disk-dirs" element specifies the region's disk directories.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="1" name="disk-dir" type="gf:disk-dir-type" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="dynamic-region-factory-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "dynamic-region-factory" element configures a dynamic region factory for
-        this cache. If this optional element is missing then the
-        cache does not
-        support dynamic regions.
-
-        The optional "disk-dir" sub-element can be used to specify the directory to
-        store the persistent files that are
-        used for dynamic region bookkeeping.
-        It defaults to the current directory.
-
-        The pool-name attribute can be used to set the name of the connection
-        pool used
-        by client applications in a client/server cache configuration.
-        It should not be specified in servers or peers.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="1" minOccurs="0" name="disk-dir" type="gf:disk-dir-type" />
-    </xsd:sequence>
-    <xsd:attribute name="disable-persist-backup" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="disable-register-interest" type="xsd:boolean" use="optional" />
-    <xsd:attribute name="pool-name" type="xsd:string" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType name="expiration-attributes-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        An "expiration-attributes" element describes expiration.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="1" minOccurs="0" name="custom-expiry">
-        <xsd:annotation>
-          <xsd:documentation>
-            The "custom-expiry" element specifies a callback that specifies
-            custom expiration attributes. See the CustomExpiry class.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="class-name" type="gf:class-name-type" />
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute name="action" use="optional">
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string">
-          <xsd:enumeration value="destroy" />
-          <xsd:enumeration value="invalidate" />
-          <xsd:enumeration value="local-destroy" />
-          <xsd:enumeration value="local-invalidate" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </xsd:attribute>
-    <xsd:attribute name="timeout" type="xsd:string" use="required" />
-  </xsd:complexType>
-
-  <xsd:complexType name="initializer-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "initializer" element specifies a Declarable object whose init method
-        will be called after all other cache.xml initialization is
-        complete.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class-name" type="gf:class-name-type" />
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="class-with-parameters-type">
-    <xsd:sequence>
-      <xsd:element name="class-name" type="gf:class-name-type" />
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="parameter" type="gf:parameter-type" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="jndi-bindings-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A jndi-bindings element will contain the jndi-binding for each of the
-        datasources which are to be bound with the JNDI Context.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="jndi-binding">
-        <xsd:annotation>
-          <xsd:documentation>
-            For every datasource which is bound to the JNDI tree, there will exist one
-            jndi-binding tag. This tag will describe the property
-            and
-            configuration of the
-            datasource. The attributes of jndi-binding are used for configuration by
-            GemFire, while the property element is used to
-            configure
-            the custom property
-            for the datasource.
-
-            The "xa-datasource-class" must be set when type is XAPooledDataSource,
-            "conn-pooled-datasource-class" must be
-            set when type is PooledDataSource,
-            and "jdbc-driver-class" msut be set when the type is SimpleDataSource.
-            It
-            is advisable to set the user-name and
-            password as attributes
-            rather than as a property element.
-            Alternatively, they may both be set as attributes of
-            the jndi-binding tag
-            as well as an
-            attribute of the property tag.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="config-property">
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="config-property-name" type="xsd:string" />
-                  <xsd:element name="config-property-type" type="xsd:string" />
-                  <xsd:element name="config-property-value" type="xsd:string" />
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-
-          </xsd:sequence>
-          <xsd:attribute name="blocking-timeout-seconds" type="xsd:string" use="optional" />
-          <xsd:attribute name="conn-pooled-datasource-class" type="xsd:string" use="optional" />
-          <xsd:attribute name="connection-url" type="xsd:string" use="optional" />
-          <xsd:attribute name="idle-timeout-seconds" type="xsd:string" use="optional" />
-          <xsd:attribute name="init-pool-size" type="xsd:string" use="optional" />
-          <xsd:attribute name="jdbc-driver-class" type="xsd:string" use="optional" />
-          <xsd:attribute name="jndi-name" type="xsd:string" use="required" />
-          <xsd:attribute name="login-timeout-seconds" type="xsd:string" use="optional" />
-          <xsd:attribute name="managed-conn-factory-class" type="xsd:string" use="optional" />
-          <xsd:attribute name="max-pool-size" type="xsd:string" use="optional" />
-          <xsd:attribute name="password" type="xsd:string" use="optional" />
-          <xsd:attribute name="transaction-type" type="xsd:string" use="optional" />
-          <xsd:attribute name="type" use="required">
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="ManagedDataSource" />
-                <xsd:enumeration value="SimpleDataSource" />
-                <xsd:enumeration value="PooledDataSource" />
-                <xsd:enumeration value="XAPooledDataSource" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-          <xsd:attribute name="user-name" type="xsd:string" use="optional" />
-          <xsd:attribute name="xa-datasource-class" type="xsd:string" use="optional" />
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:simpleType name="enum-action-destroy-overflow">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="local-destroy" />
-      <xsd:enumeration value="overflow-to-disk" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="parameter-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "parameter" element describes a parameter used to initialize a
-        Declarable object.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="string" type="gf:string-type" />
-      <xsd:element name="declarable" type="gf:declarable-type" />
-    </xsd:choice>
-    <xsd:attribute name="name" type="xsd:string" use="required" />
-  </xsd:complexType>
-
-  <xsd:complexType name="string-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A "string" element specifies a String to be placed in a Region entry.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string"></xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:simpleType name="versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Decimal version type.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="\.?[0-9]+(\.[0-9]+)*" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- TODO -->
-    <!-- Will put refid later.....refid   IDREF #IMPLIED -->
-
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
index 2b2242b..c56b6ed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
@@ -248,7 +248,7 @@ public class CacheXml58DUnitTest extends CacheXml57DUnitTest
     AttributesFactory fac = new AttributesFactory(attrs);
 
 //  TODO mthomas 01/20/09 Move test back to using LRUHeap when config issues have settled
-//    if (getGemFireVersion().equals(CacheXml.VERSION_6_0)) {
+//    if (getGemFireVersion().equals(CacheXml.GEMFIRE_6_0)) {
 //      fac.setEvictionAttributes(EvictionAttributes.createLRUHeapAttributes(null,
 //          EvictionAction.OVERFLOW_TO_DISK));
 //    } else {
@@ -303,7 +303,7 @@ public class CacheXml58DUnitTest extends CacheXml57DUnitTest
     assertEquals(regionAttrs.getEntryIdleTimeout().getTimeout(), expiration.getTimeout());
     assertEquals(regionAttrs.getEntryTimeToLive().getTimeout(), expiration.getTimeout());    
 //  TODO mthomas 01/20/09 Move test back to using LRUHeap when config issues have settled
-//    if (getGemFireVersion().equals(CacheXml.VERSION_6_0)) {
+//    if (getGemFireVersion().equals(CacheXml.GEMFIRE_6_0)) {
 //      assertEquals(ea.getAlgorithm(),EvictionAlgorithm.LRU_HEAP);
 //    } else {
     assertEquals(ea.getAlgorithm(),EvictionAlgorithm.LRU_MEMORY);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java
deleted file mode 100644
index 21e6c61..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * 
- */
-package com.gemstone.gemfire.cache30;
-
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
-import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
-import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
-import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.test.dunit.IgnoredException;
-
-
-public class CacheXml90DUnitTest extends CacheXml81DUnitTest {
-  private static final long serialVersionUID = -6437436147079728413L;
-
-  public CacheXml90DUnitTest(String name) {
-    super(name);
-  }
-
-  
-  // ////// Helper methods
-
-  protected String getGemFireVersion()
-  {
-    return CacheXml.VERSION_9_0;
-  }
-
-  @SuppressWarnings("rawtypes")
-  public void testEnableOffHeapMemory() {
-    try {
-      System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
-      
-      final String regionName = "testEnableOffHeapMemory";
-      
-      final CacheCreation cache = new CacheCreation();
-      final RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
-      attrs.setOffHeap(true);
-      assertEquals(true, attrs.getOffHeap());
-      
-      final Region regionBefore = cache.createRegion(regionName, attrs);
-      assertNotNull(regionBefore);
-      assertEquals(true, regionBefore.getAttributes().getOffHeap());
-  
-      testXml(cache);
-      
-      final Cache c = getCache();
-      assertNotNull(c);
-  
-      final Region regionAfter = c.getRegion(regionName);
-      assertNotNull(regionAfter);
-      assertEquals(true, regionAfter.getAttributes().getOffHeap());
-      assertEquals(true, ((LocalRegion)regionAfter).getOffHeap());
-      regionAfter.localDestroyRegion();
-    } finally {
-      System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME);
-    }
-  }
-
-  @SuppressWarnings("rawtypes")
-  public void testEnableOffHeapMemoryRootRegionWithoutOffHeapMemoryThrowsException() {
-    final String regionName = getUniqueName();
-    
-    final CacheCreation cache = new CacheCreation();
-    final RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
-    attrs.setOffHeap(true);
-    assertEquals(true, attrs.getOffHeap());
-    
-    final Region regionBefore = cache.createRegion(regionName, attrs);
-    assertNotNull(regionBefore);
-    assertEquals(true, regionBefore.getAttributes().getOffHeap());
-
-    IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.
-        LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+regionName));
-    try {
-      testXml(cache);
-    } catch (IllegalStateException e) {
-      // expected
-      String msg = LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+regionName);
-      assertEquals(msg, e.getMessage());
-    } finally {
-      expectedException.remove();
-    }
-  }
-  
-  @SuppressWarnings({ "rawtypes", "deprecation", "unchecked" })
-  public void testEnableOffHeapMemorySubRegionWithoutOffHeapMemoryThrowsException() {
-    final String rootRegionName = getUniqueName();
-    final String subRegionName = "subRegion";
-    
-    final CacheCreation cache = new CacheCreation();
-    final RegionAttributesCreation rootRegionAttrs = new RegionAttributesCreation(cache);
-    assertEquals(false, rootRegionAttrs.getOffHeap());
-    
-    final Region rootRegionBefore = cache.createRegion(rootRegionName, rootRegionAttrs);
-    assertNotNull(rootRegionBefore);
-    assertEquals(false, rootRegionBefore.getAttributes().getOffHeap());
-    
-    final RegionAttributesCreation subRegionAttrs = new RegionAttributesCreation(cache);
-    subRegionAttrs.setOffHeap(true);
-    assertEquals(true, subRegionAttrs.getOffHeap());
-    
-    final Region subRegionBefore = rootRegionBefore.createSubregion(subRegionName, subRegionAttrs);
-    assertNotNull(subRegionBefore);
-    assertEquals(true, subRegionBefore.getAttributes().getOffHeap());
-
-    IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.
-        LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+rootRegionName+"/"+subRegionName));
-    try {
-      testXml(cache);
-    } catch (IllegalStateException e) {
-      // expected
-      final String msg = LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.
-          toLocalizedString("/" + rootRegionName + "/" + subRegionName);
-      assertEquals(msg, e.getMessage());
-    } finally {
-      expectedException.remove();
-    }
-  }
-
-  /**
-   * Test the ResourceManager element's critical-off-heap-percentage and 
-   * eviction-off-heap-percentage attributes
-   * @throws Exception
-   */
-  public void testResourceManagerThresholds() throws Exception {
-    CacheCreation cache = new CacheCreation();
-    final float low = 90.0f;
-    final float high = 95.0f;
-
-    try {
-      System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
-
-      Cache c;
-      ResourceManagerCreation rmc = new ResourceManagerCreation();
-      rmc.setEvictionOffHeapPercentage(low);
-      rmc.setCriticalOffHeapPercentage(high);
-      cache.setResourceManagerCreation(rmc);
-      testXml(cache);
-      {
-        c = getCache();
-        assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
-        assertEquals(high, c.getResourceManager().getCriticalOffHeapPercentage());
-      }
-      closeCache();
-      
-      rmc = new ResourceManagerCreation();
-      // Set them to similar values
-      rmc.setEvictionOffHeapPercentage(low);
-      rmc.setCriticalOffHeapPercentage(low + 1);
-      cache.setResourceManagerCreation(rmc);
-      testXml(cache);
-      {
-        c = getCache();
-        assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
-        assertEquals(low + 1, c.getResourceManager().getCriticalOffHeapPercentage());
-      }
-      closeCache();
-  
-      rmc = new ResourceManagerCreation();
-      rmc.setEvictionOffHeapPercentage(high);
-      rmc.setCriticalOffHeapPercentage(low);
-      cache.setResourceManagerCreation(rmc);
-      IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE.toLocalizedString());
-      try {
-        testXml(cache);
-        assertTrue(false);
-      } catch (IllegalArgumentException expected) {
-      } finally {
-        expectedException.remove();
-        closeCache();
-      }
-  
-      // Disable eviction
-      rmc = new ResourceManagerCreation();
-      rmc.setEvictionOffHeapPercentage(0);
-      rmc.setCriticalOffHeapPercentage(low);
-      cache.setResourceManagerCreation(rmc);
-      testXml(cache);
-      {
-        c = getCache();
-        assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage());
-        assertEquals(low, c.getResourceManager().getCriticalOffHeapPercentage());
-      }
-      closeCache();
-  
-      // Disable refusing ops in "red zone"
-      rmc = new ResourceManagerCreation();
-      rmc.setEvictionOffHeapPercentage(low);
-      rmc.setCriticalOffHeapPercentage(0);
-      cache.setResourceManagerCreation(rmc);
-      testXml(cache);
-      {
-        c = getCache();
-        assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
-        assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage());
-      }
-      closeCache();
-  
-      // Disable both
-      rmc = new ResourceManagerCreation();
-      rmc.setEvictionOffHeapPercentage(0);
-      rmc.setCriticalOffHeapPercentage(0);
-      cache.setResourceManagerCreation(rmc);
-      testXml(cache);
-      c = getCache();
-      assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage());
-      assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage());
-    } finally {
-      System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME);
-    }
-  }
-}


[20/24] incubator-geode git commit: GEODE-1062: New method to modify wait time for validateRegionSize

Posted by ji...@apache.org.
GEODE-1062: New method to modify wait time for validateRegionSize

Part of the refactoring work for GEODE-1062 led to a possible test failure
due to insufficient wait time for very slow tests.  The tests need to be fixed
but a quick workaround is to pass in the custom time of the original default time
of 240000


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c23ec7a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c23ec7a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c23ec7a8

Branch: refs/heads/feature/GEODE-17-2
Commit: c23ec7a80afbf3c83e71de89581613dbb1b2a24b
Parents: c1cf90e
Author: Jason Huynh <hu...@gmail.com>
Authored: Fri Apr 8 11:35:06 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Fri Apr 8 15:49:20 2016 -0700

----------------------------------------------------------------------
 .../com/gemstone/gemfire/internal/cache/wan/WANTestBase.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c23ec7a8/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 130f960..e93c9c2 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -3611,6 +3611,10 @@ public class WANTestBase extends DistributedTestCase{
   }
 
   public static void validateRegionSize(String regionName, final int regionSize) {
+    validateRegionSize(regionName, regionSize, 30000);
+  }
+
+  public static void validateRegionSize(String regionName, final int regionSize, long waitTime) {
     IgnoredException exp = IgnoredException.addIgnoredException(ForceReattemptException.class
         .getName());
     IgnoredException exp1 = IgnoredException.addIgnoredException(CacheClosedException.class
@@ -3633,7 +3637,7 @@ public class WANTestBase extends DistributedTestCase{
               + " present region keyset " + r.keySet();
         }
       };
-      Wait.waitForCriterion(wc, 30000, 500, true);
+      Wait.waitForCriterion(wc, waitTime, 500, true);
     } finally {
       exp.remove();
       exp1.remove();


[13/24] incubator-geode git commit: GEODE-904 Updates formatting of geode-assembly/src/main/dist/LICENSE to match LICENSE

Posted by ji...@apache.org.
GEODE-904 Updates formatting of geode-assembly/src/main/dist/LICENSE to match LICENSE

Matched formatting of main LICENSE for binary distribution LICENSE and
added missing listings from main LICENSE. GEODE-904


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dc8a344d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dc8a344d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dc8a344d

Branch: refs/heads/feature/GEODE-17-2
Commit: dc8a344da6fc3123750c73602e6bf3a6068d293b
Parents: 52bca83
Author: Joey McAllister <jm...@pivotal.io>
Authored: Thu Apr 7 20:44:25 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:54:26 2016 -0700

----------------------------------------------------------------------
 geode-assembly/src/main/dist/LICENSE | 882 ++++++++++++++++++++++--------
 1 file changed, 662 insertions(+), 220 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dc8a344d/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 6fbbab0..dbb3780 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -201,240 +201,682 @@
    limitations under the License.
 
 ===========================================================================
+Apache Geode Subcomponents
+===========================================================================
 
-Apache Geode includes a number of components and libraries with separate 
-copyright notices and license terms. Your use of those components are 
-subject to the terms and conditions of the following licenses. 
-
-
----------------------------------------------------------------------------
-Antlr (http://www.antlr.org/) antlr:antlr:2.7.7
----------------------------------------------------------------------------
-This product bundles Antlr which is available under a BSD license.  
-For details see http://www.antlr.org/license.html.
-
----------------------------------------------------------------------------
-Backbone (http://backbonejs.org)
----------------------------------------------------------------------------
-This product bundles Backbone which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-CompactConcurrentHashSet2 (http://gee.cs.oswego.edu/dl/concurrency-interest)
----------------------------------------------------------------------------
-This product bundles CompactConcurrentHashSet2 derived from JSR-166 
-ConcurrentHashMap v1.43 which is available in the public domain.  
-
----------------------------------------------------------------------------
-Handlebars (http://handlebarsjs.com)
----------------------------------------------------------------------------
-This product bundles Handlebars which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-highlight.js (https://highlightjs.org)
----------------------------------------------------------------------------
-This product bundles highlight.js which is available under a BSD 3 clauses license.  
-For details see http://opensource.org/licenses/BSD-3-Clause.
-
----------------------------------------------------------------------------
-javax.activation (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp) javax.activation:activation:1.1.1
----------------------------------------------------------------------------
-This product bundles javax.activation which is available under a CDDL license.  
-For details see https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
----------------------------------------------------------------------------
-javax.mail (http://www.oracle.com/) javax.mail:javax.mail-api:1.4.5
----------------------------------------------------------------------------
-This product bundles javax.mail which is available under a CDDL or GPLv2+CE license.  
-For details see http://www.sun.com/cddl or https://glassfish.dev.java.net/public/CDDL+GPL.html.
-
----------------------------------------------------------------------------
-javax.resource (https://glassfish.java.net/) javax.resource:javax.resource-api:1.7
----------------------------------------------------------------------------
-This product bundles javax.resource which is available under a CDDL or GPLv2+CE license.  
-For details see https://glassfish.dev.java.net/public/CDDL+GPL.html.
-
----------------------------------------------------------------------------
-javax.servlet (https://glassfish.java.net/) javax.servlet:javax.servlet-api:3.1.0
----------------------------------------------------------------------------
-This product bundles javax.servlet which is available under a CDDL or GPLv2+CE license.  
-For details see https://glassfish.dev.java.net/public/CDDL+GPL.html.
-
----------------------------------------------------------------------------
-javax.transaction (https://glassfish.java.net/) javax.transaction:javax.transaction-api:1.2
----------------------------------------------------------------------------
-This product bundles javax.transaction which is available under a CDDL or GPLv2+CE license.  
-For details see https://glassfish.dev.java.net/public/CDDL+GPL.html.
-
----------------------------------------------------------------------------
-JLine (http://jline.sourceforge.net) jline:jline:2.12
----------------------------------------------------------------------------
-This product bundles JLine which is available under a BSD license.  
-For details see http://www.opensource.org/licenses/bsd-license.php.
-
----------------------------------------------------------------------------
-JOpt Simple (http://pholser.github.io/jopt-simple/)
----------------------------------------------------------------------------
-This product bundles JOpt Simple which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery (https://jquery.com)
----------------------------------------------------------------------------
-This product bundles jQuery which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery BBQ (http://benalman.com/projects/jquery-bbq-plugin/)
----------------------------------------------------------------------------
-This product bundles jQuery BBQ which is available under an MIT and GPL dual license.  
-For details see http://benalman.com/about/license.
-
----------------------------------------------------------------------------
-jQuery-slideto (https://github.com/Sleavely/jQuery-slideto)
----------------------------------------------------------------------------
-This product bundles jQuery-slideto which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle)
----------------------------------------------------------------------------
-This product bundles jQuery Wiggle which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-JSON (http://json.org)
----------------------------------------------------------------------------
-This product bundles JSON which is available under a BSD-like license.  
-For details see http://json.org/license.html.
-
----------------------------------------------------------------------------
-Paranamer (https://github.com/paul-hammant/paranamer) com.thoughtworks.paranamer:paranamer:2.3
----------------------------------------------------------------------------
-This product bundles Paranamer which is available under a BSD license.  
-For details see http://www.opensource.org/licenses/bsd-license.php.
+Apache Geode includes a number of components and libraries with separate
+copyright notices and license terms. Your use of those components are
+subject to the terms and conditions of the following licenses.
 
 ---------------------------------------------------------------------------
-reset.css (http://meyerweb.com/eric/tools/css/reset/)
+The BSD 3-Clause License (http://opensource.org/licenses/BSD-3-Clause)
 ---------------------------------------------------------------------------
-This product bundles reset.css which is available in the public domain.
 
----------------------------------------------------------------------------
-tooltip.js (http://flowplayer.org/tools/tooltip/)
----------------------------------------------------------------------------
-This product bundles tooltip.css which is available in the public domain.
+Apache Geode bundles the following files under the BSD 3-Clause License:
 
----------------------------------------------------------------------------
-scala-reflect (http://www.scala-lang.org/) org.scala-lang:scala-reflect:2.10.0
----------------------------------------------------------------------------
-This product bundles scala-reflect which is available under a BSD-like license.  
-For details see http://www.scala-lang.org/downloads/license.html.
+  - ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html),
+    Copyright (c) 2002-2007 Marc Prud'hommeaux.
+  - Antlr v2.7.7 (http://www.antlr.org), Copyright (c) 2012 Terrence Parr
+    and Sam Harwell
+  - highlight.js v7.3 (https://highlightjs.org), Copyright (c) 2006, Ivan
+    Sagalaev
+  - JLine v2.12 (http://jline.sourceforge.net), Copyright (c) 2002-2006,
+    Marc Prud'hommeaux <mw...@cornell.edu>
+  - jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/),
+    Copyright (c) 2012 Splunk Inc.
+  - Paranamer v2.3 (http://github.com/paul-hammant/paranamer), Copyright
+    (c) 2006 Paul Hammant and Thoughtworks Inc.
+  - Protocol Buffers (https://github.com/google/protobuf), Copyright (c)
+    2014 Google Inc.
+  - scala-library v2.10.0 (http://www.scala-lang.org), Copyright (c)
+    2002-2016 EPFL, Copyright (c) 2011-2016 Lightbend, Inc. (formerly
+    Typesafe, Inc.)
+  - scala-reflect v2.10.0 (http://www.scala-lang.org), Copyright (c)
+    2002-2016 EPFL, Copyright (c) 2011-2016 Lightbend, Inc. (formerly
+    Typesafe, Inc.)
+
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
 
----------------------------------------------------------------------------
-scala-library (http://www.scala-lang.org/) org.scala-lang:scala-library:2.10.0
----------------------------------------------------------------------------
-This product bundles scala-library which is available under a BSD-like license.  
-For details see http://www.scala-lang.org/downloads/license.html.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+---------------------------------------------------------------------------
+The CDDL License (https://opensource.org/licenses/CDDL-1.0)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following file under the CDDL license:
+
+  - javax.activation v1.1.1
+    (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp),
+  - javax.mail v1.4.5 (http://www.oracle.com/)
+  - javax.resource v 1.7 (https://glassfish.java.net/)
+  - javax.servlet v3.1.0 (https://glassfish.java.net/)
+  - javax.transaction v1.2 (https://glassfish.java.net/)
+
+1. Definitions.
+  1.1. Contributor means each individual or entity that creates or
+  contributes to the creation of Modifications.
+
+  1.2. Contributor Version means the combination of the Original Software,
+  prior Modifications used by a Contributor (if any), and the Modifications
+  made by that particular Contributor.
+
+  1.3. Covered Software means (a) the Original Software, or (b)
+  Modifications, or (c) the combination of files containing Original Software
+  with files containing Modifications, in each case including portions
+  thereof.
+
+  1.4. Executable means the Covered Software in any form other than Source
+  Code.
+
+  1.5. Initial Developer means the individual or entity that first makes
+  Original Software available under this License.
+
+  1.6. Larger Work means a work which combines Covered Software or portions
+  thereof with code not governed by the terms of this License.
+
+  1.7. License means this document.
+
+  1.8. Licensable means having the right to grant, to the maximum extent
+  possible, whether at the time of the initial grant or subsequently
+  acquired, any and all of the rights conveyed herein.
+
+  1.9. Modifications means the Source Code and Executable form of any of
+  the following:
+
+    A. Any file that results from an addition to, deletion from or
+    modification of the contents of a file containing Original Software or
+    previous Modifications;
+
+    B. Any new file that contains any part of the Original Software or
+    previous Modification; or
+
+    C. Any new file that is contributed or otherwise made available under
+    the terms of this License.
+
+  1.10. Original Software means the Source Code and Executable form of
+  computer software code that is originally released under this License.
+
+  1.11. Patent Claims means any patent claim(s), now owned or hereafter
+  acquired, including without limitation, method, process, and apparatus
+  claims, in any patent Licensable by grantor.
+
+  1.12. Source Code means (a) the common form of computer software code in
+  which modifications are made and (b) associated documentation included in
+  or with such code.
+
+  1.13. You (or Your) means an individual or a legal entity exercising
+  rights under, and complying with all of the terms of, this License. For
+  legal entities, You includes any entity which controls, is controlled by,
+  or is under common control with You. For purposes of this definition,
+  control means (a) the power, direct or indirect, to cause the direction
+  or management of such entity, whether by contract or otherwise, or (b)
+  ownership of more than fifty percent (50%) of the outstanding shares or
+  beneficial ownership of such entity.
+
+2. License Grants.
+  2.1. The Initial Developer Grant.
+  Conditioned upon Your compliance with Section 3.1 below and subject to
+  third party intellectual property claims, the Initial Developer hereby
+  grants You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or trademark)
+    Licensable by Initial Developer, to use, reproduce, modify, display,
+    perform, sublicense and distribute the Original Software (or portions
+    thereof), with or without Modifications, and/or as part of a Larger
+    Work; and
+
+    (b) under Patent Claims infringed by the making, using or selling of
+    Original Software, to make, have made, use, practice, sell, and offer
+    for sale, and/or otherwise dispose of the Original Software (or
+    portions thereof).
+
+    (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+    the date Initial Developer first distributes or otherwise makes the
+    Original Software available to a third party under the terms of this
+    License.
+
+    (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
+    (1) for code that You delete from the Original Software, or (2) for
+    infringements caused by: (i) the modification of the Original Software,
+    or (ii) the combination of the Original Software with other software or
+    devices.
+
+  2.2. Contributor Grant.
+  Conditioned upon Your compliance with Section 3.1 below and subject to
+  third party intellectual property claims, each Contributor hereby grants
+  You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or trademark)
+    Licensable by Contributor to use, reproduce, modify, display, perform,
+    sublicense and distribute the Modifications created by such Contributor
+    (or portions thereof), either on an unmodified basis, with other
+    Modifications, as Covered Software and/or as part of a Larger Work; and
+
+    (b) under Patent Claims infringed by the making, using, or selling of
+    Modifications made by that Contributor either alone and/or in
+    combination with its Contributor Version (or portions of such
+    combination), to make, use, sell, offer for sale, have made, and/or
+    otherwise dispose of: (1) Modifications made by that Contributor (or
+    portions thereof); and (2) the combination of Modifications made by
+    that Contributor with its Contributor Version (or portions of such
+    combination).
+
+    (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on
+    the date Contributor first distributes or otherwise makes the
+    Modifications available to a third party.
+
+    (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
+    (1) for any code that Contributor has deleted from the Contributor
+    Version; (2) for infringements caused by: (i) third party modifications
+    of Contributor Version, or (ii) the combination of Modifications made
+    by that Contributor with other software (except as part of the
+    Contributor Version) or other devices; or (3) under Patent Claims
+    infringed by Covered Software in the absence of Modifications made by
+    that Contributor.
+
+3. Distribution Obligations.
+  3.1. Availability of Source Code.
+  Any Covered Software that You distribute or otherwise make available in
+  Executable form must also be made available in Source Code form and that
+  Source Code form must be distributed only under the terms of this
+  License. You must include a copy of this License with every copy of the
+  Source Code form of the Covered Software You distribute or otherwise make
+  available. You must inform recipients of any such Covered Software in
+  Executable form as to how they can obtain such Covered Software in Source
+  Code form in a reasonable manner on or through a medium customarily used
+  for software exchange.
+
+  3.2. Modifications.
+  The Modifications that You create or to which You contribute are governed
+  by the terms of this License. You represent that You believe Your
+  Modifications are Your original creation(s) and/or You have sufficient
+  rights to grant the rights conveyed by this License.
+
+  3.3. Required Notices.
+  You must include a notice in each of Your Modifications that identifies
+  You as the Contributor of the Modification. You may not remove or alter
+  any copyright, patent or trademark notices contained within the Covered
+  Software, or any notices of licensing or any descriptive text giving
+  attribution to any Contributor or the Initial Developer.
+
+  3.4. Application of Additional Terms.
+  You may not offer or impose any terms on any Covered Software in Source
+  Code form that alters or restricts the applicable version of this License
+  or the recipients rights hereunder. You may choose to offer, and to
+  charge a fee for, warranty, support, indemnity or liability obligations
+  to one or more recipients of Covered Software. However, you may do so
+  only on Your own behalf, and not on behalf of the Initial Developer or
+  any Contributor. You must make it absolutely clear that any such
+  warranty, support, indemnity or liability obligation is offered by You
+  alone, and You hereby agree to indemnify the Initial Developer and every
+  Contributor for any liability incurred by the Initial Developer or such
+  Contributor as a result of warranty, support, indemnity or liability
+  terms You offer.
+
+  3.5. Distribution of Executable Versions.
+  You may distribute the Executable form of the Covered Software under the
+  terms of this License or under the terms of a license of Your choice,
+  which may contain terms different from this License, provided that You
+  are in compliance with the terms of this License and that the license for
+  the Executable form does not attempt to limit or alter the recipients
+  rights in the Source Code form from the rights set forth in this License.
+  If You distribute the Covered Software in Executable form under a
+  different license, You must make it absolutely clear that any terms which
+  differ from this License are offered by You alone, not by the Initial
+  Developer or Contributor. You hereby agree to indemnify the Initial
+  Developer and every Contributor for any liability incurred by the Initial
+  Developer or such Contributor as a result of any such terms You offer.
+
+  3.6. Larger Works.
+  You may create a Larger Work by combining Covered Software with other
+  code not governed by the terms of this License and distribute the Larger
+  Work as a single product. In such a case, You must make sure the
+  requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+  4.1. New Versions.
+  Sun Microsystems, Inc. is the initial license steward and may publish
+  revised and/or new versions of this License from time to time. Each
+  version will be given a distinguishing version number. Except as provided
+  in Section 4.3, no one other than the license steward has the right to
+  modify this License.
+
+  4.2. Effect of New Versions.
+  You may always continue to use, distribute or otherwise make the Covered
+  Software available under the terms of the version of the License under
+  which You originally received the Covered Software. If the Initial
+  Developer includes a notice in the Original Software prohibiting it from
+  being distributed or otherwise made available under any subsequent
+  version of the License, You must distribute and make the Covered Software
+  available under the terms of the version of the License under which You
+  originally received the Covered Software. Otherwise, You may also choose
+  to use, distribute or otherwise make the Covered Software available under
+  the terms of any subsequent version of the License published by the
+  license steward.
+
+  4.3. Modified Versions.
+  When You are an Initial Developer and You want to create a new license
+  for Your Original Software, You may create and use a modified version of
+  this License if You: (a) rename the license and remove any references to
+  the name of the license steward (except to note that the license differs
+  from this License); and (b) otherwise make it clear that the license
+  contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+  COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS,
+  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+  WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+  DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
+  SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY
+  RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME
+  THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS
+  DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO
+  USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+  DISCLAIMER.
+
+6. TERMINATION.
+  6.1. This License and the rights granted hereunder will terminate
+  automatically if You fail to comply with terms herein and fail to cure
+  such breach within 30 days of becoming aware of the breach. Provisions
+  which, by their nature, must remain in effect beyond the termination of
+  this License shall survive.
+
+  6.2. If You assert a patent infringement claim (excluding declaratory
+  judgment actions) against Initial Developer or a Contributor (the Initial
+  Developer or Contributor against whom You assert such claim is referred
+  to as Participant) alleging that the Participant Software (meaning the
+  Contributor Version where the Participant is a Contributor or the
+  Original Software where the Participant is the Initial Developer)
+  directly or indirectly infringes any patent, then any and all rights
+  granted directly or indirectly to You by such Participant, the Initial
+  Developer (if the Initial Developer is not the Participant) and all
+  Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60
+  days notice from Participant terminate prospectively and automatically at
+  the expiration of such 60 day notice period, unless if within such 60 day
+  period You withdraw Your claim with respect to the Participant Software
+  against such Participant either unilaterally or pursuant to a written
+  agreement with Participant.
+
+  6.3. In the event of termination under Sections 6.1 or 6.2 above, all end
+  user licenses that have been validly granted by You or any distributor
+  hereunder prior to termination (excluding licenses granted to You by any
+  distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+  UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+  NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+  ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+  SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+  INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+  INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF
+  GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL
+  OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+  INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY
+  SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM
+  SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
+  LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION
+  OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION
+  MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+  The Covered Software is a commercial item, as that term is defined in 48
+  C.F.R. 2.101 (Oct. 1995), consisting of commercial computer software (as
+  that term is defined at 48 C.F.R.  252.227-7014(a)(1)) and commercial
+  computer software documentation as such terms are used in 48 C.F.R.
+  12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
+  227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
+  acquire Covered Software with only those rights set forth herein. This
+  U.S. Government Rights clause is in lieu of, and supersedes, any other
+  FAR, DFAR, or other clause or provision that addresses Government rights
+  in computer software under this License.
+
+9. MISCELLANEOUS.
+  This License represents the complete agreement concerning subject matter
+  hereof. If any provision of this License is held to be unenforceable,
+  such provision shall be reformed only to the extent necessary to make it
+  enforceable. This License shall be governed by the law of the
+  jurisdiction specified in a notice contained within the Original Software
+  (except to the extent applicable law, if any, provides otherwise),
+  excluding such jurisdictions conflict-of-law provisions. Any litigation
+  relating to this License shall be subject to the jurisdiction of the
+  courts located in the jurisdiction and venue specified in a notice
+  contained within the Original Software, with the losing party responsible
+  for costs, including, without limitation, court costs and reasonable
+  attorneys fees and expenses. The application of the United Nations
+  Convention on Contracts for the International Sale of Goods is expressly
+  excluded. Any law or regulation which provides that the language of a
+  contract shall be construed against the drafter shall not apply to this
+  License. You agree that You alone are responsible for compliance with the
+  United States export administration regulations (and the export control
+  laws and regulation of any other countries) when You use, distribute or
+  otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+  As between Initial Developer and the Contributors, each party is
+  responsible for claims and damages arising, directly or indirectly, out
+  of its utilization of rights under this License and You agree to work
+  with Initial Developer and Contributors to distribute such responsibility
+  on an equitable basis. Nothing herein is intended or shall be deemed to
+  constitute any admission of liability.
+
+
+---------------------------------------------------------------------------
+The ISC License (http://opensource.org/licenses/ISC)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following file under the ISC license:
+
+  - Shred (https://github.com/pandastrike/shred), Copyright (c) 2012-2015
+    Panda Strike, LLC and Dan Yoder <da...@pandastrike.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+---------------------------------------------------------------------------
+The JSON License (http://www.json.org/license.html)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following file under the JSON license:
+
+  - JSON (http://www.json.org), Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
+---------------------------------------------------------------------------
+The MIT License (http://opensource.org/licenses/mit-license.html)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the MIT license:
+
+  - Backbone.js v0.9.2 (http://backbonejs.org), Copyright (c) 2010-2012
+    Jeremy Ashkenas, DocumentCloud Inc.
+  - Bootflat v1.0.1 (http://bootflat.github.io/), Copyright (c) 2014
+    bootflat
+  - Bootstrap v3.0.0 (http://getbootstrap.com/), Copyright (c) 2011-2016
+    Twitter, Inc.
+  - Font Awesome v4.0.3 (code files) (http://fontawesome.io), Copyright (c)
+    Dave Gandy
+  - Handlebars v1.0.0 (http://handlebarsjs.com), Copyright (c) 2011, Yehuda
+    Katz
+  - HeadJS v0.96 (http://headjs.com/), Copyright (c) 2013 Tero Piirainen
+    (tipiirai)
+  - HTML5 Shiv v3.6.2pre (https://github.com/aFarkas/html5shiv), Copyright
+    (c) 2014 Alexander Farkas (aFarkas)
+  - iCheck v0.8 (http://icheck.fronteed.com/), Copyright (c) 2013 Damir
+    Foy, http://damirfoy.com
+  - JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c)
+    2004-2015 Paul R. Holser, Jr.
+  - jQuery JavaScript Library v.1.7.2 (https://jquery.com), Copyright (c)
+    jQuery Foundation and other contributors, http://jquery.org
+  - jQuery BBQ v1.2.1 (http://benalman.com/projects/jquery-bbq-plugin/),
+    Copyright (c) 2010, "Cowboy" Ben Alman
+  - jQuery.i18n.properties v1.0.x
+    (https://github.com/jquery-i18n-properties/jquery-i18n-properties),
+    Copyright (c) 2011 Nuno Miguel Correia Serra Fernandes
+    <nf...@gmail.com>
+  - jQuery jqGrid v4.4.0 (https://plugins.jquery.com/jqGrid/), Copyright
+    (c) 2008 Tony Tomov, tony@trirand.com
+  - jQuery Mouse Wheel v3.0.6 (http://brandonaaron.net), Copyright (c) 2011
+    Brandon Aaron
+  - jQuery Placeholder (http://webcloud.se), Copyright (c) 2010 Daniel
+    Stocks
+  - jQuery-slideto (https://github.com/Sleavely/jQuery-slideto), Copyright
+    (c) 2015 Joakim Hedlund
+  - jQuery UI MultiSelect Widget v1.14pre
+    (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/),
+    Copyright (c) 2011 Eric Hynds
+  - jQuery UI v1.8.18 (http://jqueryui.com/about), Copyright (c) jQuery
+    Foundation and other contributors, http://jquery.org
+  - jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle),
+    Copyright (c) 2011 Wilhelm Murdoch <wi...@gmail.com>,
+    TheDrunkenEpic <http://www.thedrunkenepic.com>
+  - jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010
+    Kelvin Luck
+  - matchMedia() polyfill (https://github.com/paulirish/matchMedia.js),
+    Copyright (c) 2012 Scott Jehl
+  - Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/),
+    Copyright (c) Nicolas Gallagher and Jonathan Neal
+  - Respond.js v1.1.0 (https://github.com/scottjehl/Respond), Copyright (c)
+    2012 Scott Jehl
+  - SLF4J API v1.7.7 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch
+  - Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
+    2015 Nathan Cahill
+  - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012
+    Denis Howlett <de...@isocra.com>, Nick Lombard <nickl>, and other
+    contributors
+  - Timeago v1.3.0 (http://timeago.yarp.com), Copyright (c) 2008-2015 Ryan
+    McGeary
+  - Underscore (http://underscorejs.org), Copyright (c) 2009-2016 Jeremy
+    Ashkenas, DocumentCloud, and Investigative Reporters & Editors
+  - zTree v3.5.02 (http://zTree.me/), Copyright (c) 2010 Hunter.z
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+---------------------------------------------------------------------------
+The MX4J License (http://mx4j.sourceforge.net/docs/ch01s06.html)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following file under the MIT license:
+
+  - MX4J v3.0.1 (http://mx4j.sourceforge.net), Copyright (c) MX4J
+
+Version 1.0
+
+Copyright (c) 2001-2004 by the MX4J contributors.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any,
+must include the following acknowledgment:
+ "This product includes software developed by the MX4J project
+ (http://mx4j.sourceforge.net)."
+Alternately, this acknowledgment may appear in the software itself, if and
+wherever such third-party acknowledgments normally appear.
+
+4. The name "MX4J" must not be used to endorse or promote products derived
+from this software without prior written permission.
+
+For written permission, please contact biorn_steedom [at] users [dot]
+sourceforge [dot] net
+
+5. Products derived from this software may not be called "MX4J", nor may
+"MX4J" appear in their name, without prior written permission of Simone
+Bordet.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE MX4J CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This software consists of voluntary contributions made by many
+individuals on behalf of the MX4J project. For more information on
+MX4J, please see the MX4J website (http://mx4j.sourceforge.net/).
+
+---------------------------------------------------------------------------
+Public Domain
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files, which are available in the public
+domain:
+
+  - CompactConcurrentHashSet2, derived from JSR-166 ConcurrentHashMap v1.43
+    (http://gee.cs.oswego.edu/dl/concurrency-interest).
+  - Reset CSS (http://meyerweb.com/eric/tools/css/reset/)
+  - tooltip.js v1.2.6 (https://github.com/jquerytools/jquerytools)
+
+
+---------------------------------------------------------------------------
+SIL Open Font License (https://opensource.org/licenses/OFL-1.1)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the SIL OFL 1.1 license:
+
+  - Font Awesome (font files) (http://fontawesome.io) Copyright (c) Dave
+    Gandy
 
----------------------------------------------------------------------------
-shred (https://github.com/pandastrike/shred)
----------------------------------------------------------------------------
-This product bundles shred which is available under an MIT or ISC license.  
-For details see https://github.com/pandastrike/shred/blob/master/LICENSE.
+Version 1.1 - 26 February 2007
 
----------------------------------------------------------------------------
-SLF4J API (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.7
----------------------------------------------------------------------------
-This product bundles SLF4J API which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
 
----------------------------------------------------------------------------
-underscore (http://underscorejs.org)
----------------------------------------------------------------------------
-This product bundles underscore which is available under an MIT license.  
-For details see http://www.opensource.org/licenses/mit-license.php.
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
 
----------------------------------------------------------------------------
-jquery jqGrid (https://plugins.jquery.com/jqGrid/)
----------------------------------------------------------------------------
-This product bundles jqGrid which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
 
----------------------------------------------------------------------------
-html5.js (https://github.com/aFarkas/html5shiv)
----------------------------------------------------------------------------
-This product bundles html5 which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
 
----------------------------------------------------------------------------
-jquery.i18n.properties (https://github.com/jquery-i18n-properties/jquery-i18n-properties)
----------------------------------------------------------------------------
-This product bundles jQuery i18n which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
 
----------------------------------------------------------------------------
-jquery.jscrollpane (http://jscrollpane.kelvinluck.com/)
----------------------------------------------------------------------------
-This product bundles jquery.jscrollpane which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
 
----------------------------------------------------------------------------
-jquery.mousewheel (http://brandonaaron.net)
----------------------------------------------------------------------------
-This product bundles jquery.mousewheel which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
 
----------------------------------------------------------------------------
-jquery.placeholder (http://webcloud.se)
----------------------------------------------------------------------------
-This product bundles jquery.placeholder which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
 
----------------------------------------------------------------------------
-jquery.tablednd (https://github.com/isocra/TableDnD)
----------------------------------------------------------------------------
-This product bundles jquery.tablednd which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jquery.timeago (http://timeago.yarp.com/)
----------------------------------------------------------------------------
-This product bundles jquery.timeago which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jquery.ztree (http://zTree.me/)
----------------------------------------------------------------------------
-This product bundles jquery.ztree which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jquery.multiselect (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/)
----------------------------------------------------------------------------
-This product bundles jQuery.multiselect which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jquery.ui (http://jqueryui.com/about)
----------------------------------------------------------------------------
-This product bundles jquery UI which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-jquery.sparkline.js (http://omnipotent.net/jquery.sparkline/)
----------------------------------------------------------------------------
-This product bundles jquery.sparkline which is available under a BSD-like license.
-For details see http://opensource.org/licenses/BSD-3-Clause.
-
----------------------------------------------------------------------------
-split.js (https://github.com/nathancahill/Split.js)
----------------------------------------------------------------------------
-This product bundles split.js which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
-
----------------------------------------------------------------------------
-MX4J (http://mx4j.sourceforge.net)
----------------------------------------------------------------------------
-This product bundles MX4JModelMBean.java which is available under the MX4J license.
-For details see http://mx4j.sourceforge.net/docs/ch01s06.html.
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.


[07/24] incubator-geode git commit: GEODE-704: Added check/wait for interest re-registration to complete after cache-server is restarted.

Posted by ji...@apache.org.
GEODE-704: Added check/wait for interest re-registration to complete after cache-server is restarted.

CI failure: HAInterestPart2DUnitTest.testRefreshEntriesFromPrimaryWhenDSMDetectsServerLive

In the test client re-registers the interests after cache-server is started and expects
entries to be refreshed (it stops and starts the cache-server, without closing the cache)...
It looks like we are not waiting enough to see the client registration is complete
and events are refreshed (the re-registratin happens with redundancy satisfier thread).

Added wait/check to see interest registration is complete before check is done for the
cache entries...

Testing:
Run the test 100+ times.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a7739887
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a7739887
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a7739887

Branch: refs/heads/feature/GEODE-17-2
Commit: a77398877394a75afc8e0d09598146ccc31eeb3e
Parents: 12efa36
Author: agingade <ag...@pivotal.io>
Authored: Thu Apr 7 10:23:32 2016 -0700
Committer: agingade <ag...@pivotal.io>
Committed: Fri Apr 8 12:36:49 2016 -0700

----------------------------------------------------------------------
 .../internal/cache/tier/sockets/HAInterestPart2DUnitTest.java      | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7739887/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index 02c3e71..8a30f08 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -158,6 +158,8 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
     verifyDeadAndLiveServers(0, 1);
     final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
     assertNotNull(r1);
+    // Verify for interest registration after cache-server is started.
+    server1.invoke(() -> HAInterestTestCase.verifyInterestRegistration());
 
     WaitCriterion wc = new WaitCriterion() {
       private String excuse;


[09/24] incubator-geode git commit: GEODE-904 Updates tooltip.js link to a working one.

Posted by ji...@apache.org.
GEODE-904 Updates tooltip.js link to a working one.

http://flowplayer.org/tools/tooltip is in the packaged license but is
an outdated and broken link. Changed it to
https://github.com/jquerytools/jquerytools. GEODE-904


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/83fd4bfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/83fd4bfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/83fd4bfa

Branch: refs/heads/feature/GEODE-17-2
Commit: 83fd4bfadac97c1357f7fc478cd1dd968371a4cc
Parents: 6ea0b3b
Author: Joey McAllister <jm...@pivotal.io>
Authored: Wed Apr 6 11:15:09 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:54:26 2016 -0700

----------------------------------------------------------------------
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/83fd4bfa/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 896f7bc..f719a08 100644
--- a/LICENSE
+++ b/LICENSE
@@ -399,7 +399,7 @@ This product bundles Respond, which is available under an MIT license.
 For details, see http://opensource.org/licenses/mit-license.html.
 
 ---------------------------------------------------------------------------
-tooltip.js (http://flowplayer.org/tools/tooltip/)
+tooltip.js (https://github.com/jquerytools/jquerytools)
 ---------------------------------------------------------------------------
 This product bundles tooltip.css, which is available in the public domain.
 


[06/24] incubator-geode git commit: GEODE-914: Remove log4j from NOTICE

Posted by ji...@apache.org.
GEODE-914: Remove log4j from NOTICE

Commit 5342935d301a4026b289637885e9236414feeb78 cleaned up log4j
code so this no longer needs to be declared in NOTICE.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5a291b67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5a291b67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5a291b67

Branch: refs/heads/feature/GEODE-17-2
Commit: 5a291b67932d29733d3805303716cc032369d395
Parents: 8a78f0f
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Apr 7 11:28:54 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Apr 8 12:27:29 2016 -0700

----------------------------------------------------------------------
 NOTICE | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5a291b67/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 8e7485f..4f7b479 100644
--- a/NOTICE
+++ b/NOTICE
@@ -7,9 +7,6 @@ The Apache Software Foundation (http://www.apache.org/).
 
 The following NOTICEs pertain to software distributed with this project.
 
-Apache Log4j
-Copyright 1999-2014 Apache Software Foundation
-
 stream-lib
 Copyright 2016 AddThis