Commit dde699807f4ccae29553e5018a36e1fd37b6313c

Authored by Miguel Angel Reina Ortega
1 parent 93632caa

Moved to XSD v2_19_0

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
Showing 1 changed file with 28 additions and 3 deletions

Too many changes to show.

To preserve performance only 1 of 2 files are displayed.

... ... @@ -1945,6 +1945,7 @@ module OneM2M_Templates {
1945 1945 consistencyStrategy := p_consistencyStrategy,//O
1946 1946 groupName := omit,//O
1947 1947 semanticSupportIndicator := omit,//O
  1948 + notifyAggregation := omit,//O
1948 1949 choice := omit//NP
1949 1950 };
1950 1951  
... ... @@ -1982,6 +1983,7 @@ module OneM2M_Templates {
1982 1983 consistencyStrategy := p_consistencyStrategy,//O
1983 1984 groupName := omit,//O
1984 1985 semanticSupportIndicator := omit,//O
  1986 + notifyAggregation := omit,//O
1985 1987 choice := omit//NP
1986 1988 };
1987 1989  
... ... @@ -2009,6 +2011,7 @@ module OneM2M_Templates {
2009 2011 consistencyStrategy := *, //OA
2010 2012 groupName := *, //OA
2011 2013 semanticSupportIndicator := *,//OA
  2014 + notifyAggregation := omit,//OA
2012 2015 choice := omit //NA
2013 2016 };
2014 2017  
... ... @@ -2699,12 +2702,15 @@ module OneM2M_Templates {
2699 2702 announceTo := omit, //O
2700 2703 announcedAttribute := omit, //O
2701 2704 locationSource := p_locationSource, //M
  2705 + locationInformationType := omit,//O
2702 2706 locationUpdatePeriod := {p_locationUpdatePeriod}, //O
2703 2707 locationTargetID := p_locationTargetID, //O
2704 2708 locationServer := p_locationServerAddress,//O
2705 2709 locationContainerID := omit, //NP
2706 2710 locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
2707 2711 locationStatus := omit, //NP
  2712 + geographicalTargetArea := omit,//O
  2713 + geofenceEventCriteria := omit,//O
2708 2714 choice := omit //NP
2709 2715  
2710 2716 };
... ... @@ -2723,12 +2729,15 @@ module OneM2M_Templates {
2723 2729 announceTo := omit, //O
2724 2730 announcedAttribute := omit, //O
2725 2731 locationSource := int1, //M
  2732 + locationInformationType := omit,//O
2726 2733 locationUpdatePeriod := omit, //O
2727 2734 locationTargetID := omit, //O
2728 2735 locationServer := omit,//O
2729 2736 locationContainerID := omit, //NP
2730 2737 locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
2731 2738 locationStatus := omit, //NP
  2739 + geographicalTargetArea := omit,//O
  2740 + geofenceEventCriteria := omit,//O
2732 2741 choice := omit //NP
2733 2742 };
2734 2743  
... ... @@ -2748,12 +2757,16 @@ module OneM2M_Templates {
2748 2757 link := ?,
2749 2758 dynamicAuthorizationConsultationIDs := *, //OA
2750 2759 locationSource := *, //OA
  2760 + locationInformationType := *,//OA
2751 2761 locationUpdatePeriod := *, //OA
2752 2762 locationTargetID := *, //OA
2753 2763 locationServer := *, //OA
2754 2764 locationContainerID := *, //OA
2755 2765 locationContainerName := *, //OA
2756   - locationStatus := * //OA
  2766 + locationStatus := *, //OA
  2767 + geographicalTargetArea := *,//OA
  2768 + geofenceEventCriteria := *//OA
  2769 +
2757 2770 };
2758 2771  
2759 2772 template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation,
... ... @@ -3006,7 +3019,7 @@ module OneM2M_Templates {
3006 3019 currentNrOfInstances := omit,//NP
3007 3020 currentByteSize := omit,//NP
3008 3021 periodicInterval := omit,//O
3009   - missingDataDetect := omit,//O
  3022 + missingDataMaxNr := omit,//O
3010 3023 missingDataList := omit,//NP
3011 3024 missingDataCurrentNr := omit,//NP
3012 3025 missingDataDetectTimer := omit,//O
... ... @@ -3037,7 +3050,7 @@ module OneM2M_Templates {
3037 3050 currentNrOfInstances := *,//M OA
3038 3051 currentByteSize := *,//M OA
3039 3052 periodicInterval := *,//O OA
3040   - missingDataDetect := omit,//O NA
  3053 + missingDataMaxNr := *,//O OA
3041 3054 missingDataList := *,//O OA
3042 3055 missingDataCurrentNr := *,//O OA
3043 3056 missingDataDetectTimer := *,//O OA
... ... @@ -3246,6 +3259,7 @@ module OneM2M_Templates {
3246 3259 consistencyStrategy := omit,//NP
3247 3260 groupName := omit,//O
3248 3261 semanticSupportIndicator := omit,//O
  3262 + notifyAggregation := omit,//O
3249 3263 choice := omit//NP
3250 3264  
3251 3265 };
... ... @@ -3405,12 +3419,15 @@ module OneM2M_Templates {
3405 3419 announceTo := omit,//O
3406 3420 announcedAttribute := omit,//O
3407 3421 locationSource := omit,//NP
  3422 + locationInformationType := omit,//O
3408 3423 locationUpdatePeriod := {p_locationUpdatePeriod}, //O
3409 3424 locationTargetID := omit, //NP
3410 3425 locationServer := omit, //NP
3411 3426 locationContainerID := omit, //NP
3412 3427 locationContainerName := PX_LOCATION_CONTAINER_NAME, //O
3413 3428 locationStatus := omit, //NP
  3429 + geographicalTargetArea := omit,//O
  3430 + geofenceEventCriteria := omit,//O
3414 3431 choice := omit //NP
3415 3432 };
3416 3433  
... ... @@ -3530,6 +3547,7 @@ module OneM2M_Templates {
3530 3547 consistencyStrategy := omit,
3531 3548 groupName := omit,
3532 3549 semanticSupportIndicator := omit,
  3550 + notifyAggregation := omit,
3533 3551 choice := omit
3534 3552 };
3535 3553  
... ... @@ -3797,12 +3815,15 @@ module OneM2M_Templates {
3797 3815 announceTo := omit,//O
3798 3816 announcedAttribute := omit,//O
3799 3817 locationSource := omit,//M
  3818 + locationInformationType := omit,//o
3800 3819 locationUpdatePeriod := omit,//O
3801 3820 locationTargetID := omit,//O
3802 3821 locationServer := omit,//O
3803 3822 locationContainerID := omit,//O
3804 3823 locationContainerName := omit,//O
3805 3824 locationStatus := omit,//M
  3825 + geographicalTargetArea := omit,//O
  3826 + geofenceEventCriteria := omit,//O
3806 3827 choice := omit//O
3807 3828 }
3808 3829  
... ... @@ -3873,6 +3894,7 @@ module OneM2M_Templates {
3873 3894 consistencyStrategy := *,//O
3874 3895 groupName := *,//O
3875 3896 semanticSupportIndicator := *,//O
  3897 + notifyAggregation := *,//O
3876 3898 choice := *//O
3877 3899 };
3878 3900  
... ... @@ -3899,6 +3921,7 @@ module OneM2M_Templates {
3899 3921 consistencyStrategy := *,//O
3900 3922 groupName := *,//O
3901 3923 semanticSupportIndicator := *,//O
  3924 + notifyAggregation := *,//O
3902 3925 choice := *//O
3903 3926 }
3904 3927  
... ... @@ -3925,6 +3948,7 @@ module OneM2M_Templates {
3925 3948 consistencyStrategy := omit,//O
3926 3949 groupName := omit,//O
3927 3950 semanticSupportIndicator := omit,//O
  3951 + notifyAggregation := omit,//O
3928 3952 choice := omit//O
3929 3953 }
3930 3954  
... ... @@ -3970,6 +3994,7 @@ module OneM2M_Templates {
3970 3994 consistencyStrategy := omit,//O
3971 3995 groupName := omit,//O
3972 3996 semanticSupportIndicator := omit,//O
  3997 + notifyAggregation := omit,//O
3973 3998 choice := {childResource_list := ?}//O
3974 3999 }
3975 4000  
... ...