diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index 7349d96e7cfb31c6f91648419e7a633164d98432..54ed582d79a87d05c50cd1a21cbd4f3e66062cfe 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.xsd
@@ -36,6 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
<xs:include schemaLocation="CDT-timeSeries.xsd" />
<xs:include schemaLocation="CDT-trafficPattern.xsd" />
+ <xs:include schemaLocation="CDT-semanticMashupInstance.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -68,6 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:trafficPattern" />
<xs:element ref="m2m:sg_flexContainerResource" />
+ <xs:element ref="m2m:semanticMashupInstance" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -111,6 +113,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:trafficPatternAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
+ <xs:element ref="m2m:semanticMashupInstance" />
+ <xs:element ref="m2m:semanticMashupInstanceAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd
index acaf4c0b785fd93e7960d66b27878e6c609a35ae..0a3879c637c2eed918c60dc5da0220a90b94cb2c 100644
--- a/CDT-CSEBase.xsd
+++ b/CDT-CSEBase.xsd
@@ -48,7 +48,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-token.xsd" />
<xs:include schemaLocation="CDT-authorizationDecision.xsd" />
<xs:include schemaLocation="CDT-authorizationPolicy.xsd" />
- <xs:include schemaLocation="CDT-authorizationInformation.xsd" />
+ <xs:include schemaLocation="CDT-authorizationInformation.xsd" />
+ <xs:include schemaLocation="CDT-ontologyRepository.xsd" />
+ <xs:include schemaLocation="CDT-semanticMashupJobProfile.xsd" />
+ <xs:include schemaLocation="CDT-semanticMashupInstance.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
@@ -97,7 +100,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:authorizationDecision" />
<xs:element ref="m2m:authorizationPolicy" />
- <xs:element ref="m2m:authorizationInformation" />
+ <xs:element ref="m2m:authorizationInformation" />
+ <xs:element ref="m2m:ontologyRepository" />
+ <xs:element ref="m2m:semanticMashupJobProfile" />
+ <xs:element ref="m2m:semanticMashupInstance" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index cb2f41a702a686ec95ca3c0bb5cece7cec25504b..79cc5185d950c8e2d4231dd80370d1c9f30c9d04 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -409,6 +409,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="locationTargetID">
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base='m2m:nodeID' />
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:restriction base='m2m:externalID' />
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:restriction base="xs:string" >
+ <xs:pattern value="([0-9]*)" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
<!--********************** -->
<!-- oneM2M Complex Types -->
<!--********************** -->
@@ -500,10 +516,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0"/>
<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
-
<!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? -->
<xs:complexType name="primitiveContent">
<xs:choice minOccurs="0" >
@@ -525,12 +541,36 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
<xs:element name="labels" type="m2m:labels" minOccurs="0" />
- <xs:element name="labelsQuery" type="xs:string" minOccurs="0" />
- <xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />
+ <xs:element name="childLabels" type="m2m:labels" minOccurs="0" />
+ <xs:element name="parentLabels" type="m2m:labels" minOccurs="0" />
+ <xs:element name="labelsQuery" type="xs:string" minOccurs="0" />
+ <xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />
+ <xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:resourceType" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="parentResourceType" minOccurs="0" maxOccurs="1" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:resourceType" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="childAttribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="parentAttribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" />
<xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="semanticsFilter" type="m2m:sparql" minOccurs="0" maxOccurs="unbounded" />
@@ -539,6 +579,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="contentFilterQuery" type="xs:string" minOccurs="0" />
<xs:element name="level" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="offset" type="xs:positiveInteger" minOccurs="0" />
+ <xs:element name="applyRelativePath" type="xs:anyURI" minOccurs="0" />
+
</xs:sequence>
</xs:complexType>
diff --git a/CDT-deviceInfo.xsd b/CDT-deviceInfo.xsd
index b411bba73cc9bcd43a14bb4cce080b047c65be4e..dcf431450b2e72513d8a3884f124e4096f201804 100644
--- a/CDT-deviceInfo.xsd
+++ b/CDT-deviceInfo.xsd
@@ -39,11 +39,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:element name="deviceLabel" type="xs:string" />
<xs:element name="manufacturer" type="xs:string" />
+ <xs:element name="manufacturerDetailsLink" type="xs:string" minOccurs="0"/>
+ <xs:element name="manufacturingDate" type="m2m:timestamp" minOccurs="0"/>
<xs:element name="model" type="xs:string" />
+ <xs:element name="subModel" type="xs:string" minOccurs="0"/>
<xs:element name="deviceType" type="xs:string" />
- <xs:element name="fwVersion" type="xs:string" />
- <xs:element name="swVersion" type="xs:string" />
- <xs:element name="hwVersion" type="xs:string" />
+ <xs:element name="deviceName" type="xs:string" minOccurs="0"/>
+ <xs:element name="fwVersion" type="xs:string" minOccurs="0"/>
+ <xs:element name="swVersion" type="xs:string" minOccurs="0"/>
+ <xs:element name="hwVersion" type="xs:string" minOccurs="0"/>
+ <xs:element name="osVersion" type="xs:string" minOccurs="0"/>
+ <xs:element name="country" type="xs:string" minOccurs="0"/>
+ <xs:element name="location" type="xs:string" minOccurs="0"/>
+ <xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
+ <xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
+ <xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
+ <!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing -->
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -65,12 +76,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:element name="deviceLabel" type="xs:string" minOccurs="0" />
<xs:element name="manufacturer" type="xs:string" minOccurs="0" />
+ <xs:element name="manufacturerDetailsLink" type="xs:string" minOccurs="0"/>
+ <xs:element name="manufacturingDate" type="m2m:timestamp" minOccurs="0"/>
<xs:element name="model" type="xs:string" minOccurs="0" />
+ <xs:element name="subModel" type="xs:string" minOccurs="0"/>
<xs:element name="deviceType" type="xs:string" minOccurs="0" />
+ <xs:element name="deviceName" type="xs:string" minOccurs="0"/>
<xs:element name="fwVersion" type="xs:string" minOccurs="0" />
<xs:element name="swVersion" type="xs:string" minOccurs="0" />
<xs:element name="hwVersion" type="xs:string" minOccurs="0" />
-
+ <xs:element name="osVersion" type="xs:string" minOccurs="0"/>
+ <xs:element name="country" type="xs:string" minOccurs="0"/>
+ <xs:element name="location" type="xs:string" minOccurs="0"/>
+ <xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
+ <xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
+ <xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
+ <!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing -->
+
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index d21af2983b976a4ac136e60763c39c968b138dbe..ebe7ad4803b902966d1836a4c2fd2733e727f83c 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -105,7 +105,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- authorizationPolicy -->
<xs:enumeration value="36" />
<!-- authorizationInformation -->
- <xs:enumeration value="37" />
+ <xs:enumeration value="37" />
+ <!-- ontologyRepository -->
+ <xs:enumeration value="38" />
+ <!-- ontology -->
+ <xs:enumeration value="39" />
+ <!-- semanticMashupJobProfile -->
+ <xs:enumeration value="40" />
+ <!-- semanticMashupInstance -->
+ <xs:enumeration value="41" />
+ <!-- semanticMashupResult -->
+ <xs:enumeration value="42" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -137,7 +147,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- trafficPatternAnnc -->
<xs:enumeration value="10033" />
<!-- dynamicAuthorizationConsultationAnnc -->
- <xs:enumeration value="10034" />
+ <xs:enumeration value="10034" />
+ <!-- ontologyRepositoryAnnc -->
+ <xs:enumeration value="10038" />
+ <!-- ontologyAnnc -->
+ <xs:enumeration value="10039" />
+ <!-- semanticMashupJobProfileAnnc -->
+ <xs:enumeration value="10040" />
+ <!-- semanticMashupInstanceAnnc -->
+ <xs:enumeration value="10041" />
</xs:restriction>
</xs:simpleType>
@@ -245,6 +263,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="8" />
<!-- Modified Attributes -->
<xs:enumeration value="9" />
+ <!-- semantic content -->
+ <xs:enumeration value="10" />
</xs:restriction>
</xs:simpleType>
@@ -320,7 +340,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- ESPRIM_IMPERSONATION_ERROR -->
<xs:enumeration value="4116" />
<!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
- <xs:enumeration value="4117" />
+ <xs:enumeration value="4117" />
+ <!-- ONTOLOGY_NOT_AVAILABLE -->
+ <xs:enumeration value="4118" />
+ <!-- LINKED_SEMANTICS_NOT_AVAILABLE -->
+ <xs:enumeration value="4119" />
+ <!-- INVALID_SEMANTICS -->
+ <xs:enumeration value="4120" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
@@ -374,7 +400,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- ALREADY_COMPLETE -->
<xs:enumeration value="6028" />
<!-- MGMT_COMMAND_NOT_CANCELLABLE -->
- <xs:enumeration value="6029" />
+ <xs:enumeration value="6029" />
+ <!-- XTERNAL_OBJECT_NOT_REACHABLE_BEFORE_RQET_TIMEOUT -->
+ <xs:enumeration value="6030" />
+ <!-- EXTERNAL_OBJECT_NOT_REACHABLE_BEFORE_OET_TIMEOUT -->
+ <xs:enumeration value="6031" />
</xs:restriction>
</xs:simpleType>
@@ -474,7 +504,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- authorizationPolicy -->
<xs:enumeration value="36" />
<!-- authorizationInformation -->
- <xs:enumeration value="37" />
+ <xs:enumeration value="37" />
+ <!-- ontologyRepository -->
+ <xs:enumeration value="38" />
+ <!-- ontology -->
+ <xs:enumeration value="39" />
+ <!-- semanticMashupJobProfile -->
+ <xs:enumeration value="40" />
+ <!-- semanticMashupInstance -->
+ <xs:enumeration value="41" />
+ <!-- semanticMashupResult -->
+ <xs:enumeration value="42" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -506,11 +546,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- trafficPatternAnnc -->
<xs:enumeration value="10033" />
<!-- dynamicAuthorizationConsultationAnnc -->
- <xs:enumeration value="10034" />
+ <xs:enumeration value="10034" />
+ <!-- ontologyRepositoryAnnc -->
+ <xs:enumeration value="10038" />
+ <!-- ontologyAnnc -->
+ <xs:enumeration value="10039" />
+ <!-- semanticMashupJobProfileAnnc -->
+ <xs:enumeration value="10040" />
+ <!-- semanticMashupInstanceAnnc -->
+ <xs:enumeration value="10041" />
<!-- oldest -->
<xs:enumeration value="20001" />
<!-- latest -->
<xs:enumeration value="20002" />
+ <!-- mashup -->
+ <xs:enumeration value="20003" />
</xs:restriction>
</xs:simpleType>
@@ -707,6 +757,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation>This is used for [software], [firmware] resources.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
+ <!-- Uninitialzed -->
+ <xs:enumeration value="0" />
<!-- Successful -->
<xs:enumeration value="1" />
<!-- Failure -->
@@ -1288,5 +1340,53 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="ontologyFormat">
+ <xs:annotation>
+ <xs:documentation>Used for ontologyFormat attribute in ontology resourcee</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- IRI -->
+ <xs:enumeration value="1" />
+ <!-- File format: Functional-style -->
+ <xs:enumeration value="2" />
+ <!-- File format: OWL/XML -->
+ <xs:enumeration value="3" />
+ <!-- File format: RDF/XML -->
+ <xs:enumeration value="4" />
+ <!-- File format: RDF/Turtle -->
+ <xs:enumeration value="5" />
+ <!-- File format: Manchester -->
+ <xs:enumeration value="6" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="mashupMemberStoreType">
+ <xs:annotation>
+ <xs:documentation>Used for memberStoreType attribute of semanticMashupInstance resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- IRI -->
+ <xs:enumeration value="1" />
+ <!-- File format: Functional-style -->
+ <xs:enumeration value="2" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="mashupResultGenType">
+ <xs:annotation>
+ <xs:documentation>Used for resultGenType attribute of semanticMashupInstance resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- WHEN_SMI_IS_CREATED -->
+ <xs:enumeration value="1" />
+ <!-- WHEN_MR_REQUESTS -->
+ <xs:enumeration value="2" />
+ <!-- PERIODICALLY -->
+ <xs:enumeration value="3" />
+ <!-- WHEN_A_MASHUP_MEMBER_IS_UPDATED -->
+ <xs:enumeration value="4" />
+ </xs:restriction>
+ </xs:simpleType>
+
</xs:schema>
diff --git a/CDT-locationPolicy.xsd b/CDT-locationPolicy.xsd
index 2e24ff1aa6f4cc6ef2a696083db0309744a12ecd..11c15515466ba21beb8566b5e42e8149fae47561 100644
--- a/CDT-locationPolicy.xsd
+++ b/CDT-locationPolicy.xsd
@@ -39,17 +39,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:element name="locationSource" type="m2m:locationSource" />
<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
- <xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
+ <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
<xs:element name="locationStatus" type="xs:string" />
+ <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
<!-- 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:element>
+ <xs:element ref="m2m:subscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -67,12 +68,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
- <xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
+ <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
<xs:element name="locationStatus" type="xs:string" minOccurs="0" />
-
+ <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
+
<!-- No Child Resources -->
</xs:sequence>
</xs:extension>
diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd
index c6f2e9d01dbef502ae85da875ba4244eda7ce4d5..62045af7e04f344b0b43351bd6f9945cd9c3b715 100644
--- a/CDT-remoteCSE.xsd
+++ b/CDT-remoteCSE.xsd
@@ -37,7 +37,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-node.xsd" />
<xs:include schemaLocation="CDT-locationPolicy.xsd" />
<xs:include schemaLocation="CDT-timeSeries.xsd" />
+ <xs:include schemaLocation="CDT-ontologyRepository.xsd" />
+ <xs:include schemaLocation="CDT-semanticMashupJobProfile.xsd" />
+ <xs:include schemaLocation="CDT-semanticMashupInstance.xsd" />
+
+
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
@@ -78,6 +83,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:AEAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
+ <xs:element ref="m2m:ontologyRepositoryAnnc" />
+ <xs:element ref="m2m:semanticMashupJobProfile" />
+ <xs:element ref="m2m:semanticMashupJobProfileAnnc" />
+ <xs:element ref="m2m:semanticMashupInstance" />
+ <xs:element ref="m2m:semanticMashupInstanceAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -123,6 +133,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:AEAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
+ <xs:element ref="m2m:ontologyRepositoryAnnc" />
+ <xs:element ref="m2m:semanticMashupJobProfile" />
+ <xs:element ref="m2m:semanticMashupJobProfileAnnc" />
+ <xs:element ref="m2m:semanticMashupInstance" />
+ <xs:element ref="m2m:semanticMashupInstanceAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-request.xsd b/CDT-request.xsd
index cfaafd108eabac4b7770ebfb9c0343c8c95f6d58..7c5e31f21ef30affc8b785c559f21a0e5151431e 100644
--- a/CDT-request.xsd
+++ b/CDT-request.xsd
@@ -44,7 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="originator" type="m2m:ID" />
<xs:element name="requestID" type="m2m:requestID" />
<xs:element name="metaInformation" type="m2m:metaInformation" />
- <xs:element name="primitiveContent" type="m2m:primitiveContent" />
+ <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
<xs:element name="requestStatus" type="m2m:requestStatus" />
<xs:element name="operationResult" type="m2m:operationResult" />
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index e827a0f3f727f88f18ae214ab1d61e8f543e8d15..f5c052e15d3ea82d129491e3be6f925d791020e4 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.xsd
@@ -124,7 +124,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
<!-- parameter "Authorization Relationship Indicator" -->
<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
-
+ <!-- parameter " Semantic Query Indicator" -->
+ <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd
index 9b2a90c38a0b12b5de58b3b3ecc0e7c2a31818dc..85c581c706e703c0d8cc76cda3ec5f66e8fc8e1b 100644
--- a/CDT-responsePrimitive.xsd
+++ b/CDT-responsePrimitive.xsd
@@ -125,6 +125,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="debugInfo" type="xs:string" />
+ <xs:element name="queryResult" type="xs:string" />
+
<xs:complexType name="resourceWrapper">
<xs:sequence>
<xs:choice minOccurs="1" maxOccurs="1">
diff --git a/CDT-semanticDescriptor.xsd b/CDT-semanticDescriptor.xsd
index 369c188f1b1e744b96d7411ffa3c45f9371fbb53..705924886ac2ac3430eb8dc8ce5bf4e02b8c4b56 100644
--- a/CDT-semanticDescriptor.xsd
+++ b/CDT-semanticDescriptor.xsd
@@ -42,7 +42,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
<xs:element name="descriptor" type="xs:base64Binary" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
- <xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="semanticValidated" type="xs:boolean" minOccurs="0" />
+ <xs:element name="validationEnable" type="xs:boolean" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -67,6 +69,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="descriptor" type="xs:base64Binary" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="semanticValidated" type="xs:boolean" minOccurs="0" />
+ <xs:element name="validationEnable" type="xs:boolean" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 5635689edeb21215404b9a7383d4c9ff937ac01c..6627df0ccd9546a7632faac11257212c1295dccc 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.xsd
@@ -84,6 +84,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="5" />
<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
+ <xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:resourceType" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
</xs:sequence>
</xs:complexType>
diff --git a/CDT-timeSeriesInstance.xsd b/CDT-timeSeriesInstance.xsd
index 75b973d5fc5ccc2e33999e629142f2f469f5c436..e4ecd8f38769673e43305c2c2514cf492e741f79 100644
--- a/CDT-timeSeriesInstance.xsd
+++ b/CDT-timeSeriesInstance.xsd
@@ -37,7 +37,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" />
<xs:element name="content" type="xs:anySimpleType" />
<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
-
+ <xs:element name="contentSize" type="xs:nonNegativeInteger" />
+
<!-- Child Resources -->
</xs:sequence>
@@ -54,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="content" type="xs:anySimpleType" minOccurs="0" />
<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
<!-- Child Resources -->
diff --git a/CDT-token.xsd b/CDT-token.xsd
index bc09fd599688b052c3d37639c35bae3cce488f81..4292222cfc6364b08ab9634c39c09f6910d4ba35 100644
--- a/CDT-token.xsd
+++ b/CDT-token.xsd
@@ -43,14 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="notAfter" type="m2m:timestamp" minOccurs="0"/>
<xs:element name="tokenName" type="xs:string" minOccurs="0" />
<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" />
-
- <xs:element name="permissions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="permission" type="m2m:tokenPermission" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="permissions" type="m2m:tokenPermissions" minOccurs="0" />
<xs:element name="extension" type="xs:string" minOccurs="0" />
<!-- Child Resources -->