Commit f507a7c9 authored by schmitting's avatar schmitting
Browse files

Update to TTwb 1.12

parent 03d96d19

ttcn/LibSip_Templates.ttcn

+32 −2
Original line number Diff line number Diff line
@@ -23,6 +23,36 @@ module LibSip_Templates 
	import from LibSip_XMLTypes all;

    import from LibSip_SimpleMsgSummaryTypes all;

	

    import from NoTargetNamespace language "XSD" all

    with {

        extension "File:../xsd/Ims3gpp.xsd"

    }

    

    import from urn_ietf_params_xml_ns_conference_info language "XSD" all

    with {

        extension "File:../xsd/CONF.xsd"

    }

    

    import from http_uri_etsi_org_ngn_params_xml_simservs_pstn language "XSD" all

    with {

        extension "File:../xsd/PSTN.xsd"

    }

    

    import from http_uri_etsi_org_ngn_params_xml_simservs_xcap language "XSD" all

    with {

        extension "File:../xsd/SupplementaryServices.xsd"

    }

	

    import from http_uri_etsi_org_ngn_params_xml_simservs_mcid language "XSD" all

    with {

        extension "File:../xsd/MCID.xsd"

    }

	

    import from urn_ietf_params_xml_ns_resource_lists language "XSD" all

    with {

        extension "File:../xsd/ResourceList.xsd"

    }

	

	group ModuleParameters {

	

	    modulepar boolean MB_LENGTH_FROM_ENCVAL:=false; //* to get length of message body from ecoded value
@@ -2851,7 +2881,7 @@ group MessageBodies { 
	

	template MessageBody mw_MBody_MIME_Ims3gpp(

		template charstring p_disposition, 

		template TIMS3GPP p_ims3gpp

		template Ims_3gpp p_ims3gpp

	):= {

		mimeMessageBody := {boundary:=?, 

			mimeEncapsulatedList:= {
@@ -2872,7 +2902,7 @@ group MessageBodies { 
	

	template MessageBody mw_MBody_MIME_Ims3gppCW(

		template charstring p_disposition, 

		template TIMS3GPP p_ims3gpp

		template Ims_3gpp p_ims3gpp

	):= {

		mimeMessageBody := {boundary:=?, 

			mimeEncapsulatedList:= {

ttcn/LibSip_XMLTypes.ttcn

+24 −18
Original line number Diff line number Diff line
@@ -29,72 +29,78 @@ 
module LibSip_XMLTypes language "TTCN-3:2009" {

	import from XSDAUX all;



    import from org_w3_www__XML_1998_namespace language "XSD" all

    import from http_www_w3_org_XML_1998_namespace language "XSD" all

    with {

        extension "File:../xsd/xml.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 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 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"

    }

    

    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 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 oma_xml_xdm_common_policy language "XSD" all

    import from urn_oma_xml_xdm_common_policy language "XSD" all

    with {

        extension "File:../xsd/xdm_commonPolicy-v1_0.xsd"

    }

    // RFC 3680 Registration Info

    import from ietf_params_xml_ns_reginfo language "XSD" all

    import from urn_ietf_params_xml_ns_reginfo language "XSD" all

    with {

        extension "File:../xsd/regInfo.xsd" 

    }

    // RFC 3863 Presence Information Data Format

    import from ietf_params_xml_ns_reginfo language "XSD" all

    import from urn_ietf_params_xml_ns_pidf language "XSD" all

    with {

        extension "File:../xsd/pidf.xsd" 

    }

    // RFC 4119 Presence Information Data Format, Location Object extension 

    import from ietf_params_xml_ns_reginfo language "XSD" all

    import from urn_ietf_params_xml_ns_pidf_geopriv10_basicPolicy language "XSD" all

    with {

        extension "File:../xsd/geopriv10basic.xsd" 

    }

    

    // RFC 4119 Presence Information Data Format, Location Object extension 

    import from urn_ietf_params_xml_ns_pidf_geopriv10 language "XSD" all

    with {

        extension "File:../xsd/pidf_lo.xsd" 

    }
@@ -110,8 +116,8 @@ import from XSDAUX all; 
            TIMS3GPP ims3gpp,					// if there is XML IMS 3GPP

            PSTN_transit pstnTransit,			// if there is XML PSTN_transit

            Resource_lists resourceLists,		// if there is XML Resource List data

            RegInfo regInfo, // if it is a registration event

            Pidf_Lo pidfLo    // if it is  a Presence Information Data Format Location Object

            Reginfo regInfo,                    // if it is a registration event

            Geopriv geopriv                     // if it is  a Presence Information Data Format Location Object

        }

    }

} /* end module LibSip_XMLTypes */
 
 No newline at end of file
 
} /* end module LibSip_XMLTy
 
 No newline at end of file

ttcn/XSDAUX.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ module XSDAUX language "TTCN-3:2005"{//MRO 
	type integer nonNegativeInteger (0 .. infinity) ;



	/* 39.unsignedLong */

//	type integer unsignedLong (0 .. 18446744073709551615) ;//MRO

	type integer unsignedLong (0 .. 18446744073709551615) ;//MRO



	/* 40.unsignedInt */

	type integer unsignedInt (0 .. 4294967295) ;

xsd/pidf.xsd

+1 −1
Original line number Diff line number Diff line 
  <?xml version="1.0" encoding="UTF-8"?>



   <xs:schema targetNamespace="urn:ietf:params:xml:ns:pidf"

        xmlns:tns="urn:ietf:params:xml:ns:pidf"

        xmlns:xs="http://www.w3.org/2001/XMLSchema"

xsd/pidf_lo.xsd

+6 −5
Original line number Diff line number Diff line 
   <?xml version="1.0" encoding="UTF-8"?>

   <xs:schema

     targetNamespace="urn:ietf:params:xml:ns:pidf:geopriv10"

     xmlns:tns="urn:ietf:params:xml:ns:pidf:geopriv10"

     xmlns:gbp="urn:ietf:params:xml:ns:pidf:geopriv10:basicPolicy"

     xmlns:xs="http://www.w3.org/2001/XMLSchema"

     elementFormDefault="qualified" attributeFormDefault="unqualified">

<!--

        RFC 4119

-->



   <xs:import namespace=

        "urn:ietf:params:xml:ns:pidf:geopriv10:basicPolicy" />

        "urn:ietf:params:xml:ns:pidf:geopriv10:basicPolicy" 

        schemaLocation="geopriv10basic.xsd"/>



      <!-- This import brings in the XML language attribute xml:lang-->



      <xs:import namespace="http://www.w3.org/XML/1998/namespace"

        schemaLocation="http://www.w3.org/2001/xml.xsd"/>



      <xs:element name="geopriv" type="tns:geopriv"/>



   <xs:complexType name="geopriv">