Commit 9365fa59 authored by schmitting's avatar schmitting
Browse files

Update to TTwb 1.12

parent 3fb31fb6
Loading
Loading
Loading
Loading
+92 −105
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@

module LibIms_Templates
{	
	import from XSDAUX all;

	//LibCommon
	import from LibCommon_DataStrings all;
	
@@ -17,7 +19,6 @@ module LibIms_Templates
	import from LibSip_Steps all;
	import from LibSip_PIXITS all;
	import from LibSip_XMLTypes all;
	import from XSDAUX all;
	
	//LibIms
	import from LibIms_SIPTypesAndValues all;
@@ -25,54 +26,51 @@ module LibIms_Templates
	import from LibIms_PIXITS all;
	
    //LibXMLTypes
    import from ietf_params_xml_ns_resource_lists language "XSD" all
    import from urn_ietf_params_xml_ns_resource_lists language "XSD" all
    with {
        extension "File:../xsd/ResourceList.xsd"
    }
	
    import from org_etsi_uri__ngn_params_xml_simservs_xcap language "XSD" all
    import from http_uri_etsi_org_ngn_params_xml_simservs_xcap language "XSD" all
    with {
        extension "File:../xsd/SupplementaryServices.xsd"
    }
	
    import from org_etsi_uri__ngn_params_xml_simservs_mcid language "XSD" all
    import from http_uri_etsi_org_ngn_params_xml_simservs_mcid language "XSD" all
    with {
        extension "File:../xsd/MCID.xsd"
    }
	
    import from Ims3gpp language "XSD" all
    import from NoTargetNamespace language "XSD" all
    with {
        extension "File:../xsd/Ims3gpp.xsd"
    }
    
    import from ietf_params_xml_ns_conference_info language "XSD" all
    import from urn_ietf_params_xml_ns_conference_info language "XSD" all
    with {
        extension "File:../xsd/CONF.xsd"
    }
    
    import from org_etsi_uri__ngn_params_xml_simservs_pstn language "XSD" all
    import from http_uri_etsi_org_ngn_params_xml_simservs_pstn language "XSD" all
    with {
        extension "File:../xsd/PSTN.xsd"
    }
    
    import from ietf_params_xml_ns_common_policy language "XSD" all
    import from urn_ietf_params_xml_ns_common_policy language "XSD" all
    with {
        extension "File:../xsd/common-policy.xsd"
    }
    
    import from org_etsi_uri__ngn_params_xml_comm_div_info language "XSD" all
    import from http_uri_etsi_org_ngn_params_xml_comm_div_info language "XSD" all
    with {
        extension "File:../xsd/CDIVN.xsd"
    }
    
	import from X_3gpp_ns_cw_1_0 language "XSD" all
	import from urn_3gpp_ns_cw_1_0 language "XSD" all
    with {
        extension "File:../xsd/cw.xsd"
    }   
    
    
    
	
   	template charstring m_international_number_format := pattern  "\\+\d+";//pattern  "\+\d+";

	template NameAddr mw_SipUrl_SUTinterface(charstring p_host, integer p_port) := 
@@ -495,7 +493,7 @@ group XMLTemplates {
	
	template XmlBody m_XmlBody_ConfInfo(template Conference_type p_confInfo) :=
	{
        conference_type := p_confInfo
        conference := p_confInfo
	};
	
    template XmlBody m_XmlBody_CW(template Ims_cw p_cw) :=
@@ -557,7 +555,7 @@ group XMLTemplates {
		
	template XmlBody mw_XmlBody_ConfInfo(template Conference_type p_confInfo) :=
	{
        conference_type := p_confInfo
        conference := p_confInfo
	};
	
	template XmlBody mw_XmlBody_CUG(template Cug p_cug) :=
@@ -599,7 +597,7 @@ group ACR_CBTemplates {
        active := omit,
        anyAttributes := omit, 
		ruleset := {
			rule:= {p_ruleType}
			{p_ruleType}
		}
	}
	
@@ -608,7 +606,7 @@ group ACR_CBTemplates {
        active := omit,
        anyAttributes := omit, 
		ruleset := {
			rule:= {p_ruleType}
			{p_ruleType}
		}
	}
	
@@ -616,28 +614,17 @@ group ACR_CBTemplates {
	{
		id := "rule66",
		conditions := p_condition,
		actions := {elem:={{boolean := false}}},
//		actions := {elem:={{boolean := false}}},
        actions := omit,
		transformations := omit
	}

	template ConditionsType m_conditionsType_identity(template charstring p_id, template charstring p_scheme) := {
		content := {{
			identity := {{
				content := {{
            		one := {
            			id := p_id,
            			//scheme := p_scheme,
            			//any_1 := omit
                        elem := {charstring := p_scheme}
        content := {
            {identity := {content := {{one := {id := p_id, elem := omit}}}}} 
        }
				}}
			}}
		}}
	}
	
	
	
	
} //end group ACR_CBTemplates

group CUGTemplates {
@@ -691,7 +678,7 @@ group CWTemplates {
	template Ims_cw m_CW(template TEmptyType p_cwi) := {
        anyAttributes := omit,
        communication_waiting_indication := p_cwi,
        elem := omit	    
        elem_list := omit	    
	}
	
    template Cug m_CW2 (
@@ -788,62 +775,62 @@ group PSTNTemplates {
	
    template PSTN_transit m_PSTN_transit_BC1(template BearerCapabilityType p_bct) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := omit,
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := omit,
            lowLayerCompatibility := omit,
            progressIndicator := omit,
            display_ := omit
            progressIndicator_list := omit,
            display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC2(template BearerCapabilityType p_bct,
    										 template BearerCapabilityType p_bct2) :=
    {
            bearerInfomationElement := {p_bct, p_bct2},
            highLayerCompatibility := omit,
        bearerInfomationElement_list := {p_bct, p_bct2},
        highLayerCompatibility_list := omit,
            lowLayerCompatibility := omit,
            progressIndicator := omit,
            display_ := omit
        progressIndicator_list := omit,
        display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC1_HLC1(template BearerCapabilityType p_bct, 
    										 	  template HighLayerCompatibilityType p_hlc) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := {p_hlc},
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := {p_hlc},
            lowLayerCompatibility := omit,
            progressIndicator := omit,
            display_ := omit
            progressIndicator_list := omit,
        display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC1_LLC(template BearerCapabilityType p_bct,
    											 template LowLayerCompatibilityType p_llc) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := omit,
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := omit,
            lowLayerCompatibility := p_llc,
            progressIndicator := omit,
            display_ := omit
            progressIndicator_list := omit,
        display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC1_PI1(template BearerCapabilityType p_bct,
    											 template ProgressIndicatorType p_pi1) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := omit,
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := omit,
            lowLayerCompatibility := omit,
            progressIndicator := {p_pi1},
            display_ := omit
            progressIndicator_list := {p_pi1},
        display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC1_PI2(template BearerCapabilityType p_bct,
                                                 template ProgressIndicatorType p_pi1,
    											 template ProgressIndicatorType p_pi2) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := omit,
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := omit,
            lowLayerCompatibility := omit,
            progressIndicator := {p_pi1, p_pi2},
            display_ := omit
            progressIndicator_list := {p_pi1, p_pi2},
            display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC1_PI3(template BearerCapabilityType p_bct,
@@ -851,43 +838,43 @@ group PSTNTemplates {
    											 template ProgressIndicatorType p_pi2,
                                                 template ProgressIndicatorType p_pi3) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := omit,
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := omit,
            lowLayerCompatibility := omit,
            progressIndicator := {p_pi1, p_pi2, p_pi3},
            display_ := omit
            progressIndicator_list := {p_pi1, p_pi2, p_pi3},
            display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC1_HLC2(template BearerCapabilityType p_bct,
                                                  template HighLayerCompatibilityType p_hlc1,
                                                  template HighLayerCompatibilityType p_hlc2) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := {p_hlc1, p_hlc2},
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := {p_hlc1, p_hlc2},
            lowLayerCompatibility := omit,
            progressIndicator := omit,
            display_ := omit
            progressIndicator_list := omit,
            display__list := omit
    }

    template PSTN_transit m_PSTN_transit_BC1_HLC1_PI1(template BearerCapabilityType p_bct,
    											 template HighLayerCompatibilityType p_hlc1,
                                                 template ProgressIndicatorType p_pi1) :=
    {
            bearerInfomationElement := {p_bct},
            highLayerCompatibility := {p_hlc1},
            bearerInfomationElement_list := {p_bct},
            highLayerCompatibility_list := {p_hlc1},
            lowLayerCompatibility := omit,
            progressIndicator := {p_pi1},
            display_ := omit
            progressIndicator_list := {p_pi1},
            display__list := omit
    }
	
	template PSTN_transit mw_PSTN_transit_bc(template BearerCapabilityType p_bct,
											 template BearerCapabilityType p_bct2) :=
	{
			bearerInfomationElement := {p_bct, p_bct2},
			highLayerCompatibility := {*, *},
			bearerInfomationElement_list := {p_bct, p_bct2},
			highLayerCompatibility_list := {*, *},
			lowLayerCompatibility := *,
			progressIndicator := {*},
			display_ := {*}
			progressIndicator_list := {*},
			display__list := {*}
	}											 
											 
	
@@ -1045,14 +1032,14 @@ group CDIVNTemplates {
				diverted_to_user_selection_criteria := omit,
				diversion_time_selection_criteria := omit,
				diversion_reason_selection_criteria := omit,
				elem := omit
				elem_list := omit
			},
			comm_div_ntfy_trigger_criteria := omit,
			comm_div_info_selection_criteria := omit,
			elem := omit
			elem_list := omit
		},
		comm_div_ntfy_info := omit,
		elem := omit
		elem_list := omit
	}


@@ -1066,7 +1053,7 @@ group ResourceListsTemplates {
        EntryType p_user2
    ) :=
    {
        sequence := {
        sequence_list := {
            {
                list := {
                    name := omit,
@@ -1084,7 +1071,7 @@ group ResourceListsTemplates {
                            }
                        }
                    },
                    elem := omit
                    elem_list := omit
                }
            }
        }
@@ -1097,7 +1084,7 @@ group ResourceListsTemplates {
			p_user.hostPort.host,
		anyAttributes := omit,
        display_name := omit,
        elem := omit
        elem_list := omit
	}
}// end grouup ResourceListsTemplates

@@ -1112,10 +1099,10 @@ group Ims3gppTemplates {
                anyAttributes := *, 
                type_ := ?, 
                reason := ?, 
                elem := *
                elem_list := *
            }
        },
        elem := *
        elem_list := *
    }
//	template TIMS3GPP mw_Ims_3gpp_CW := {
//		version := 1.0,
@@ -1144,7 +1131,7 @@ group CONFTemplates {
	
	template anyAttributes m_emptyAnyAttributes:={}
	
	template ietf_params_xml_ns_conference_info.Media_type m_mediatype_status(template Media_status_type p_status):= {
	template urn_ietf_params_xml_ns_conference_info.Media_type m_mediatype_status(template Media_status_type p_status):= {
		id:="1",
		anyAttributes:=omit,//m_emptyAnyAttributes,
		display_text :=omit,
@@ -1152,10 +1139,10 @@ group CONFTemplates {
		label_ :=omit,
		src_id:=omit,
		status:= p_status,
		elem:=omit
		elem_list:=omit
	}
	
	template Endpoint_type m_endpoint(template charstring p_Uri,template Endpoint_status_type p_epStatus,template Joining_type p_joinMethod, template Disconnection_type p_discMethod, template ietf_params_xml_ns_conference_info.Media_type p_mediastatus):= {
	template Endpoint_type m_endpoint(template charstring p_Uri,template Endpoint_status_type p_epStatus,template Joining_type p_joinMethod, template Disconnection_type p_discMethod, template urn_ietf_params_xml_ns_conference_info.Media_type p_mediastatus):= {
		entity:=p_Uri,
		state:=full,
		anyAttributes:=omit,//m_emptyAnyAttributes,
@@ -1166,9 +1153,9 @@ group CONFTemplates {
		joining_info:=omit,
		disconnection_method:=omit,
		disconnection_info:=omit,
		media:={p_mediastatus},// optional, 
		media_list:={p_mediastatus},// optional, 
		call_info:=omit,
		elem:=omit
		elem_list:=omit
	}
	
	template User_type m_1user (template charstring p_Uri,template Endpoint_type p_endpoint) := {
@@ -1180,22 +1167,22 @@ group CONFTemplates {
		roles:=omit,
		languages :=omit,
		cascaded_focus :=omit,
		endpoint:={p_endpoint},// optional,
		elem:=omit
		endpoint_list:={p_endpoint},// optional,
		elem_list:=omit
	}
	
	template Users_type m_users_1user_full(template User_type p_user):={
			state:=full,
		    anyAttributes := omit,//m_emptyAnyAttributes,
		    user:={p_user},
		    elem:=omit
		    user_list:={p_user},
		    elem_list:=omit
	}
	
	template Users_type m_users_2user_full(template User_type p_user1,template User_type p_user2):={
			state:=full,
			anyAttributes := omit,//m_emptyAnyAttributes,
			user:={p_user1,p_user2},
			elem:=omit
			user_list:={p_user1,p_user2},
			elem_list:=omit
	}
	
	template Conference_state_type m_conference_state(template unsignedInt p_nUsers, template booleanXSD p_active, template booleanXSD p_locked) := {
@@ -1203,7 +1190,7 @@ group CONFTemplates {
    	user_count:=p_nUsers,
    	active:=p_active,
    	locked:=p_locked,
    	elem := omit
    	elem_list:= omit
	}

    template Conference_type m_ci_cUri_cState_userEntity(template charstring p_cUri, template Conference_state_type p_cState, template Users_type p_users ) := {
@@ -1217,7 +1204,7 @@ group CONFTemplates {
        users := p_users,
        sidebars_by_ref := omit,
        sidebars_by_val := omit,
        elem := omit
        elem_list := omit
    }
	
 template Conference_type mw_conferenceInfo_active := {
@@ -1231,7 +1218,7 @@ group CONFTemplates {
	 users := {
		 state := ?,
		 anyAttributes := ?,
		 user := {
		 user_list := {
			 {
				 entity := *,
				 state := *,
@@ -1241,7 +1228,7 @@ group CONFTemplates {
				 roles := *,
				 languages := *,
				 cascaded_focus := *,
				 endpoint := {
				 endpoint_list := {
					 {
						 entity := *,
						 state := *,
@@ -1253,19 +1240,19 @@ group CONFTemplates {
						 joining_info := *,
						 disconnection_method := *,
						 disconnection_info := *,
						 media := *,
						 media_list := *,
						 call_info := *,
						 elem := *
						 elem_list := *
					 }
				 },
				 elem := *
				 elem_list := *
			 }
		 },
		 elem := omit
		 elem_list := omit
	 },
	 sidebars_by_ref := *,
	 sidebars_by_val := *,
	 elem := *
	 elem_list := *
 }
}
	
@@ -1301,7 +1288,7 @@ group request_send {
	
	template BYE_Request m_BYE_Request_Reason_IMS
		( SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,
		Via p_via, template Route p_route, integer p_cause)
		Via p_via, template Route p_route, charstring p_cause)
		modifies m_BYE_Request_Base
		:=
		{
@@ -3217,7 +3204,7 @@ group response_send
	}
	
	template Response m_Response_onINVITE_Reason (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,
				From p_from, To p_to, Via p_via, Contact p_contact, template RecordRoute p_recordRoute, integer p_cause) modifies m_Response_Base:=
				From p_from, To p_to, Via p_via, Contact p_contact, template RecordRoute p_recordRoute, charstring p_cause) modifies m_Response_Base:=
	{
		msgHeader :=
		{