Changeset 3041

Show
Ignore:
Timestamp:
11/10/10 11:40:17
Author:
douglm
Message:

Do some more fixing up of version stuff.

Add a bit of licence info to docs.

Add some debug code to try to parse json in attendee action.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/resources/exsynchwsdefs/iCalendar-props.xsd

    r3037 r3041  
    5353      <xs:element name="related-to" type="xcal:related-toPropType" /> 
    5454      <xs:element name="rrule" type="xcal:rrulePropType" />  
     55      <xs:element name="rrule" type="xcal:exrulePropType" />  
    5556      <xs:element name="action" type="xcal:actionPropType" /> 
    5657      <xs:element name="repeat" type="xcal:repeatPropType" /> 
    57       <xs:element name="trigger" type="xcal:triggerTypePropType" /> 
     58      <xs:element name="trigger" type="xcal:triggerPropType" /> 
    5859      <xs:element name="created" type="xcal:createdPropType" /> 
    5960      <xs:element name="dtstamp" type="xcal:dtstampPropType" /> 
     
    212213    </xs:complexContent> 
    213214  </xs:complexType> 
    214    
     215     
     216  <!-- 3.8.1.2 Categories --> 
     217  <xs:complexType name="categoriesPropType"> 
     218    <xs:complexContent mixed="false"> 
     219      <xs:extension base="xcal:BasePropertyType"> 
     220        <xs:choice maxOccurs="unbounded">  
     221          <xs:element ref="xcal:text" /> 
     222        </xs:choice> 
     223      </xs:extension> 
     224    </xs:complexContent> 
     225  </xs:complexType>   
     226 
    215227  <!-- 3.8.1.3 Classification --> 
    216228  <xs:simpleType name="classValueType"> 
     
    525537  </xs:complexType> 
    526538     
     539  <!-- x.x.x.x Deprecated ExRule --> 
     540  <xs:complexType name="exrulePropType"> 
     541    <xs:complexContent mixed="false"> 
     542      <xs:extension base="xcal:RecurPropertyType"/> 
     543    </xs:complexContent> 
     544  </xs:complexType> 
     545     
    527546  <!-- 3.8.6 Alarm Component Properties --> 
    528547  <!-- 3.8.6.1 Action --> 
     
    553572   
    554573  <!-- 3.8.6.3 Trigger --> 
    555   <xs:complexType name="triggerTypePropType"> 
     574  <xs:complexType name="triggerPropType"> 
    556575    <xs:sequence> 
    557576      <xs:element name="parameters" minOccurs="0">