Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • Interim
  • master
  • ATS-oneM2M-Types-v2_27_0
  • ATS-oneM2M-Types-v2_28_0
  • ATS-oneM2M-Types-v2_29_0
  • ATS-oneM2M-Types-v2_30_0
  • ATS-oneM2M-Types-v2_31_0
  • ATS-oneM2M-Types-v2_32_0
8 results

Target

Select target project
  • TST/ATS-oneM2M-Types-Release-2
1 result
Select Git revision
  • Interim
  • master
  • ATS-oneM2M-Types-v2_27_0
  • ATS-oneM2M-Types-v2_28_0
  • ATS-oneM2M-Types-v2_29_0
  • ATS-oneM2M-Types-v2_30_0
  • ATS-oneM2M-Types-v2_31_0
  • ATS-oneM2M-Types-v2_32_0
8 results
Show changes
...@@ -2030,11 +2030,11 @@ type record AccessControlRule ...@@ -2030,11 +2030,11 @@ type record AccessControlRule
ResourceType resourceType optional, ResourceType resourceType optional,
XSD.AnyURI specializationID optional, XSD.AnyURI specializationID optional,
record length(1 .. infinity) of ResourceType childResourceType record length(1 .. infinity) of ResourceType childResourceType
} accessControlObjectDetails_list //TODO It should be optional } accessControlObjectDetails_list optional//TODO It should be optional
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
variant (accessControlContexts_list) "untagged"; //variant (accessControlContexts_list) "untagged";
variant (accessControlContexts_list[-]) "name as 'accessControlContexts'"; variant (accessControlContexts_list[-]) "name as 'accessControlContexts'";
variant (accessControlContexts_list[-].accessControlWindow_list) "untagged"; variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'"; variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'";
...@@ -2042,7 +2042,7 @@ with { ...@@ -2042,7 +2042,7 @@ with {
variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list"; variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list";
//variant (accessControlAuthenticationFlag) "text 'true' as '1'"; //variant (accessControlAuthenticationFlag) "text 'true' as '1'";
//variant (accessControlAuthenticationFlag) "text 'false' as '0'"; //variant (accessControlAuthenticationFlag) "text 'false' as '0'";
variant (accessControlObjectDetails_list) "untagged"; //variant (accessControlObjectDetails_list) "untagged";
variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'"; variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
variant (accessControlObjectDetails_list[-].childResourceType) "list"; variant (accessControlObjectDetails_list[-].childResourceType) "list";
}; };
...@@ -9026,4 +9026,6 @@ with { ...@@ -9026,4 +9026,6 @@ with {
encode "XML"; encode "XML";
//variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'"; //variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
//variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'"; //variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, AccessControlPolicy_invalid, AE_optional, AE_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_invalid, ContentInstance_optional, Group_optional, Group_invalid, GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional, Schedule_invalid, Subscription_optional, Subscription_invalid, PollingChannel_optional, PollingChannel_invalid, LocationPolicy_optional, LocationPolicy_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional"
} }