diff --git a/CDT-AE.xsd b/CDT-AE.xsd index 0c2b53dc2c1a61aa59caf62ade6854527737944d..be38d6595ef9b133e4ae1eead562a6db25435b91 100644 --- a/CDT-AE.xsd +++ b/CDT-AE.xsd @@ -44,6 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-timeSyncBeacon.xsd" /> <xs:include schemaLocation="CDT-nwMonitoringReq.xsd" /> <xs:include schemaLocation="CDT-primitiveProfile.xsd" /> + <xs:include schemaLocation="CDT-action.xsd" /> <xs:element name="AE" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -93,6 +94,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:timeSyncBeacon" /> <xs:element ref="m2m:nwMonitoringReq" /> <xs:element ref="m2m:primitiveProfile" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence> @@ -152,6 +154,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:e2eQosSession" /> <xs:element ref="m2m:nwMonitoringReq" /> <xs:element ref="m2m:primitiveProfile" /> + <xs:element ref="m2m:actionAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd index db3b573e0319c5273cfca5f12651e61360f22d10..3ec58823efecd68844b5ed2e76e3c42214e50b39 100644 --- a/CDT-CSEBase.xsd +++ b/CDT-CSEBase.xsd @@ -63,6 +63,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-timeSyncBeacon.xsd" /> <xs:include schemaLocation="CDT-nwMonitoringReq.xsd" /> <xs:include schemaLocation="CDT-primitiveProfile.xsd" /> + <xs:include schemaLocation="CDT-action.xsd" /> <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource"> <xs:complexType> @@ -130,6 +131,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:timeSyncBeacon" /> <xs:element ref="m2m:nwMonitoringReq" /> <xs:element ref="m2m:primitiveProfile" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-action.xsd b/CDT-action.xsd index 4fd1603db349ceb974ca810b1d9872b733d87b9a..17874cab02da0c57c61d5fbe640fdc09fedf4e5c 100644 --- a/CDT-action.xsd +++ b/CDT-action.xsd @@ -90,7 +90,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <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:dependency" /> + <xs:element ref="m2m:dependencyAnnc" /> <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:transaction" /> </xs:choice> diff --git a/CDT-container.xsd b/CDT-container.xsd index d3fc096ab2b8938799ba743de38e346bfb2941a8..55eed9ca940a5c6470cff97831c8fd985e940465 100644 --- a/CDT-container.xsd +++ b/CDT-container.xsd @@ -32,6 +32,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-transaction.xsd"/> + <xs:include schemaLocation="CDT-action.xsd"/> <xs:element name="container" substitutionGroup="m2m:sg_announceableResource"> @@ -64,6 +65,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:sg_flexContainerResource" /> <xs:element ref="m2m:timeSeries" /> <xs:element ref="m2m:transaction" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence> @@ -106,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:timeSeries" /> <xs:element ref="m2m:timeSeriesAnnc" /> <xs:element ref="m2m:transaction" /> + <xs:element ref="m2m:actionAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-group.xsd b/CDT-group.xsd index 6810f8a0f961924c25e7beda83e6a4c3ebf50ba3..37c9eafaca39605491f827b156ae8c93d13ad25a 100644 --- a/CDT-group.xsd +++ b/CDT-group.xsd @@ -31,6 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> <xs:include schemaLocation="CDT-transaction.xsd"/> + <xs:include schemaLocation="CDT-action.xsd"/> <xs:element name="group" substitutionGroup="m2m:sg_announceableResource"> @@ -67,6 +68,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:transaction" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence> @@ -108,6 +110,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:semanticDescriptorAnnc" /> <xs:element ref="m2m:transaction" /> + <xs:element ref="m2m:actionAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-node.xsd b/CDT-node.xsd index c5c4294957d4ee4bc21189bbad069bccd40a8c79..dee9a999ed8a3859a682030b7172032ef4e89a02 100644 --- a/CDT-node.xsd +++ b/CDT-node.xsd @@ -44,6 +44,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-transaction.xsd"/> <xs:include schemaLocation="CDT-schedule.xsd"/> + <xs:include schemaLocation="CDT-action.xsd"/> <xs:element name="node" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -81,6 +82,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:transaction" /> <xs:element ref="m2m:schedule" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence> @@ -123,6 +125,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticDescriptorAnnc" /> <xs:element ref="m2m:transaction" /> <xs:element ref="m2m:schedule" /> + <xs:element ref="m2m:actionAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd index 7400f67a94e045caadeb998e4afbf204ad3f833b..a4434187cd1c475d20a4bbdeb05a043870ed0bb7 100644 --- a/CDT-remoteCSE.xsd +++ b/CDT-remoteCSE.xsd @@ -46,6 +46,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-timeSyncBeacon.xsd" /> <xs:include schemaLocation="CDT-nwMonitoringReq.xsd" /> <xs:include schemaLocation="CDT-primitiveProfile.xsd" /> + <xs:include schemaLocation="CDT-action.xsd" /> <xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -107,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:nwMonitoringReq" /> <xs:element ref="m2m:primitiveProfile" /> <xs:element ref="m2m:primitiveProfileAnnc" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence> @@ -169,6 +171,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:nwMonitoringReq" /> <xs:element ref="m2m:primitiveProfile" /> <xs:element ref="m2m:primitiveProfileAnnc" /> + <xs:element ref="m2m:actionAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-state.xsd b/CDT-state.xsd index 6c1c42f84bad37a2cc02f4ed6dd945c6d2b5eca2..082d72522c6d089cf5fd6725d849c4c65593dbda 100644 --- a/CDT-state.xsd +++ b/CDT-state.xsd @@ -76,7 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:transaction" /> - <xs:element ref="m2m:action" /> + <xs:element ref="m2m:actionAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-timeSeries.xsd b/CDT-timeSeries.xsd index 903b561522eb7cb323212249660e8de79a679b16..dd78e87c1697aa8c06e2961dd5259b8de6287f9c 100644 --- a/CDT-timeSeries.xsd +++ b/CDT-timeSeries.xsd @@ -31,6 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> <xs:include schemaLocation="CDT-transaction.xsd"/> + <xs:include schemaLocation="CDT-action.xsd"/> <xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource"> @@ -64,6 +65,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:transaction" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence> @@ -105,6 +107,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:semanticDescriptorAnnc" /> <xs:element ref="m2m:transaction" /> + <xs:element ref="m2m:actionAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-transaction.xsd b/CDT-transaction.xsd index dedb090c2be71d75d0844aad63ef4cbe10f5e361..934eb1660a0aa472220970b7b12b6be9bf77cf49 100644 --- a/CDT-transaction.xsd +++ b/CDT-transaction.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-responsePrimitive.xsd" /> + <xs:include schemaLocation="CDT-action.xsd" /> <xs:element name="transaction" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -55,6 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:element ref="m2m:subscription" /> + <xs:element ref="m2m:action" /> </xs:choice> </xs:choice> </xs:sequence>