From 4bbed9716c71252b26ac35ad120056a82bf4162f Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 2 Jun 2017 16:23:31 +0200
Subject: [PATCH] XSD.AnyType is replaced by XSD.AnySimpleType
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Templates.ttcn | 8 ++------
LibOneM2M/OneM2M_Types.ttcn | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 011f033..eca9bb5 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 288 2017-05-19 07:18:08Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 295 2017-06-01 08:20:58Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -1467,11 +1467,7 @@ module OneM2M_Templates {
contentSize := omit,//NP
contentRef := omit, //O
ontologyRef := omit,//O
- content := {
- embed_values := {p_primitiveContent},
- attr := omit,
- elem_list := {}
- }, //M
+ content := p_primitiveContent,//M
choice := omit //O
};
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index d0fb0d8..cb53309 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 288 2017-05-19 07:18:08Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 295 2017-06-01 08:20:58Z reinaortega $
* @desc OneM2M data types module
*
*/
@@ -1024,9 +1024,9 @@ type record CmdhDefEcValue
XSD.PositiveInteger order,
EventCat defEcValue,
ListOfM2MID requestOrigin,
- XSD.AnyType requestContext optional,
+ XSD.AnySimpleType requestContext optional,//FIXME Use AnySimpleType instead
XSD.Boolean requestContextNotification optional,
- XSD.AnyType requestCharacteristics optional
+ XSD.AnySimpleType requestCharacteristics optional //FIXME Use AnySimpleType instead
}
with {
variant "name as uncapitalized";
@@ -1093,9 +1093,9 @@ type record CmdhLimits
XSD.String description optional,
XSD.PositiveInteger order,
ListOfM2MID requestOrigin,
- XSD.AnyType requestContext,
+ XSD.AnySimpleType requestContext,//FIXME Use AnySimpleType instead
XSD.Boolean requestContextNotification optional,
- XSD.AnyType requestCharacteristics,
+ XSD.AnySimpleType requestCharacteristics,//FIXME Use AnySimpleType instead
ListOfEventCat limitsEventCategory,
ListOfMinMax limitsRequestExpTime,
ListOfMinMax limitsResultExpTime,
@@ -1173,7 +1173,7 @@ type record CmdhNwAccessRule
XSD.NonNegativeInteger minReqVolume,
XSD.NonNegativeInteger spreadingWaitTime,
BackOffParameters backOffParameters,
- XSD.AnyType otherConditions,
+ XSD.AnySimpleType otherConditions,//FIXME Use AnySimpleType instead
MgmtLinkRef mgmtLink
}
with {
@@ -1682,7 +1682,7 @@ with {
type record Attribute
{
XSD.NCName name,
- XSD.AnyType value_
+ XSD.AnySimpleType value_ //FIXME Use AnySimpleType instead
}
with {
variant "name as uncapitalized";
@@ -1719,7 +1719,7 @@ with {
type record AnyArgType
{
XSD.NCName name,
- XSD.AnyType value_
+ XSD.AnySimpleType value_ //FIXME Use AnySimpleType instead
}
with {
variant "name as uncapitalized";
@@ -2832,7 +2832,7 @@ type record ContentInstance
XSD.NonNegativeInteger contentSize,
ContentRef contentRef optional,
XSD.AnyURI ontologyRef optional,
- XSD.AnyType content,
+ XSD.AnySimpleType content, //FIXME Use AnySimpleType instead
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
@@ -2866,7 +2866,7 @@ type record ContentInstanceAnnc
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI ontologyRef optional,
- XSD.AnyType content optional,
+ XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
@@ -4922,7 +4922,7 @@ type union Representation {
type record Notification_1
{
record {
- //XSD.AnyType representation optional, To be exchanged by Representation
+ //XSD.AnyType representation optional, Use Representation instead
Representation representation optional,
record {
Operation operation optional,
@@ -6677,7 +6677,7 @@ group OptionalResourceTypes {
XSD.NonNegativeInteger contentSize optional,
ContentRef contentRef optional,
XSD.AnyURI ontologyRef optional,
- XSD.AnyType content optional,
+ XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
@@ -6827,7 +6827,7 @@ group OptionalResourceTypes {
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI ontologyRef optional,
- XSD.AnyType content optional,
+ XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
--
GitLab