Changeset 3153

Show
Ignore:
Timestamp:
01/25/11 11:05:36
Author:
douglm
Message:

Changes related to exchange synch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/resources/exsynchwsdefs/patch.xsd

    r3113 r3153  
    2020  <!ENTITY last   "(&child;|&aname;|&nspa;)"> 
    2121 ]> 
    22 <!-- This is the schema for the XML patch operations defined in RFC 5261 
     22<!-- This is the schema for the XML patch operations defined in RFC 5261 as  
     23  modified for xcalendar updates and according to appropriate conventions. 
     24   
     25  As this is intended for use in a SOAP environment the xs:any for the new or 
     26  replacement value is going to be a problem. 
     27   
     28  For icalendar patching we can restrict the value to be an icalendar element. 
     29   
     30  We select the outer vcalendar is we wish to add a component 
     31 
     32  We select a component if we wish to add a property or a component to that  
     33  component or if we wish to delete that component  
     34 
     35  We select a property to change it's parameters or it's value or delete it. The  
     36  value can be a parameter to add, a new value for the property or nothing to delete 
     37   
     38  We select a parameter to delete it or change its value. The value is a value-type 
     39  element 
     40   
    2341--> 
    2442 
    25 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"  
    26             xmlns="urn:ietf:params:xml:ns:pidf-diff"  
    27             targetNamespace="urn:ietf:params:xml:ns:pidf-diff"  
    28             elementFormDefault="qualified"> 
    29   <xsd:simpleType name="xpath"> 
    30     <xsd:restriction base="xsd:string"> 
    31       <xsd:pattern 
     43<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"  
     44           xmlns:xcal="urn:ietf:params:xml:ns:icalendar-2.0"  
     45           xmlns="urn:ietf:params:xml:ns:pidf-diff"  
     46           targetNamespace="urn:ietf:params:xml:ns:pidf-diff"  
     47           elementFormDefault="qualified"> 
     48 
     49  <xs:import schemaLocation="iCalendar.xsd"  
     50             namespace="urn:ietf:params:xml:ns:icalendar-2.0" /> 
     51 
     52  <xs:simpleType name="XpathType"> 
     53    <xs:restriction base="xs:string"> 
     54      <xs:pattern 
    3255             value="(/)?((&id;)((/&step;)*(/&last;))?|(&step;/)*(&last;))"/> 
    33     </xsd:restriction> 
    34   </xsd:simpleType> 
     56    </xs:restriction> 
     57  </xs:simpleType> 
    3558   
    36   <xsd:simpleType name="xpath-add"> 
    37     <xsd:restriction base="xsd:string"> 
    38       <xsd:pattern 
     59  <xs:simpleType name="XpathAddType"> 
     60    <xs:restriction base="xs:string"> 
     61      <xs:pattern 
    3962             value="(/)?((&id;)((/&step;)*(/&child;))?|(&step;/)*(&child;))"/> 
    40     </xsd:restriction> 
    41   </xsd:simpleType> 
     63    </xs:restriction> 
     64  </xs:simpleType> 
    4265   
    43   <xsd:simpleType name="pos"> 
    44     <xsd:restriction base="xsd:string"> 
    45       <xsd:enumeration value="before"/> 
    46       <xsd:enumeration value="after"/> 
    47       <xsd:enumeration value="prepend"/> 
    48     </xsd:restriction> 
    49   </xsd:simpleType> 
     66  <xs:simpleType name="PosType"> 
     67    <xs:restriction base="xs:string"> 
     68      <xs:enumeration value="before"/> 
     69      <xs:enumeration value="after"/> 
     70      <xs:enumeration value="prepend"/> 
     71    </xs:restriction> 
     72  </xs:simpleType> 
    5073   
    51   <xsd:simpleType name="type"> 
    52     <xsd:restriction base="xsd:string"> 
    53       <xsd:pattern value="&aname;|&nspa;"/> 
    54     </xsd:restriction> 
    55   </xsd:simpleType> 
     74  <xs:simpleType name="AddValueType"> 
     75    <xs:restriction base="xs:string"> 
     76      <xs:pattern value="&aname;|&nspa;"/> 
     77    </xs:restriction> 
     78  </xs:simpleType> 
    5679   
    57   <xsd:complexType name="add"> 
    58     <xsd:complexContent mixed="true"> 
    59       <xsd:restriction base="xsd:anyType"> 
    60        <xsd:sequence> 
    61          <xsd:any processContents="lax" namespace="##any" 
    62                   minOccurs="0" maxOccurs="unbounded"/> 
    63        </xsd:sequence> 
    64        <xsd:attribute name="sel" type="xpath-add" 
    65                     use="required"/> 
    66        <xsd:attribute name="pos" type="pos"/> 
    67        <xsd:attribute name="type" type="type"/> 
    68      </xsd:restriction> 
    69     </xsd:complexContent> 
    70   </xsd:complexType> 
     80  <xs:complexType name="BaseUpdateType" abstract="true"> 
     81    <xs:attribute name="sel" type="XpathAddType" 
     82                  use="required"/> 
     83  </xs:complexType> 
    7184   
    72   <xsd:complexType name="replace"> 
    73     <xsd:complexContent mixed="true"> 
    74       <xsd:restriction base="xsd:anyType"> 
    75         <xsd:sequence> 
    76           <xsd:any processContents="lax" namespace="##any" 
    77                    minOccurs="0" maxOccurs="1"/> 
    78         </xsd:sequence> 
    79         <xsd:attribute name="sel" type="xpath" use="required"/> 
    80       </xsd:restriction> 
    81     </xsd:complexContent> 
    82   </xsd:complexType> 
     85  <xs:complexType name="NewValueType" abstract="true"> 
     86    <xs:complexContent mixed="false"> 
     87      <xs:extension base="BaseUpdateType"> 
     88        <xs:choice>  
     89          <xs:element name="component" type="xcal:BaseComponentType"/> 
     90          <xs:element name="property" type="xcal:BasePropertyType"/> 
     91          <xs:element name="parameter" type="xcal:BaseParameterType"/> 
     92        </xs:choice> 
     93      </xs:extension> 
     94    </xs:complexContent> 
     95  </xs:complexType> 
    8396   
    84   <xsd:simpleType name="ws"> 
    85     <xsd:restriction base="xsd:string"> 
    86       <xsd:enumeration value="before"/> 
    87       <xsd:enumeration value="after"/> 
    88       <xsd:enumeration value="both"/> 
    89     </xsd:restriction> 
    90   </xsd:simpleType> 
     97  <xs:simpleType name="WhitespaceType"> 
     98    <xs:restriction base="xs:string"> 
     99      <xs:enumeration value="before"/> 
     100      <xs:enumeration value="after"/> 
     101      <xs:enumeration value="both"/> 
     102    </xs:restriction> 
     103  </xs:simpleType> 
    91104   
    92   <xsd:complexType name="remove"> 
    93     <xsd:attribute name="sel" type="xpath" use="required"/> 
    94     <xsd:attribute name="ws" type="ws"/> 
    95   </xsd:complexType> 
    96 </xsd:schema> 
     105  <xs:complexType name="AddType"> 
     106    <xs:complexContent mixed="false"> 
     107      <xs:extension base="NewValueType"> 
     108        <xs:attribute name="pos" type="PosType"/> 
     109        <xs:attribute name="type" type="AddValueType"/> 
     110     </xs:extension> 
     111    </xs:complexContent> 
     112  </xs:complexType> 
     113   
     114  <xs:complexType name="ReplaceType"> 
     115    <xs:complexContent mixed="false"> 
     116      <xs:extension base="NewValueType"> 
     117      </xs:extension> 
     118    </xs:complexContent> 
     119  </xs:complexType> 
     120   
     121  <xs:complexType name="RemoveType"> 
     122    <xs:complexContent mixed="false"> 
     123      <xs:extension base="BaseUpdateType"> 
     124        <xs:attribute name="ws" type="WhitespaceType"/> 
     125      </xs:extension> 
     126    </xs:complexContent> 
     127  </xs:complexType> 
     128</xs:schema> 
    97129            

  • trunk/resources/exsynchwsdefs/wsmessages.xsd

    r3113 r3153  
    4949  </simpleType> 
    5050   
    51   <complexType name="base-synch-request"> 
     51  <complexType name="BaseSynchRequestType"> 
    5252    <annotation> 
    5353      <documentation xml:lang="en"> 
    …… 
    6262  </complexType> 
    6363   
    64   <complexType name="base-synch-entity-request"> 
     64  <complexType name="BaseSynchEntityRequestType"> 
    6565    <annotation> 
    6666      <documentation xml:lang="en"> 
    …… 
    7070    </annotation> 
    7171    <complexContent mixed="false"> 
    72       <extension base="tns:base-synch-request"> 
     72      <extension base="tns:BaseSynchRequestType"> 
    7373        <sequence > 
    7474          <element name="uid" type="string" minOccurs="1" /> 
    …… 
    7979  </complexType> 
    8080   
    81   <complexType name="base-synch-response"> 
     81  <complexType name="BaseSynchResponseType"> 
    8282    <annotation> 
    8383      <documentation xml:lang="en"> 
    …… 
    9696       ********************************************************************* --> 
    9797   
    98   <complexType name="subscribe-request-type"> 
     98  <complexType name="SubscribeRequestType"> 
    9999    <annotation> 
    100100      <documentation xml:lang="en"> 
    …… 
    113113    </annotation> 
    114114    <complexContent mixed="false"> 
    115       <extension base="tns:base-synch-request"> 
     115      <extension base="tns:BaseSynchRequestType"> 
    116116        <sequence > 
    117117          <element name="token" type="string" /> 
    …… 
    126126  </complexType> 
    127127 
    128   <element name="subscribe" type="tns:subscribe-request-type" /> 
    129    
    130   <complexType name="subscribe-response-type"> 
     128  <element name="subscribe" type="tns:SubscribeRequestType" /> 
     129   
     130  <complexType name="SubscribeResponseType"> 
    131131    <annotation> 
    132132      <documentation xml:lang="en"> 
    …… 
    135135    </annotation> 
    136136    <complexContent mixed="false"> 
    137       <extension base="tns:base-synch-response"> 
     137      <extension base="tns:BaseSynchResponseType"> 
    138138        <sequence > 
    139139          <element name="subscription-id" type="string" /> 
    …… 
    144144  </complexType> 
    145145 
    146   <element name="subscribe-response" type="tns:subscribe-response-type" /> 
    147    
    148   <complexType name="unsubscribe-request-type"> 
     146  <element name="subscribe-response" type="tns:SubscribeResponseType" /> 
     147   
     148  <complexType name="UnsubscribeRequestType"> 
    149149    <annotation> 
    150150      <documentation xml:lang="en"> 
    …… 
    153153    </annotation> 
    154154    <complexContent mixed="false"> 
    155       <extension base="tns:base-synch-request"> 
     155      <extension base="tns:BaseSynchRequestType"> 
    156156        <sequence > 
    157157          <element name="subscription-id" type="string" /> 
    …… 
    161161  </complexType> 
    162162 
    163   <element name="unsubscribe" type="tns:unsubscribe-request-type" /> 
    164    
    165   <complexType name="unsubscribe-response-type"> 
     163  <element name="unsubscribe" type="tns:UnsubscribeRequestType" /> 
     164   
     165  <complexType name="UnsubscribeResponseType"> 
    166166    <annotation> 
    167167      <documentation xml:lang="en"> 
    …… 
    170170    </annotation> 
    171171    <complexContent mixed="false"> 
    172       <extension base="tns:base-synch-response"> 
    173       </extension> 
    174     </complexContent> 
    175   </complexType> 
    176  
    177   <element name="unsubscribe-response" type="tns:unsubscribe-response-type" /> 
     172      <extension base="tns:BaseSynchResponseType"> 
     173      </extension> 
     174    </complexContent> 
     175  </complexType> 
     176 
     177  <element name="unsubscribe-response" type="tns:UnsubscribeResponseType" /> 
    178178   
    179179  <!-- ********************************************************************* 
    …… 
    187187       ********************************************************************* --> 
    188188   
    189   <complexType name="start-service-notificationType"> 
     189  <complexType name="StartServiceNotificationType"> 
    190190    <annotation> 
    191191      <documentation xml:lang="en"> 
    …… 
    203203   
    204204  <element name="start-service-notification"  
    205            type="tns:start-service-notificationType" /> 
    206    
    207   <complexType name="start-service-response-type"> 
     205           type="tns:StartServiceNotificationType" /> 
     206   
     207  <complexType name="StartServiceResponseType"> 
    208208    <annotation> 
    209209      <documentation xml:lang="en"> 
    …… 
    219219  </complexType> 
    220220 
    221   <element name="start-service-response" type="tns:start-service-response-type" /> 
    222    
    223   <complexType name="get-sycnch-info-type"> 
     221  <element name="start-service-response" type="tns:StartServiceResponseType" /> 
     222   
     223  <complexType name="GetSynchInfoType"> 
    224224    <annotation> 
    225225      <documentation xml:lang="en"> 
    …… 
    228228    </annotation> 
    229229    <complexContent mixed="false"> 
    230       <extension base="tns:base-synch-request"/> 
    231     </complexContent> 
    232   </complexType> 
    233    
    234   <element name="get-sycnch-info" type="tns:get-sycnch-info-type" /> 
     230      <extension base="tns:BaseSynchRequestType"/> 
     231    </complexContent> 
     232  </complexType> 
     233   
     234  <element name="get-sycnch-info" type="tns:GetSynchInfoType" /> 
    235235   
    236236  <complexType name="SynchInfoType"> 
    …… 
    241241  </complexType> 
    242242   
    243   <complexType name="synch-info-response-type"> 
     243  <complexType name="SynchInfoResponseType"> 
    244244    <annotation> 
    245245      <documentation xml:lang="en"> 
    …… 
    260260  </complexType> 
    261261   
    262   <element name="synch-info-response" type="tns:synch-info-response-type" /> 
     262  <element name="synch-info-response" type="tns:SynchInfoResponseType" /> 
    263263 
    264264  <!-- ============================ add-item =============================== --> 
    265265   
    266   <complexType name="add-item-type"> 
     266  <complexType name="AddItemType"> 
    267267    <annotation> 
    268268      <documentation xml:lang="en"> 
    …… 
    271271    </annotation> 
    272272    <complexContent mixed="false"> 
    273       <extension base="tns:base-synch-entity-request"> 
     273      <extension base="tns:BaseSynchEntityRequestType"> 
    274274        <sequence> 
    275275          <element name="icalendar" type="xcal:IcalendarType" /> 
    …… 
    279279  </complexType> 
    280280   
    281   <element name="add-item" type="tns:add-item-type" /> 
    282    
    283   <complexType name="add-item-response-type"> 
     281  <element name="add-item" type="tns:AddItemType" /> 
     282   
     283  <complexType name="AddItemResponseType"> 
    284284    <annotation> 
    285285      <documentation xml:lang="en"> 
    …… 
    293293  </complexType> 
    294294   
    295   <element name="add-item-response" type="tns:add-item-response-type" /> 
     295  <element name="add-item-response" type="tns:AddItemResponseType" /> 
    296296 
    297297  <!-- ============================ add-item =============================== --> 
    298298   
    299   <complexType name="fetch-item-type"> 
     299  <complexType name="FetchItemType"> 
    300300    <annotation> 
    301301      <documentation xml:lang="en"> 
    …… 
    304304    </annotation> 
    305305    <complexContent mixed="false"> 
    306       <extension base="tns:base-synch-entity-request"/> 
    307     </complexContent> 
    308   </complexType> 
    309    
    310   <element name="fetch-item" type="tns:fetch-item-type" /> 
    311    
    312   <complexType name="fetch-item-response-type"> 
     306      <extension base="tns:BaseSynchEntityRequestType"/> 
     307    </complexContent> 
     308  </complexType> 
     309   
     310  <element name="fetch-item" type="tns:FetchItemType" /> 
     311   
     312  <complexType name="FetchItemResponseType"> 
    313313    <annotation> 
    314314      <documentation xml:lang="en"> 
    …… 
    323323  </complexType> 
    324324   
    325   <element name="fetch-item-response" type="tns:fetch-item-response-type" /> 
     325  <element name="fetch-item-response" type="tns:FetchItemResponseType" /> 
    326326 
    327327  <!-- ========================== update-item ============================== --> 
    328328   
    329   <complexType name="update-item-type"> 
     329  <element name="baseUpdate" type="p:BaseUpdateType" /> 
     330   
     331  <complexType name="ArrayOfUpdates"> 
     332    <sequence> 
     333      <element ref="tns:baseUpdate" maxOccurs="unbounded"/> 
     334    </sequence> 
     335  </complexType> 
     336 
     337  <element name="add" type="p:AddType" 
     338           substitutionGroup="tns:baseUpdate"/> 
     339 
     340  <element name="replace" type="p:ReplaceType" 
     341           substitutionGroup="tns:baseUpdate"/> 
     342 
     343  <element name="remove" type="p:RemoveType" 
     344           substitutionGroup="tns:baseUpdate"/> 
     345 
     346  <complexType name="UpdateItemType"> 
    330347    <annotation> 
    331348      <documentation xml:lang="en"> 
    …… 
    334351    </annotation> 
    335352    <complexContent mixed="false"> 
    336       <extension base="tns:base-synch-entity-request"> 
     353      <extension base="tns:BaseSynchEntityRequestType"> 
    337354        <sequence> 
    338           <choice> 
    339             <element name="add" type="p:add" /> 
    340             <element name="replace" type="p:replace" /> 
    341             <element name="remove" type="p:remove" /> 
    342           </choice> 
    343         </sequence> 
    344       </extension> 
    345     </complexContent> 
    346   </complexType> 
    347    
    348   <element name="update-item" type="tns:update-item-type" /> 
    349    
    350   <complexType name="update-item-response-type"> 
     355          <element name="updates" type="tns:ArrayOfUpdates" /> 
     356        </sequence> 
     357      </extension> 
     358    </complexContent> 
     359  </complexType> 
     360   
     361  <element name="update-item" type="tns:UpdateItemType" /> 
     362   
     363  <complexType name="UpdateItemResponseType"> 
    351364    <annotation> 
    352365      <documentation xml:lang="en"> 
    …… 
    361374  </complexType> 
    362375   
    363   <element name="update-item-response" type="tns:update-item-response-type" /> 
     376  <element name="update-item-response" type="tns:UpdateItemResponseType" /> 
    364377</schema> 

  • trunk/resources/exsynchwsdefs/wssvc.wsdl

    r3063 r3153  
    1010                namespace="http://www.bedework.org/exsynch/wsmessages" /> 
    1111    </s:schema> 
    12   </wsdl:types> 
     12  </wsdl:types>  
    1313 
    1414  <!-- ====================== startServiceNotification ===================== -->   
    …… 
    5252  </wsdl:message> 
    5353 
     54  <!-- ============================= UpdateItem =============================== -->   
     55 
     56  <wsdl:message name="UpdateItemIn"> 
     57    <wsdl:part name="request" element="tns:update-item" /> 
     58  </wsdl:message> 
     59   
     60  <wsdl:message name="UpdateItemOut"> 
     61    <wsdl:part name="response" element="tns:update-item-response" /> 
     62  </wsdl:message> 
     63 
    5464  <!-- ============================== port ================================= -->   
    5565   
    5666  <wsdl:portType name="ExsynchRemoteServicePortType"> 
    57     <wsdl:operation name="notify-remote-service"> 
     67    <wsdl:operation name="NotifyRemoteService"> 
    5868      <wsdl:input message="tns:StartServiceIn" /> 
    5969      <wsdl:output message="tns:StartServiceOut" /> 
    6070    </wsdl:operation> 
    6171     
    62     <wsdl:operation name="get-synch-info"> 
     72    <wsdl:operation name="GetSynchInfo"> 
    6373      <wsdl:input message="tns:GetSynchInfoIn" /> 
    6474      <wsdl:output message="tns:GetSynchInfoOut" /> 
    6575    </wsdl:operation> 
    6676     
    67     <wsdl:operation name="add-item"> 
     77    <wsdl:operation name="AddItem"> 
    6878      <wsdl:input message="tns:AddItemIn" /> 
    6979      <wsdl:output message="tns:AddItemOut" /> 
    7080    </wsdl:operation> 
    7181     
    72     <wsdl:operation name="fetch-item"> 
     82    <wsdl:operation name="FetchItem"> 
    7383      <wsdl:input message="tns:FetchItemIn" /> 
    7484      <wsdl:output message="tns:FetchItemOut" /> 
     85    </wsdl:operation> 
     86     
     87    <wsdl:operation name="UpdateItem"> 
     88      <wsdl:input message="tns:UpdateItemIn" /> 
     89      <wsdl:output message="tns:UpdateItemOut" /> 
    7590    </wsdl:operation> 
    7691  </wsdl:portType> 
    …… 
    86101    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> 
    87102     
    88     <wsdl:operation name="notify-remote-service"> 
     103    <wsdl:operation name="NotifyRemoteService"> 
    89104      <soap:operation soapAction="http://www.bedework.org/exsynch/wsmessages/notify-remote-service" /> 
    90105      <wsdl:input> 
    …… 
    96111    </wsdl:operation> 
    97112     
    98     <wsdl:operation name="get-synch-info"> 
     113    <wsdl:operation name="GetSynchInfo"> 
    99114      <soap:operation soapAction="http://www.bedework.org/exsynch/wsmessages/get-synch-info" /> 
    100115      <wsdl:input> 
    …… 
    106121    </wsdl:operation> 
    107122     
    108     <wsdl:operation name="add-item"> 
     123    <wsdl:operation name="AddItem"> 
    109124      <soap:operation soapAction="http://www.bedework.org/exsynch/wsmessages/add-item" /> 
    110125      <wsdl:input> 
    …… 
    116131    </wsdl:operation> 
    117132     
    118     <wsdl:operation name="fetch-item"> 
     133    <wsdl:operation name="FetchItem"> 
    119134      <soap:operation soapAction="http://www.bedework.org/exsynch/wsmessages/fetch-item" /> 
    120135      <wsdl:input> 
    …… 
    123138      <wsdl:output> 
    124139        <soap:body use="literal" parts="fetchItemResponse" /> 
     140      </wsdl:output> 
     141    </wsdl:operation> 
     142     
     143    <wsdl:operation name="UpdateItem"> 
     144      <soap:operation soapAction="http://www.bedework.org/exsynch/wsmessages/update-item" /> 
     145      <wsdl:input> 
     146        <soap:body use="literal" parts="request" /> 
     147      </wsdl:input> 
     148      <wsdl:output> 
     149        <soap:body use="literal" parts="response" /> 
    125150      </wsdl:output> 
    126151    </wsdl:operation>