diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a40657df9f4dbfc87d462992b02b53c9de607667..90cfd19c0f679a77392cf0af0507ce97583d13a6 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -5,16 +5,13 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Module containing functions for oneM2M
*
*/
module OneM2M_Functions {
import from XSD all;
- import from LibCommon_Time all;
import from OneM2M_Templates all;
import from OneM2M_Types all;
import from OneM2M_TypesAndValues all;
@@ -850,7 +847,7 @@ module OneM2M_Functions {
function f_sendResourceAeSimu(in integer p_resourceIndex) runs on AeSimu {
if(p_resourceIndex == -1) {
- infoPort.send(vc_resourcesList[vc_aeAuxIndex]); //TODO To send Ae or RemoteCSE depending on the component type
+ infoPort.send(vc_resourcesList[vc_aeAuxIndex]);
} else {
infoPort.send(vc_resourcesList[p_resourceIndex]);
}
@@ -864,7 +861,7 @@ module OneM2M_Functions {
function f_sendResourceCseSimu(in integer p_resourceIndex) runs on CseSimu {
if(p_resourceIndex == -1) {
- infoPort.send(vc_resourcesList[vc_remoteCseIndex]); //TODO To send Ae or RemoteCSE depending on the component type
+ infoPort.send(vc_resourcesList[vc_remoteCseIndex]);
} else {
infoPort.send(vc_resourcesList[p_resourceIndex]);
}
diff --git a/LibOneM2M/OneM2M_Pics.ttcn b/LibOneM2M/OneM2M_Pics.ttcn
index 10d74d3531d80cd9911dc3a282d4bb078d2c50f3..4df2a38fe481224306a27cb3d2e3daddd1058210 100644
--- a/LibOneM2M/OneM2M_Pics.ttcn
+++ b/LibOneM2M/OneM2M_Pics.ttcn
@@ -1,13 +1,11 @@
-/*
+/**
* Copyright Notification
* No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
- * $Id: OneM2M_Pics.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Module containing Pixits for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index fd38c0c9d6c25d1475c2fedf960bb362ebbdc23b..f10dda2bd6f6802ecdb12310c7090264666798fa 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- * $Id: OneM2M_Pixits.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Module containing Pixits for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_Ports.ttcn b/LibOneM2M/OneM2M_Ports.ttcn
index b318eb61bf1ecf78b1a79b77e1894a7a93caf04e..7b0555d029a45957ccc69f72e8b052839fe3a8c7 100644
--- a/LibOneM2M/OneM2M_Ports.ttcn
+++ b/LibOneM2M/OneM2M_Ports.ttcn
@@ -5,8 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author oneM2M
- * @version
+ * @author oneM2M/ETSI
* @desc Port modules for oneM2M Test System
*
*/
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index bf43b6463998b80b2012094af7d053c9309d5b86..2a701eb0166628e4ea24ae5b051e98b4b26a5e08 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
- * $Id: OneM2M_TestSystem.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test System module for oneM2M
*
*/
@@ -16,7 +14,6 @@ module OneM2M_TestSystem {
import from OneM2M_Types all;
import from LibCommon_Time all;
import from OneM2M_Ports all;
- import from OneM2M_Pixits all;
/* ***************************************
* Test System Components
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 61d58b175414a718c262451a7d9f1f393ce7e605..4950309f9bab8f5dab8ae194c2152e61b3b1abd9 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- * $Id: OneM2M_TypesAndValues.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Module containing types and values for oneM2M
*
*/
diff --git a/LibOneM2M/UsefulTtcn3Types.ttcn b/LibOneM2M/UsefulTtcn3Types.ttcn
index fbbb1c2fa9539e4174a72e3c0c54c206f2879485..fa8761c7851e99daea9c321872379b0b3b37ca4c 100644
--- a/LibOneM2M/UsefulTtcn3Types.ttcn
+++ b/LibOneM2M/UsefulTtcn3Types.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author oneM2M
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
- * $Id: UsefulTtcn3Types.ttcn 234 2017-03-20 16:37:29Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Useful types
*
*/
diff --git a/LibOneM2M/XSD.ttcn b/LibOneM2M/XSD.ttcn
index 5ac7ea137b64625edc1758357b18850b6f23f20e..b93b30120e7d6eca966b53583d968535479b5291 100644
--- a/LibOneM2M/XSD.ttcn
+++ b/LibOneM2M/XSD.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author oneM2M
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/XSD.ttcn $
- * $Id: XSD.ttcn 234 2017-03-20 16:37:29Z reinaortega $
+ * @author oneM2M/ETSI
* @desc XSD Aux
*
*/
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 12603fd3cad1941791f71a866872126684957cb1..1c6333e961eb58de3b53a7484b7dd775905a7c42 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Module containing test cases for oneM2M
*
*/
diff --git a/OneM2M_TestControl_ADN_profile_3.ttcn b/OneM2M_TestControl_ADN_profile_3.ttcn
index ca513fc3ee1c1fbfbfcf1b95fab0b225a0566e5a..f68f2ccf79ee3467d2a87d2cab0c8fc1b1cf703b 100644
--- a/OneM2M_TestControl_ADN_profile_3.ttcn
+++ b/OneM2M_TestControl_ADN_profile_3.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_TestControl_ADN_profile_4.ttcn b/OneM2M_TestControl_ADN_profile_4.ttcn
index 4fa671f7ada3bb76c8a0c83f3d357d37a4e918a0..3c67d4d035610c4c988167aa48560a4c8cf1bc1b 100644
--- a/OneM2M_TestControl_ADN_profile_4.ttcn
+++ b/OneM2M_TestControl_ADN_profile_4.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_TestControl_ASN_profile.ttcn b/OneM2M_TestControl_ASN_profile.ttcn
index 6d81a4d006d690f06062bf0f0a659ef66752f9fa..256a34e2d6af5e0e97d2605a3c5993dacccbd4f1 100644
--- a/OneM2M_TestControl_ASN_profile.ttcn
+++ b/OneM2M_TestControl_ASN_profile.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn b/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
index 039553c3f014593a80c2e191fed6ff7560c5f644..7fe3d472a0be36ad179278be0ab3230e09b99aaf 100644
--- a/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
+++ b/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn b/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
index 17c5fcc4366a0d469e6b3875b41e0f9c1fd938fd..8ea6b5b233c019c73c202a5f842c72ccdab5b681 100644
--- a/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
+++ b/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index 28c5485b8bf40c758eb3a51edf3aaa63e389f925..90433b9bf2c50c97ac6713d203ef485ce355cd32 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index ad748670b7a9b87f5c36d5e394eef2f8ef246847..4b59fa6cc97f266f346f7113ed4ede6f6b9839b0 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index ddd3e4c44b961440bd53051dd342661a5fe1ffe7..fb42edf72c7fc135f9d86bb34e60eed009d9f453 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Module containing test cases for oneM2M
*
*/
@@ -18,12 +16,10 @@ module OneM2M_Testcases_AE_Release_1 {
import from OneM2M_Types all;//{type XSD.ID};
import from OneM2M_TypesAndValues all;
import from OneM2M_Pixits all;
- import from LibCommon_Time all;
import from OneM2M_Pics all;
import from OneM2M_Functions all;
import from OneM2M_PermutationFunctions all;
- import from XSD all;
-
+
group AE {
group General {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 8e47172bb5de0cb17cecec19a7fbf38d2f21d79a..8b631a8c07590a9256c960670b95f7a8f69c2a30 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
- * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ * @author oneM2M/ETSI
* @desc Module containing test cases for oneM2M
*
*/
@@ -19,7 +17,6 @@ module OneM2M_Testcases_CSE_Release_2 {
import from OneM2M_TypesAndValues all;
import from OneM2M_Pixits all;
import from LibCommon_Time all;
- import from OneM2M_Pics all;
import from OneM2M_Functions all;
import from OneM2M_PermutationFunctions all;
import from XSD all;