Correct component declaration and syntax for Titan compiling error

LibOneM2M/OneM2M_Functions.ttcn

@@ -53,7 +53,7 @@ module OneM2M_Functions {
 				
 			// Variables
 			vc_config := e_cf02;
-			vc_cseSimu := CseSimu.create("CSE1") alive;
+			vc_cseSimu := MnCseSimu.create("CSE1") alive;
 				
 			// Map
 			map(self:mcaPort, system:mcaPort);
@@ -125,7 +125,7 @@ module OneM2M_Functions {
 			map(self:mcaPort, system:mcaPort);
 			map(self:acPort, system:acPort);
 			activate(a_default());
-			activate(a_ae_cf03());
+//			activate(a_ae_cf03());
 		
 			// Connect
 					
@@ -1642,14 +1642,14 @@ module OneM2M_Functions {
 		group helpingFunctions {
 			
 			/**
-			 * @desc   Creates specified resource
+			 * @desc   CseSimu Creates specified resource
 			 * @param  p_resource          Resource to be created
 			 * @param  p_parentIndex       Parent index of resource to be saved
 			 * @param  p_resourceType      Type of the resource to be created
 			 * @param  p_modifiedResource  Assigned and/or modified fields
 			 * @return Internal resource index of the saved resource or -1
 			 */
-			function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_modifiedResource) runs on AeTester return integer {
+			function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_modifiedResource) runs on CseSimu return integer {
 
 				var integer v_resourceIndex;
 				
@@ -1690,6 +1690,9 @@ module OneM2M_Functions {
 				return -1;
 			}
 			
+			
+			
+			
 		} // end helpingFunctions
 		
 		group altstepFunctions {
@@ -1697,7 +1700,7 @@ module OneM2M_Functions {
 			/**
 			  * @desc	Ae altstep
 			  */
-			 altstep a_ae_default() runs on AeTester {
+			 altstep a_ae_default() runs on CseSimu {
 
 				var MsgIn v_request; 
 				
@@ -1718,7 +1721,7 @@ module OneM2M_Functions {
 			 * @remark  This altstep includes a_ae_default
 			 * @see		a_ae_default
 			 */
-			altstep a_ae_cf03() runs on AeTester {
+			altstep a_ae_cf03() runs on CseSimu {
 				
 				var MsgIn v_request;			
 				var PrimitiveContent v_modifiedResource;

LibOneM2M/OneM2M_Templates.ttcn

@@ -2140,7 +2140,7 @@ module OneM2M_Templates {
 			choice := omit
 		}
     	
-		template (value) AEAnnc_optional m_contentUpdateAEAnnc (template XSD.ID p_appId := omit, template XSD.ID p_stemId := omit) := {
+		template (value) AEAnnc_optional m_contentUpdateAEAnnc (template (omit) XSD.ID p_appId := omit, template (omit) XSD.ID p_stemId := omit) := { //FIXME
 			resourceName := omit,
 			resourceType := omit,
 			resourceID := omit,

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -48,7 +48,7 @@ module OneM2M_TestSystem {
 
 		var MsgIn vc_request;
 		var MsgIn vc_response;
-		var CseSimu vc_cseSimu;//For CF02 when AeSimu is master
+		var MnCseSimu vc_cseSimu;//For CF02 when AeSimu is master
 	
 	}
 		

OneM2M_Testcases.ttcn

@@ -12582,7 +12582,7 @@ module OneM2M_Testcases {
 						 }
 					}
 					
-					function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out AcpType p_acpi, boolean p_secondAcp := false) runs on AeSimu {
+					function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, inout AcpType p_acpi, boolean p_secondAcp := false) runs on AeSimu {
 						//Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;