Commit 7893fc5b authored by nikolajev's avatar nikolajev
Browse files

XSD files refreshed and common formatting applied

parent d33f201f

xsd/ACR_CB.xsd

+30 −18
Changes for xsd/ACR_CB.xsd: 30 added lines, 18 removed lines.
Original line number Diff line number Diff line 


<?xml version="1.0" encoding="UTF-8"?>

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

xmlns:ss="http://uri.etsi.org/ngn/params/xml/simservs/xcap" xmlns:cp="urn:ietf:params:xml:ns:common-policy"

xmlns:ocp="urn:oma:xml:xdm:common-policy"

targetNamespace="http://uri.etsi.org/ngn/params/xml/simservs/xcap" elementFormDefault="qualified"

attributeFormDefault="unqualified">

    xmlns:ss="http://uri.etsi.org/ngn/params/xml/simservs/xcap"

    xmlns:cp="urn:ietf:params:xml:ns:common-policy" xmlns:ocp="urn:oma:xml:xdm:common-policy"

    targetNamespace="http://uri.etsi.org/ngn/params/xml/simservs/xcap"

    elementFormDefault="qualified" attributeFormDefault="unqualified">

    <!-- import common policy definitions -->

<xs:import namespace="urn:ietf:params:xml:ns:common-policy" schemaLocation="common-policy.xsd"/>

    <xs:import namespace="urn:ietf:params:xml:ns:common-policy"

        schemaLocation="common-policy.xsd" />

    <!-- import OMA common policy extensions -->

<xs:import namespace="urn:oma:xml:xdm:common-policy" schemaLocation="xdm_commonPolicy-v1_0.xsd"/>

<!-- incoming communication barring rule set based on the common policy rule set.-->

<xs:element name="incoming-communication-barring" substitutionGroup="ss:absService">

    <xs:import namespace="urn:oma:xml:xdm:common-policy"

        schemaLocation="xdm_commonPolicy-v1_0.xsd" />

    <!-- incoming communication barring rule set based on the common policy 

        rule set. -->

    <xs:element name="incoming-communication-barring"

        substitutionGroup="ss:absService">

        <xs:annotation>

<xs:documentation>This is the incoming communication barring configuration

document.</xs:documentation>

            <xs:documentation>This is the incoming communication barring

                configuration document.

            </xs:documentation>

        </xs:annotation>

        <xs:complexType>

            <xs:complexContent>

                <xs:extension base="ss:simservType">

                    <xs:sequence>

                        <!-- add service specific elements here -->

<xs:element ref="cp:ruleset" minOccurs="0"/>

                        <xs:element ref="cp:ruleset"

                            minOccurs="0" />

                    </xs:sequence>

                </xs:extension>

                <!-- service specific attributes can be defined here -->

            </xs:complexContent>

        </xs:complexType>

    </xs:element>

<!-- outgoing communication barring rule set based on the common policy rule set.-->

<xs:element name="outgoing-communication-barring" substitutionGroup="ss:absService">

    <!-- outgoing communication barring rule set based on the common policy 

        rule set. -->

    <xs:element name="outgoing-communication-barring"

        substitutionGroup="ss:absService">

        <xs:annotation>

<xs:documentation>This is the outgoing communication barring configuration

document.</xs:documentation>

            <xs:documentation>This is the outgoing communication barring

                configuration

                document.

            </xs:documentation>

        </xs:annotation>

        <xs:complexType>

            <xs:complexContent>

                <xs:extension base="ss:simservType">

                    <xs:sequence>

                        <!-- add service specific elements here -->

<xs:element ref="cp:ruleset" minOccurs="0"/>

                        <xs:element ref="cp:ruleset"

                            minOccurs="0" />

                    </xs:sequence>

                </xs:extension>

                <!-- service specific attributes can be defined here -->

            </xs:complexContent>

        </xs:complexType>

    </xs:element>

<!-- communication barring specific extensions to IETF common policy actions-->

    <!-- communication barring specific extensions to IETF common policy 

        actions -->

    <xs:element name="allow" type="ss:allow-action-type" />

    <!-- communication barring specific type declarations -->

    <!-- <xs:simpleType name="allow-action-type" final="list restriction"> -->

xsd/CDIV.xsd

+39 −26
Changes for xsd/CDIV.xsd: 39 added lines, 26 removed lines.
Original line number Diff line number Diff line 


<?xml version="1.0" encoding="UTF-8"?>

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

    xmlns:ss="http://uri.etsi.org/ngn/params/xml/simservs/xcap"

xmlns:cp="urn:ietf:params:xml:ns:common-policy"

xmlns:ocp="urn:oma:xml:xdm:common-policy"

    xmlns:cp="urn:ietf:params:xml:ns:common-policy" xmlns:ocp="urn:oma:xml:xdm:common-policy"

    targetNamespace="http://uri.etsi.org/ngn/params/xml/simservs/xcap"

elementFormDefault="qualified"

attributeFormDefault="unqualified">

    elementFormDefault="qualified" attributeFormDefault="unqualified">

    <!-- import common policy definitions -->

<xs:import namespace="urn:ietf:params:xml:ns:common-policy" schemaLocation="common-policy.xsd"/>

    <xs:import namespace="urn:ietf:params:xml:ns:common-policy"

        schemaLocation="common-policy.xsd" />

    <!-- import OMA common policy extensions -->

<xs:import namespace="urn:oma:xml:xdm:common-policy" schemaLocation="xdm_commonPolicy-v1_0.xsd"/>

<!-- communication diversion specific extensions to IETF common policy conditions. The

cp:conditionsType is expanded with the elements: ss:not-registered, ss:busy, ss:no-answer, ss:notreachable,

ss:media as optional elements -->

<!-- communication diversion rule set based on the common policy rule set.-->

<xs:element name="communication-diversion" substitutionGroup="ss:absService">

    <xs:import namespace="urn:oma:xml:xdm:common-policy"

        schemaLocation="xdm_commonPolicy-v1_0.xsd" />

    <!-- communication diversion specific extensions to IETF common policy 

        conditions. The cp:conditionsType is expanded with the elements: ss:not-registered, 

        ss:busy, ss:no-answer, ss:notreachable, ss:media as optional elements -->

    <!-- communication diversion rule set based on the common policy rule 

        set. -->

    <xs:element name="communication-diversion"

        substitutionGroup="ss:absService">

        <xs:annotation>

<xs:documentation>This is the communication diversion configuration

document.</xs:documentation>

            <xs:documentation>This is the communication diversion

                configuration

                document.

            </xs:documentation>

        </xs:annotation>

        <xs:complexType>

            <xs:complexContent>

                <xs:extension base="ss:simservType">

                    <xs:sequence>

                        <!-- add service specific elements here -->

<xs:element ref="cp:ruleset" minOccurs="0"/>

                        <xs:element ref="cp:ruleset"

                            minOccurs="0" />

                    </xs:sequence>

                </xs:extension>

                <!-- service specific attributes can be defined here -->

            </xs:complexContent>

        </xs:complexType>

    </xs:element>

<!-- communication diversion specific extensions to IETF common policy actions-->

<xs:element name="forward-to" type="ss:forward-to-type"/> <xs:simpleType name="reveal-URIoptions-type">

    <!-- communication diversion specific extensions to IETF common policy 

        actions -->

    <xs:element name="forward-to" type="ss:forward-to-type" />

    <xs:simpleType name="reveal-URIoptions-type">

        <xs:restriction base="xs:string">

            <xs:enumeration value="false" />

            <xs:enumeration value="not-reveal-GRUU" />
@@ -42,17 +49,23 @@ document.</xs:documentation> 
    <!-- communication diversion specific type declarations -->

    <xs:complexType name="forward-to-type">

        <xs:sequence>

<xs:element name="target" type="xs:anyURI" minOccurs="1" maxOccurs="1"/>

<xs:element name="notify-caller" type="xs:boolean" default="true" minOccurs="0"/>

<xs:element name="reveal-identity-to-caller" type="ss:reveal-URIoptions-type"

default="true" minOccurs="0"/>

<xs:element name="reveal-served-user-identity-to-caller" type="ss:reveal-URIoptions-type"

            <xs:element name="target" type="xs:anyURI"

                minOccurs="1" maxOccurs="1" />

            <xs:element name="notify-caller" type="xs:boolean"

                default="true" minOccurs="0" />

<xs:element name="notify-served-user" type="xs:boolean" default="false" minOccurs="0"/>

<xs:element name="notify-served-user-on-outbound-call" type="xs:boolean" default="false"

            <xs:element name="reveal-identity-to-caller"

                type="ss:reveal-URIoptions-type" default="true"

                minOccurs="0" />

            <xs:element name="reveal-served-user-identity-to-caller"

                type="ss:reveal-URIoptions-type" default="true"

                minOccurs="0" />

            <xs:element name="notify-served-user" type="xs:boolean"

                default="false" minOccurs="0" />

            <xs:element name="notify-served-user-on-outbound-call"

                type="xs:boolean" default="false" minOccurs="0" />

            <xs:element name="reveal-identity-to-target"

                type="ss:reveal-URIoptions-type" default="true"

                minOccurs="0" />

<xs:element name="reveal-identity-to-target" type="ss:reveal-URIoptions-type"

default="true" minOccurs="0"/>

            <xs:element ref="ss:NoReplyTimer" minOccurs="0" />

        </xs:sequence>

    </xs:complexType>

xsd/CDIVN.xsd

+100 −123
Changes for xsd/CDIVN.xsd: 100 added lines, 123 removed lines.
Original line number Diff line number Diff line 


<xs:schema 

  targetNamespace="http://uri.etsi.org/ngn/params/xml/comm-div-info"  

<?xml version="1.0" encoding="UTF-8" ?>

<xs:schema targetNamespace="http://uri.etsi.org/ngn/params/xml/comm-div-info"

    xmlns:tns="http://uri.etsi.org/ngn/params/xml/comm-div-info"

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

  xmlns="http://uri.etsi.org/ngn/params/xml/comm-div-info" 

  elementFormDefault="qualified" 

  attributeFormDefault="unqualified">

  <!--

  This import brings in the XML language definition

  -->

    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/ngn/params/xml/comm-div-info"

    elementFormDefault="qualified" attributeFormDefault="unqualified">

    <!-- This import brings in the XML language definition -->

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

        schemaLocation="xml.xsd" />

  <!-- 

  Communication Diversion Information. This is the top-level XML element 

  -->

  <xs:element name="comm-div-info" 

    type="comm-div-info-type" /> 

  <!--

  Communication Diversion Information Type. This is the top-level XML element 

  -->

    <!-- Communication Diversion Information. This is the top-level XML element -->

    <xs:element name="comm-div-info" type="comm-div-info-type" />

    <!-- Communication Diversion Information Type. This is the top-level 

        XML element -->

    <xs:complexType name="comm-div-info-type">

        <xs:sequence>

      <xs:element name="comm-div-subs-info"

        type="comm-div-subs-info-type" minOccurs="0" />

      <xs:element name="comm-div-ntfy-info"

        type="comm-div-ntfy-info-type" minOccurs="0" />

            <xs:element name="comm-div-subs-info" type="comm-div-subs-info-type"

                minOccurs="0" />

            <xs:element name="comm-div-ntfy-info" type="comm-div-ntfy-info-type"

                minOccurs="0" />

            <xs:any namespace="##other" processContents="lax"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:attribute name="entity" type="xs:anyURI" 

      use="required"/>

        <xs:attribute name="entity" type="xs:anyURI" use="required" />

    </xs:complexType>

  <!---

  Communication Diversion Subscription Type.

  Used at Subscription time to

        select Communication Diversions for notification,

        when to notify them and

        what to notify.

  -->

    <!--- Communication Diversion Subscription Type. Used at Subscription 

        time to select Communication Diversions for notification, when to notify 

        them and what to notify. -->

    <xs:complexType name="comm-div-subs-info-type">

        <xs:sequence>

            <xs:element name="comm-div-selection-criteria"

        type="comm-div-selection-criteria-type" 

        minOccurs="0" />

                type="comm-div-selection-criteria-type" minOccurs="0" />

            <xs:element name="comm-div-ntfy-trigger-criteria"

        type="comm-div-ntfy-trigger-criteria-type" 

        minOccurs="0" />

                type="comm-div-ntfy-trigger-criteria-type" minOccurs="0" />

            <xs:element name="comm-div-info-selection-criteria"

        type="comm-div-info-selection-criteria-type" 

        minOccurs="0" />

                type="comm-div-info-selection-criteria-type" minOccurs="0" />

            <xs:any namespace="##other" processContents="lax"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!---

  Communication Diversion Notification Information Type

  Used while notifying the User about the Communication Diversion

  -->

    <!--- Communication Diversion Notification Information Type Used while 

        notifying the User about the Communication Diversion -->

    <xs:complexType name="comm-div-ntfy-info-type">

        <xs:sequence>

      <xs:element name="originating-user-info"

        type="user-info-type" minOccurs="0" />

      <xs:element name="diverting-user-info"

        type="xs:anyURI" minOccurs="0" />

      <xs:element name="diverted-to-user-info"

        type="xs:anyURI" minOccurs="0" />

      <xs:element name="diversion-time-info" 

        type="xs:dateTime" minOccurs="0" />

      <xs:element name="diversion-reason-info"

        type="diversion-reason-info-type" minOccurs="0" />

      <xs:element name="diversion-rule-info"

        type="diversion-rule-info-type" minOccurs="0" />

            <xs:element name="originating-user-info" type="user-info-type"

                minOccurs="0" />

            <xs:element name="diverting-user-info" type="xs:anyURI"

                minOccurs="0" />

            <xs:element name="diverted-to-user-info" type="xs:anyURI"

                minOccurs="0" />

            <xs:element name="diversion-time-info" type="xs:dateTime"

                minOccurs="0" />

            <xs:element name="diversion-reason-info" type="diversion-reason-info-type"

                minOccurs="0" />

            <xs:element name="diversion-rule-info" type="diversion-rule-info-type"

                minOccurs="0" />

            <xs:any namespace="##other" processContents="lax"

                minOccurs="0" maxOccurs="unbounded" />

            <xs:element name="previous-cdivn-state" type="cdivn-states-types"

                minOccurs="0" maxOccurs="1" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  COMMUNICATION DIVERSION SELECTION CRITERIA

  -->

    <!-- COMMUNICATION DIVERSION SELECTION CRITERIA -->

    <xs:complexType name="comm-div-selection-criteria-type">

        <xs:sequence>

            <xs:element name="originating-user-selection-criteria"

        type="user-selection-criteria-type" 

        minOccurs="0" />

                type="user-selection-criteria-type" minOccurs="0" />

            <xs:element name="diverting-user-selection-criteria"

        type="xs:anyURI" 

        minOccurs="0" />

                type="xs:anyURI" minOccurs="0" />

            <xs:element name="diverted-to-user-selection-criteria"

        type="xs:anyURI" 

        minOccurs="0" />

                type="xs:anyURI" minOccurs="0" />

            <xs:element name="diversion-time-selection-criteria"

        type="time-range-selection-criteria-type" 

        minOccurs="0" />

                type="time-range-selection-criteria-type" minOccurs="0" />

            <xs:element name="diversion-reason-selection-criteria"

                type="diversion-reason-selection-criteria-type"

                minOccurs="0" />

            <xs:any namespace="##other" processContents="lax"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  COMMUNICATION DIVERSION NOTIFICATION TRIGGER CRITERIA

  -->

    <!-- COMMUNICATION DIVERSION NOTIFICATION TRIGGER CRITERIA -->

    <xs:complexType name="comm-div-ntfy-trigger-criteria-type">

        <xs:sequence>

            <xs:element name="notification-time-selection-criteria"

        type="time-range-selection-criteria-type" 

        minOccurs="0" />

                type="time-range-selection-criteria-type" minOccurs="0" />

            <xs:element name="presence-status-selection-criteria"

                type="presence-status-selection-criteria-type"

                minOccurs="0" />

      <xs:element name="notification-buffer-interval" minOccurs="0" default="86400">

            <xs:element name="notification-buffer-interval"

                minOccurs="0" default="86400">

                <xs:simpleType>

                    <xs:restriction base="xs:integer">

                        <xs:maxInclusive value="86400" />
@@ -123,11 +101,10 @@ 
            <xs:any namespace="##other" processContents="lax"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  COMMUNICATION DIVERSION INFORMATION SELECTION CRITERIA

  -->

    <!-- COMMUNICATION DIVERSION INFORMATION SELECTION CRITERIA -->

    <xs:complexType name="comm-div-info-selection-criteria-type">

        <xs:sequence>

            <xs:element name="disable-originating-user-info"
@@ -145,21 +122,32 @@ 
            <xs:any namespace="##other" processContents="lax"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>



    <!-- User Info Type -->

    <xs:complexType name="user-info-type">

        <xs:sequence>

      <xs:element name="user-name" type="xs:string" minOccurs="0" maxOccurs="1"/>

            <xs:element name="user-name" type="xs:string"

                minOccurs="0" maxOccurs="1" />

            <xs:element name="user-URI" type="xs:anyURI" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>



  <!--    

  DIVERSION REASON INFO

  -->

    <!-- CDIVN FSM STATES -->

    <xs:simpleType name="cdivn-states-types">

        <xs:list itemType="cdivn-states-type" />

    </xs:simpleType>

    <xs:simpleType name="cdivn-states-type">

        <xs:restriction base="xs:string">

            <xs:enumeration value="IDLE" />

            <xs:enumeration value="DIVERSION_NOTIFIED" />

            <xs:enumeration value="DIVERSION_NOT_NOTIFIED" />

        </xs:restriction>

    </xs:simpleType>

    <!-- DIVERSION REASON INFO -->



    <xs:simpleType name="diversion-reason-info-types">

        <xs:list itemType="diversion-reason-info-type" />
@@ -175,75 +163,64 @@ 
            <xs:enumeration value="503" />

        </xs:restriction>

    </xs:simpleType>

  <!--    

  DIVERSION RULE INFO

  -->

    <!-- DIVERSION RULE INFO -->

    <xs:complexType name="diversion-rule-info-type">

        <xs:sequence>

            <xs:element name="diversion-rule" type="xs:string" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  ORIGINATING USER SELECTION CRITERIA

  -->

    <!-- ORIGINATING USER SELECTION CRITERIA -->

    <xs:complexType name="user-selection-criteria-type">

        <xs:sequence>

      <xs:element name="user-info" 

        type="user-info-type" minOccurs="0"

        maxOccurs="unbounded" />

            <xs:element name="user-info" type="user-info-type"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  DIVERSION REASON SELECTION CRITERIA

  -->

    <!-- DIVERSION REASON SELECTION CRITERIA -->

    <xs:complexType name="diversion-reason-selection-criteria-type">

        <xs:sequence>

      <xs:element name="diversion-reason-info" 

        type="diversion-reason-info-types"/>

            <xs:element name="diversion-reason-info" type="diversion-reason-info-types" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  TIME RANGE SELECTION CRITERIA

  -->

    <!-- TIME RANGE SELECTION CRITERIA -->

    <xs:complexType name="time-range-selection-criteria-type">

        <xs:sequence>

      <xs:element name="time-range" 

        type="time-range-type" minOccurs="0" 

        maxOccurs="unbounded" />

            <xs:element name="time-range" type="time-range-type"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  TIME RANGE INFO

  -->

    <!-- TIME RANGE INFO -->

    <xs:complexType name="time-range-type">

        <xs:sequence>

            <xs:element name="start-time" type="xs:dateTime" />

            <xs:element name="end-time" type="xs:dateTime" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  PRESENCE STATUS SELECTION CRITERIA

  -->

    <!-- PRESENCE STATUS SELECTION CRITERIA -->

    <xs:complexType name="presence-status-selection-criteria-type">

        <xs:sequence>

      <xs:element name="presence-status-info" 

        type="presence-status-info-type" minOccurs="0"

        maxOccurs="unbounded" />

            <xs:element name="presence-status-info" type="presence-status-info-type"

                minOccurs="0" maxOccurs="unbounded" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

  <!--

  PRESENCE STATUS INFo

  -->

    <!-- PRESENCE STATUS INFo -->

    <xs:complexType name="presence-status-info-type">

        <xs:sequence>

            <xs:element name="presence-status" type="xs:string" />

        </xs:sequence>

    <xs:anyAttribute namespace="##other" processContents="lax"/>

        <xs:anyAttribute namespace="##other"

            processContents="lax" />

    </xs:complexType>

</xs:schema>

xsd/CONF.xsd

+112 −157

File changed.

Preview size limit exceeded, changes collapsed.

xsd/Ims3gpp.xsd

+11 −5

File changed.

Preview size limit exceeded, changes collapsed.