diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 9e68b81e31b69cd2821f4547277e69b1a3ffa740..c127692174b95238b830ecf9e725778a49d41d88 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 257 2017-05-16 06:05:46Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 268 2017-05-17 03:29:49Z reinaortega $
* @desc OneM2M data types module
*
*/
@@ -6596,66 +6596,6 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].group_) "name as 'group'";
- // long->short conversion XML
- variant "name as 'ae'";
- //variant (resourceName) "name as 'rn'";
- variant (resourceType) "name as 'ty'";
- variant (resourceID) "name as 'ri'";
- variant (parentID) "name as 'pi'";
- variant (creationTime) "name as 'ct'";
- variant (lastModifiedTime) "name as 'lt'";
- variant (labels) "name as 'lbl'";
- variant (accessControlPolicyIDs) "name as 'acpi'";
- variant (expirationTime) "name as 'et'";
- variant (dynamicAuthorizationConsultationIDs) "name as 'daci'";
- variant (announceTo) "name as 'at'";
- variant (announcedAttribute) "name as 'aa'";
- variant (appName) "name as 'apn'";
- variant (app_ID) "name as 'api'";
- variant (aE_ID) "name as 'aei'";
- variant (pointOfAccess) "name as 'poa'";
- variant (ontologyRef) "name as 'or'";
- variant (nodeLink) "name as 'nl'";
- variant (requestReachability) "name as 'rr'";
- variant (contentSerialization) "name as 'csz'";
- variant (e2eSecInfo) "name as 'esi'";
- variant (choice.childResource_list[-]) "name as 'cr'";
- variant (choice.choice_list[-].container) "name as 'cnt'";
- variant (choice.choice_list[-].group_) "name as 'grp'";
- variant (choice.choice_list[-].accessControlPolicy) "name as 'acp'";
- variant (choice.choice_list[-].subscription) "name as 'sub'";
- variant (choice.choice_list[-].pollingChannel) "name as 'pch'";
- variant (choice.choice_list[-].schedule) "name as 'sch'";
-
- // long->short conversion JSON
- //variant (resourceName) "JSON:name as rn";
- variant (resourceType) "JSON:name as ty";
- variant (resourceID) "JSON:name as ri";
- variant (parentID) "JSON:name as pi";
- variant (creationTime) "JSON:name as ct";
- variant (lastModifiedTime) "JSON:name as lt";
- variant (labels) "JSON:name as lbl";
- variant (accessControlPolicyIDs) "JSON:name as acpi";
- variant (expirationTime) "JSON:name as et";
- variant (dynamicAuthorizationConsultationIDs) "JSON:name as daci";
- variant (announceTo) "JSON:name as at";
- variant (announcedAttribute) "JSON:name as aa";
- variant (appName) "JSON:name as apn";
- variant (app_ID) "JSON:name as api";
- variant (aE_ID) "JSON:name as aei";
- variant (pointOfAccess) "JSON:name as poa";
- variant (ontologyRef) "JSON:name as or";
- variant (nodeLink) "JSON:name as nl";
- variant (requestReachability) "JSON:name as rr";
- variant (contentSerialization) "JSON:name as csz";
- variant (e2eSecInfo) "JSON:name as esi";
- variant (choice.childResource_list) "JSON:name as cr";
- variant (choice.choice_list[-].container) "JSON:name as cnt";
- variant (choice.choice_list[-].group_) "JSON:name as grp";
- variant (choice.choice_list[-].accessControlPolicy) "JSON:name as acp";
- variant (choice.choice_list[-].subscription) "JSON:name as sub";
- variant (choice.choice_list[-].pollingChannel) "JSON:name as pch";
- variant (choice.choice_list[-].schedule) "JSON:name as sch";
};
type record AccessControlPolicy_optional