From 4c2aef35c2554c90932657dda63e918dcf0dbd66 Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Sat, 24 Jan 2015 19:38:32 +0000
Subject: [PATCH] Added <memoryAnnc>

---
 CDT-memory-v0_8_0.xsd | 71 +++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 26 deletions(-)

diff --git a/CDT-memory-v0_8_0.xsd b/CDT-memory-v0_8_0.xsd
index 0dbe5f6..aa48fe9 100644
--- a/CDT-memory-v0_8_0.xsd
+++ b/CDT-memory-v0_8_0.xsd
@@ -23,33 +23,52 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	    attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
 	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
 	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	
-  <xs:element name="memory">
-	  <xs:complexType>
-  		<xs:complexContent>
-	  	  <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <!-- Resource Specific Attributes -->
-          <xs:sequence>
-            <xs:element name="memAvailable" type="xs:unsignedLong" />
-            <xs:element name="memTotal" type="xs:unsignedLong" />
-          
-		        <!-- Child Resources -->
-            <xs:choice minOccurs="0" maxOccurs="1">
-              <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-              <xs:choice minOccurs="1" maxOccurs="unbounded">
-                <xs:element ref="m2m:subscription" />   
-              </xs:choice>
-            </xs:choice>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
-	  </xs:complexType>
+
+	<xs:element name="memory">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="memAvailable" type="xs:unsignedLong" />
+						<xs:element name="memTotal" type="xs:unsignedLong" />
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="memoryAnnc">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="memAvailable" type="xs:unsignedLong" minOccurs="0" />
+						<xs:element name="memTotal" type="xs:unsignedLong" minOccurs="0" />
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
 	</xs:element>
 </xs:schema>
-- 
GitLab