Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 3115

Timestamp:

01/09/11 22:42:04

Author:

douglm

Message:

More build changes.

Complete copy of changes to 3.7

Reorganize access sub-project to use new build method. Also caldav,

Use bedework libcache for all projects.

Bring web service changes in line for 3.7 and trunk

Files:

releases/bedework-3.7/build/buildTools/buildjar.xml (modified) (2 diffs)
releases/bedework-3.7/build/buildTools/deftasks.xml (modified) (3 diffs)
releases/bedework-3.7/build/buildTools/wsimport.xml (modified) (1 diff)
releases/bedework-3.7/build/bw-deployutil-3.7.jar (modified) (previous)
releases/bedework-3.7/build/quickstart/windows/bw.bat (modified) (3 diffs)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd (modified) (3 diffs)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-link-extension.xsd (added)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd (modified) (2 diffs)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-params.xsd (modified) (12 diffs)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-props.xsd (modified) (52 diffs)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-valtypes.xsd (modified) (11 diffs)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-wscal-extensions.xsd (added)
releases/bedework-3.7/resources/exsynchwsdefs/iCalendar.xsd (modified) (11 diffs)
releases/bedework-3.7/resources/exsynchwsdefs/patch-errors.xsd (added)
releases/bedework-3.7/resources/exsynchwsdefs/patch.xsd (added)
releases/bedework-3.7/resources/exsynchwsdefs/wsmessages.xsd (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

releases/bedework-3.7/build/buildTools/buildjar.xml

r3107	r3115
71	71
72	72	<noisyMsg message="build.jar.file=${build.jar.file}" />
	73
	74	<if>
	75	<isset property="build.jar.dependency"/>
	76	<then>
	77	<dirname file="${build.jar.dependency}"
	78	property="dependency.dirname" />
	79	<basename file="${build.jar.dependency}"
	80	property="dependency.basename" />
	81	<fileset dir="${dependency.dirname}" id="dependency.fileset">
	82	<include name="${dependency.basename}"/>
	83	</fileset>
	84	</then>
	85	<else>
	86	<fileset refid="empty.fileset" id="dependency.fileset"/>
	87	</else>
	88	</if>
73	89
74	90	<uptodate property="build.jar.uptodate"
…	…
77	93	<srcfiles refid="buildjar.generated.java.sources" />
78	94	<srcfiles refid="buildjar.resource.files"/>
	95	<srcfiles refid="dependency.fileset"/>
79	96	</uptodate>
80	97

releases/bedework-3.7/build/buildTools/deftasks.xml

r3107	r3115
61	61
62	62	<property name="org.bedework.libcache.dir"
63		location="${~~project~~.home}/libcache"/>
	63	location="${bedework.home}/libcache"/>
64	64
65	65	<if>
…	…
90	90	<attribute name="module-base"/>
91	91	<attribute name="jar-file"/>
	92	<attribute name="jar-dependency" default=""/>
92	93	<attribute name="generated-sources" default=""/>
93	94	<attribute name="property-resources" default=""/>
…	…
125	126	<include name="*/.class"/>
126	127	</patternset>
	128
	129	<if>
	130	<not>
	131	<equals arg1="@{jar-dependency}" arg2="" />
	132	</not>
	133	<then>
	134	<property name="build.jar.dependency" value="@{jar-dependency}" />
	135	</then>
	136	</if>
127	137
128	138	<ant antfile="${buildjar}" inheritRefs="true" target="build" >

releases/bedework-3.7/build/buildTools/wsimport.xml

r3107	r3115
24	24	<macrodef name="wsimport">
25	25	<attribute name="wsdl"/>
26		<attribute name="sourcedestdir"/>
	26	<attribute name="module-base"/>
	27	<attribute name="jar-file"/>
27	28	<attribute name="bindingsdir" default="" />
28	29	<sequential>
29	30	<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
30
31		~~<!--~~
32		~~<getJar name="jaxws-tools" version="2.2" />~~
33		~~<getJar name="jaxb-xjc" version="2.2" />~~
34		~~<getJar name="jaxws-rt" version="2.2" />~~
35		~~-->~~
36		~~<property name="wsimport.lib"~~
37		~~location="${org.bedework.temp.dir}/wsimportlib" />~~
38		~~<delete dir="${wsimport.lib}" />~~
39		~~<mkdir dir="${wsimport.lib}" />~~
40	31
41		<getJar lib="${wsimport.lib}"
42		libcache="${org.bedework.libcache.dir}"
43		name="jaxws-tools" version="2.1.4" />
44		<getJar lib="${wsimport.lib}"
45		libcache="${org.bedework.libcache.dir}"
46		name="jaxb-xjc" version="2.1.7" />
47		<getJar lib="${wsimport.lib}"
48		libcache="${org.bedework.libcache.dir}"
49		name="jaxb-impl" version="2.1.8" />
50		<getJar lib="${wsimport.lib}"
51		libcache="${org.bedework.libcache.dir}"
52		name="jaxws-rt" version="2.1.4" />
53		<getJar lib="${wsimport.lib}"
54		libcache="${org.bedework.libcache.dir}"
55		name="streambuffer" version="1.0" />
56		<getJar lib="${wsimport.lib}"
57		libcache="${org.bedework.libcache.dir}"
58		name="stax-ex" version="2.2.1" />
59
60		<path id="wsimport.classpath">
61		<fileset dir="${ant.home}/lib">
62		<include name="jax*.jar"/>
63		</fileset>
64		<!--
65		<pathelement location="${wsimport.lib}/jaxws-tools-2.2.jar"/>
66		<pathelement location="${wsimport.lib}/jaxb-xjc-2.2.jar"/>
67		<pathelement location="${wsimport.lib}/jaxws-rt-2.2.jar"/>
68		-->
69		<pathelement location="${wsimport.lib}/jaxws-tools-2.1.4.jar"/>
70		<pathelement location="${wsimport.lib}/jaxb-xjc-2.1.7.jar"/>
71		<pathelement location="${wsimport.lib}/jaxb-impl-2.1.8.jar"/>
72		<pathelement location="${wsimport.lib}/jaxws-rt-2.1.4.jar"/>
73		<pathelement location="${wsimport.lib}/tools-1.6.0_21.jar" />
74		<pathelement location="${wsimport.lib}/streambuffer-1.0.jar" />
75		<pathelement location="${wsimport.lib}/stax-ex-2.2.1.jar" />
76		<fileset dir="${ant.home}/lib">
77		<include name="*/.jar"/>
78		</fileset>
79		<!--
80		<fileset dir="${org.bedework.appserver.dir}/lib/endorsed" >
81		<include name="*/.jar"/>
82		</fileset>
83		-->
84		</path>
	32	<property name="sourcedestdir" location="@{module-base}/src" />
	33
85	34
86		<debugCpid idpar="wsimport.classpath" />
87
88		<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
89		<classpath refid="wsimport.classpath" />
90		</taskdef>
91
92		<!-- We don't want the generated classes but there doesn't appear to be a
93		way to suppress generation -->
94		<property name="wsimport.dest"
95		location="${org.bedework.temp.dir}/wsclasses" />
96		<mkdir dir="${wsimport.dest}" />
	35	<dirname property="org.bedework.wsdl.dir" file="@{wsdl}"/>
97	36
98	37	<if>
99		<~~equals arg1="@{bindingsdir}" arg2="~~" />
	38	<available file="${sourcedestdir}" type="dir" />
100	39	<then>
101		<wsimport keep="true"
102		sourcedestdir="@{sourcedestdir}"
103		destdir="${wsimport.dest}"
104		wsdl="@{wsdl}"
105		xendorsed="true" >
106		</wsimport>
	40	<uptodate property="org.bedework.wsimport.uptodate"
	41	targetfile="@{jar-file}" >
	42	<srcfiles dir="${org.bedework.wsdl.dir}" />
	43	</uptodate>
	44	</then>
	45	</if>
	46
	47	<if>
	48	<isset property="org.bedework.wsimport.uptodate"/>
	49	<then>
	50	<noisyMsg message="**** @{jar.file} is up to date" />
107	51	</then>
108	52	<else>
109		<wsimport keep="true"
110		sourcedestdir="@{sourcedestdir}"
111		destdir="${wsimport.dest}"
112		wsdl="@{wsdl}"
113		xendorsed="true" >
114		<binding dir="@{bindingsdir}" includes="*.xml">
115		</binding>
116		</wsimport>
	53	<noisyMsg message="**** @{jar.file} needs rebuilding" />
	54
	55	<delete dir="${sourcedestdir}" />
	56	<mkdir dir="${sourcedestdir}" />
	57
	58	<!--
	59	<getJar name="jaxws-tools" version="2.2" />
	60	<getJar name="jaxb-xjc" version="2.2" />
	61	<getJar name="jaxws-rt" version="2.2" />
	62	-->
	63	<property name="wsimport.lib"
	64	location="${org.bedework.temp.dir}/wsimportlib" />
	65	<delete dir="${wsimport.lib}" />
	66	<mkdir dir="${wsimport.lib}" />
	67
	68	<getJar lib="${wsimport.lib}"
	69	libcache="${org.bedework.libcache.dir}"
	70	name="jaxws-tools" version="2.1.4" />
	71	<getJar lib="${wsimport.lib}"
	72	libcache="${org.bedework.libcache.dir}"
	73	name="jaxb-xjc" version="2.1.7" />
	74	<getJar lib="${wsimport.lib}"
	75	libcache="${org.bedework.libcache.dir}"
	76	name="jaxb-impl" version="2.1.8" />
	77	<getJar lib="${wsimport.lib}"
	78	libcache="${org.bedework.libcache.dir}"
	79	name="jaxws-rt" version="2.1.4" />
	80	<getJar lib="${wsimport.lib}"
	81	libcache="${org.bedework.libcache.dir}"
	82	name="streambuffer" version="1.0" />
	83	<getJar lib="${wsimport.lib}"
	84	libcache="${org.bedework.libcache.dir}"
	85	name="stax-ex" version="2.2.1" />
	86
	87	<path id="wsimport.classpath">
	88	<fileset dir="${ant.home}/lib">
	89	<include name="jax*.jar"/>
	90	</fileset>
	91	<!--
	92	<pathelement location="${wsimport.lib}/jaxws-tools-2.2.jar"/>
	93	<pathelement location="${wsimport.lib}/jaxb-xjc-2.2.jar"/>
	94	<pathelement location="${wsimport.lib}/jaxws-rt-2.2.jar"/>
	95	-->
	96	<pathelement location="${wsimport.lib}/jaxws-tools-2.1.4.jar"/>
	97	<pathelement location="${wsimport.lib}/jaxb-xjc-2.1.7.jar"/>
	98	<pathelement location="${wsimport.lib}/jaxb-impl-2.1.8.jar"/>
	99	<pathelement location="${wsimport.lib}/jaxws-rt-2.1.4.jar"/>
	100	<pathelement location="${wsimport.lib}/tools-1.6.0_21.jar" />
	101	<pathelement location="${wsimport.lib}/streambuffer-1.0.jar" />
	102	<pathelement location="${wsimport.lib}/stax-ex-2.2.1.jar" />
	103	<fileset dir="${ant.home}/lib">
	104	<include name="*/.jar"/>
	105	</fileset>
	106	<!--
	107	<fileset dir="${org.bedework.appserver.dir}/lib/endorsed" >
	108	<include name="*/.jar"/>
	109	</fileset>
	110	-->
	111	</path>
	112
	113	<debugCpid idpar="wsimport.classpath" />
	114
	115	<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
	116	<classpath refid="wsimport.classpath" />
	117	</taskdef>
	118
	119	<!-- We don't want the generated classes but there doesn't appear to be a
	120	way to suppress generation -->
	121	<property name="wsimport.dest"
	122	location="${org.bedework.temp.dir}/wsclasses" />
	123	<mkdir dir="${wsimport.dest}" />
	124
	125	<if>
	126	<equals arg1="@{bindingsdir}" arg2="" />
	127	<then>
	128	<wsimport keep="true"
	129	sourcedestdir="${sourcedestdir}"
	130	destdir="${wsimport.dest}"
	131	wsdl="@{wsdl}"
	132	xendorsed="true" >
	133	</wsimport>
	134	</then>
	135	<else>
	136	<wsimport keep="true"
	137	sourcedestdir="${sourcedestdir}"
	138	destdir="${wsimport.dest}"
	139	wsdl="@{wsdl}"
	140	xendorsed="true" >
	141	<binding dir="@{bindingsdir}" includes="*.xml">
	142	</binding>
	143	</wsimport>
	144	</else>
	145	</if>
	146
	147
	148	<build-jar module-base="@{module-base}"
	149	jar-file="@{jar-file}" />
117	150	</else>
118	151	</if>

releases/bedework-3.7/build/quickstart/windows/bw.bat

r3099	r3115
28	28	SET offline=
29	29	SET quickstart=
	30
	31	SET ant_listener=
	32	SET ant_xmllogfile=
	33	SET ant_logger=
	34
	35	SET ant_loglevel="-quiet"
	36	SET bw_loglevel=""
30	37
31	38	:: Projects we will build
…	…
72	79
73	80
	81	:: ----------------------- Log level
	82
	83	:log-silent
	84	SET ant_loglevel="-quiet"
	85	SET bw_loglevel="-Dorg.bedework.build.silent=true"
	86	SHIFT
	87	GOTO branch
	88
	89	:log-quiet
	90	SET ant_loglevel="-quiet"
	91	SET bw_loglevel=""
	92	SHIFT
	93	GOTO branch
	94
	95	:log-inform
	96	SET ant_loglevel=""
	97	SET bw_loglevel="-Dorg.bedework.build.inform=true"
	98	SHIFT
	99	GOTO branch
	100
	101	:log-verbose
	102	SET ant_loglevel="-verbose"
	103	SET bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true"
	104	SHIFT
	105	GOTO branch
	106
	107	:ant-debug
	108	SET ant_loglevel="-debug"
	109	SHIFT
	110	GOTO branch
	111
	112	:build-debug
	113	SET bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true -Dorg.bedework.build.debug=true "
	114	SHIFT
	115	GOTO branch
	116
74	117	:: PROJECTS
75	118
…	…
213	256	IF "%1" == "-reindex" GOTO reindex
214	257	IF "%1" == "-zoneinfo" GOTO zoneinfo
	258
	259	IF "%1" == "-log-silent" GOTO log-silent
	260	IF "%1" == "-log-quiet" GOTO log-quiet
	261	IF "%1" == "-log-inform" GOTO log-inform
	262	IF "%1" == "-log-verbose" GOTO log-verbose
	263	IF "%1" == "-ant-debug" GOTO ant-debug
	264	IF "%1" == "-build-debug" GOTO build-debug
	265
215	266	IF "%1" == "-carddav" GOTO carddav
216	267	IF "%1" == "-caldav" GOTO caldav

releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd

r3055	r3115
6	6	elementFormDefault="qualified">
7	7
	8	<xs:include schemaLocation="iCalendar-valtypes.xsd" />
	9
	10	<!-- ===================== Properties ================================= -->
	11	<xs:include schemaLocation="iCalendar-props.xsd" />
	12
	13	<!-- =====================================================================
	14	3.2 Property parameter definitions
	15	===================================================================== -->
	16
	17	<!-- Bedework x-parameters -->
	18	<xs:element name="x-bedework-uid" type="xcal:XBedeworkUidParamType"
	19	substitutionGroup="xcal:baseParameter" />
	20
	21	<xs:complexType name="XBedeworkUidParamType">
	22	<xs:complexContent mixed="false">
	23	<xs:extension base="xcal:TextParameterType"/>
	24	</xs:complexContent>
	25	</xs:complexType>
	26
8	27	<!-- =====================================================================
9	28	3.7 Calendar Properties
10	29	===================================================================== -->
11
12		<!-- ===================== Properties ================================= -->
13		<xs:include schemaLocation="iCalendar-props.xsd" />
	30
	31	<xs:element name="x-bedework-cost"
	32	type="xcal:XBedeworkCostPropType"
	33	substitutionGroup="xcal:baseProperty" />
14	34
15	35	<xs:element name="x-bedework-exsynch-endtzid"
16		type="xcal:~~x-bw-exsynch-e~~ndtzidPropType"
17		substitutionGroup="xcal:base-property" />
	36	type="xcal:XBedeworkExsynchEndtzidPropType"
	37	substitutionGroup="xcal:baseProperty" />
18	38
19	39	<xs:element name="x-bedework-exsynch-lastmod"
20		type="xcal:~~x-bw-exsynch-l~~astmodPropType"
21		substitutionGroup="xcal:base-property" />
	40	type="xcal:XBedeworkExsynchLastmodPropType"
	41	substitutionGroup="xcal:baseProperty" />
22	42
23	43	<xs:element name="x-bedework-exsynch-organizer"
24		type="xcal:organizerPropType"
25		substitutionGroup="xcal:base-property" />
	44	type="xcal:OrganizerPropType"
	45	substitutionGroup="xcal:baseProperty" />
26	46
27	47	<xs:element name="x-bedework-exsynch-starttzid"
28		type="xcal:~~x-bw-exsynch-s~~tarttzidPropType"
29		substitutionGroup="xcal:base-property" />
	48	type="xcal:XBedeworkExsynchStarttzidPropType"
	49	substitutionGroup="xcal:baseProperty" />
30	50
31		<xs:complexType name="~~x-bw-exsynch-endtzid~~PropType">
	51	<xs:complexType name="XBedeworkCostPropType">
32	52	<xs:complexContent mixed="false">
33	53	<xs:extension base="xcal:TextPropertyType"/>
…	…
35	55	</xs:complexType>
36	56
37		<xs:complexType name="~~x-bw-exsynch-lastmo~~dPropType">
	57	<xs:complexType name="XBedeworkExsynchEndtzidPropType">
38	58	<xs:complexContent mixed="false">
39	59	<xs:extension base="xcal:TextPropertyType"/>
…	…
41	61	</xs:complexType>
42	62
43		<xs:complexType name="x-bw-exsynch-starttzidPropType">
	63	<xs:complexType name="XBedeworkExsynchLastmodPropType">
	64	<xs:complexContent mixed="false">
	65	<xs:extension base="xcal:TextPropertyType"/>
	66	</xs:complexContent>
	67	</xs:complexType>
	68
	69	<xs:complexType name="XBedeworkExsynchStarttzidPropType">
44	70	<xs:complexContent mixed="false">
45	71	<xs:extension base="xcal:TextPropertyType"/>

releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd

r3055	r3115
14	14
15	15	<xs:element name="x-microsoft-cdo-busystatus"
16		type="xcal:~~x-ms-cdo-b~~usystatusPropType"
17		substitutionGroup="xcal:base-property" />
	16	type="xcal:XMicrosoftCdoBusystatusPropType"
	17	substitutionGroup="xcal:baseProperty" />
18	18
19	19	<xs:element name="x-microsoft-cdo-intendedstatus"
20		type="xcal:~~x-ms-cdo-i~~ntendedstatusPropType"
21		substitutionGroup="xcal:base-property" />
	20	type="xcal:XMicrosoftCdoIntendedstatusPropType"
	21	substitutionGroup="xcal:baseProperty" />
22	22
23		<xs:complexType name="~~x-ms-cdo-b~~usystatusPropType">
	23	<xs:complexType name="XMicrosoftCdoBusystatusPropType">
24	24	<xs:complexContent mixed="false">
25	25	<xs:extension base="xcal:TextPropertyType"/>
…	…
27	27	</xs:complexType>
28	28
29		<xs:complexType name="~~x-ms-cdo-i~~ntendedstatusPropType">
	29	<xs:complexType name="XMicrosoftCdoIntendedstatusPropType">
30	30	<xs:complexContent mixed="false">
31	31	<xs:extension base="xcal:TextPropertyType"/>

releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-params.xsd

r3046	r3115
12	12	3.2 Property parameter definitions
13	13	===================================================================== -->
14
	14
	15	<xs:complexType name="BaseParameterType" abstract="true" >
	16	</xs:complexType>
	17
	18	<xs:element name="baseParameter" type="xcal:BaseParameterType" />
	19
15	20	<xs:complexType name="ArrayOfParameters">
16		~~<xs:choice maxOccurs="unbounded">~~
17		~~<xs:element name="altrep" type="xcal:altrepParamType" />~~
18		~~<xs:element name="cn" type="xcal:cnParamType" />~~
19		~~<xs:element name="cutype" type="xcal:cutypeParamType" />~~
20		~~<xs:element name="delegated-from" type="xcal:delegated-fromParamType" />~~
21		~~<xs:element name="delegated-to" type="xcal:delegated-toParamType" />~~
22		~~<xs:element name="dir" type="xcal:dirParamType" />~~
23		~~<xs:element name="encoding" type="xcal:encodingParamType" />~~
24		~~<xs:element name="fmttype" type="xcal:fmttypeParamType" />~~
25		~~<xs:element name="fbtype" type="xcal:fbtypeParamType" />~~
26		~~<xs:element name="language" type="xcal:languageParamType" />~~
27		~~<xs:element name="member" type="xcal:memberParamType" />~~
28		~~<xs:element name="partstat" type="xcal:partstatParamType" />~~
29		~~<xs:element name="range" type="xcal:rangeParamType" />~~
30		~~<xs:element name="related" type="xcal:relatedParamType" />~~
31		~~<xs:element name="reltype" type="xcal:reltypeParamType" />~~
32		~~<xs:element name="role" type="xcal:roleParamType" />~~
33		~~<xs:element name="rsvp" type="xcal:rsvpParamType" />~~
34		~~<xs:element name="sent-by" type="xcal:sent-byParamType" />~~
35		~~<xs:element name="tzid" type="xcal:tzidParamType" />~~
36		~~</xs:choice>~~
37		~~</xs:complexType>~~
38
39		~~<xs:complexType name="cal-addressListParamType">~~
40	21	<xs:sequence>
41		<xs:element ref="xcal:~~cal-address~~" maxOccurs="unbounded"/>
	22	<xs:element ref="xcal:baseParameter" maxOccurs="unbounded"/>
42	23	</xs:sequence>
	24	</xs:complexType>
	25
	26	<!-- =====================================================================
	27	Define all the standard properties. By using a substitutionGroup we
	28	make it easy to extend the list of parameters. As an example see
	29	the parameters defined in iCalendar-caldavsched-extensions.xsd
	30	===================================================================== -->
	31
	32	<xs:element name="altrep" type="xcal:AltrepParamType"
	33	substitutionGroup="xcal:baseParameter" />
	34	<xs:element name="cn" type="xcal:CnParamType"
	35	substitutionGroup="xcal:baseParameter" />
	36	<xs:element name="cutype" type="xcal:CutypeParamType"
	37	substitutionGroup="xcal:baseParameter" />
	38	<xs:element name="delegated-from" type="xcal:DelegatedFromParamType"
	39	substitutionGroup="xcal:baseParameter" />
	40	<xs:element name="delegated-to" type="xcal:DelegatedToParamType"
	41	substitutionGroup="xcal:baseParameter" />
	42	<xs:element name="dir" type="xcal:DirParamType"
	43	substitutionGroup="xcal:baseParameter" />
	44	<xs:element name="encoding" type="xcal:EncodingParamType"
	45	substitutionGroup="xcal:baseParameter" />
	46	<xs:element name="fmttype" type="xcal:FmttypeParamType"
	47	substitutionGroup="xcal:baseParameter" />
	48	<xs:element name="fbtype" type="xcal:FbtypeParamType"
	49	substitutionGroup="xcal:baseParameter" />
	50	<xs:element name="language" type="xcal:LanguageParamType"
	51	substitutionGroup="xcal:baseParameter" />
	52	<xs:element name="member" type="xcal:MemberParamType"
	53	substitutionGroup="xcal:baseParameter" />
	54	<xs:element name="partstat" type="xcal:PartstatParamType"
	55	substitutionGroup="xcal:baseParameter" />
	56	<xs:element name="range" type="xcal:RangeParamType"
	57	substitutionGroup="xcal:baseParameter" />
	58	<xs:element name="related" type="xcal:RelatedParamType"
	59	substitutionGroup="xcal:baseParameter" />
	60	<xs:element name="reltype" type="xcal:ReltypeParamType"
	61	substitutionGroup="xcal:baseParameter" />
	62	<xs:element name="role" type="xcal:RoleParamType"
	63	substitutionGroup="xcal:baseParameter" />
	64	<xs:element name="rsvp" type="xcal:RsvpParamType"
	65	substitutionGroup="xcal:baseParameter" />
	66	<xs:element name="sent-by" type="xcal:SentByParamType"
	67	substitutionGroup="xcal:baseParameter" />
	68	<xs:element name="tzid" type="xcal:TzidParamType"
	69	substitutionGroup="xcal:baseParameter" />
	70
	71
	72	<!-- Scheduling parameters for attendee or organizer -->
	73	<xs:element name="schedule-agent" type="xcal:ScheduleAgentParamType"
	74	substitutionGroup="xcal:baseParameter" />
	75	<xs:element name="schedule-force-send" type="xcal:ScheduleForceSendParamType"
	76	substitutionGroup="xcal:baseParameter" />
	77	<xs:element name="schedule-status" type="xcal:ScheduleStatusParamType"
	78	substitutionGroup="xcal:baseParameter" />
	79
	80	<!-- Parameters that take a simple text value -->
	81	<xs:complexType name="TextParameterType" >
	82	<xs:complexContent mixed="false">
	83	<xs:extension base="xcal:BaseParameterType">
	84	<xs:sequence>
	85	<xs:element ref="xcal:text" />
	86	</xs:sequence>
	87	</xs:extension>
	88	</xs:complexContent>
	89	</xs:complexType>
	90
	91	<!-- Parameters that take a uri value -->
	92	<xs:complexType name="UriParameterType" >
	93	<xs:complexContent mixed="false">
	94	<xs:extension base="xcal:BaseParameterType">
	95	<xs:sequence>
	96	<xs:element ref="xcal:uri"/>
	97	</xs:sequence>
	98	</xs:extension>
	99	</xs:complexContent>
	100	</xs:complexType>
	101
	102	<xs:complexType name="CalAddressListParamType">
	103	<xs:complexContent mixed="false">
	104	<xs:extension base="xcal:BaseParameterType">
	105	<xs:sequence>
	106	<xs:element ref="xcal:cal-address" maxOccurs="unbounded"/>
	107	</xs:sequence>
	108	</xs:extension>
	109	</xs:complexContent>
	110	</xs:complexType>
	111
	112	<xs:complexType name="CalAddressParamType">
	113	<xs:complexContent mixed="false">
	114	<xs:extension base="xcal:BaseParameterType">
	115	<xs:sequence>
	116	<xs:element ref="xcal:cal-address" />
	117	</xs:sequence>
	118	</xs:extension>
	119	</xs:complexContent>
43	120	</xs:complexType>
44	121
45	122	<!-- 3.2.1 Alternate Text Representation -->
46		<xs:complexType name="altrepParamType">
47		<xs:~~sequence~~>
48		<xs:e~~lement ref="xcal:uri~~"/>
49		</xs:~~sequence~~>
	123	<xs:complexType name="AltrepParamType">
	124	<xs:complexContent mixed="false">
	125	<xs:extension base="xcal:UriParameterType"/>
	126	</xs:complexContent>
50	127	</xs:complexType>
51	128
52	129	<!-- 3.2.2 Common Name -->
53		<xs:simpleType name="cnParamType">
54		<xs:restriction base="xs:string"/>
55		</xs:simpleType>
	130	<xs:complexType name="CnParamType">
	131	<xs:complexContent mixed="false">
	132	<xs:extension base="xcal:TextParameterType"/>
	133	</xs:complexContent>
	134	</xs:complexType>
56	135
57	136	<!-- 3.2.3 Calendar User Type -->
58		<xs:simpleType name="~~cutypeParam~~Type">
	137	<xs:simpleType name="CutypeValueType">
59	138	<xs:restriction base="xs:token">
60	139	<xs:enumeration value="INDIVIDUAL"/>
…	…
66	145	</xs:simpleType>
67	146
	147	<xs:complexType name="CutypeParamType">
	148	<xs:complexContent mixed="false">
	149	<xs:extension base="xcal:TextParameterType"/>
	150	</xs:complexContent>
	151	</xs:complexType>
	152
68	153	<!-- 3.2.4 Delegators -->
69		<xs:complexType name="delegated-fromParamType">
70		<xs:complexContent mixed="false">
71		<xs:extension base="xcal:cal-addressListParamType"/>
	154	<xs:complexType name="DelegatedFromParamType">
	155	<xs:complexContent mixed="false">
	156	<xs:extension base="xcal:CalAddressListParamType">
	157	</xs:extension>
72	158	</xs:complexContent>
73	159	</xs:complexType>
74	160
75	161	<!-- 3.2.5 Delegatees -->
76		<xs:complexType name="delegated-toParamType">
77		<xs:complexContent mixed="false">
78		<xs:extension base="xcal:cal-addressListParamType"/>
	162	<xs:complexType name="DelegatedToParamType">
	163	<xs:complexContent mixed="false">
	164	<xs:extension base="xcal:CalAddressListParamType">
	165	</xs:extension>
79	166	</xs:complexContent>
80	167	</xs:complexType>
81	168
82	169	<!-- 3.2.6 Directory Entry Reference -->
83		<xs:complexType name="dirParamType">
84		<xs:~~sequence~~>
85		<xs:e~~lement ref="xcal:uri~~"/>
86		</xs:~~sequence~~>
	170	<xs:complexType name="DirParamType">
	171	<xs:complexContent mixed="false">
	172	<xs:extension base="xcal:UriParameterType"/>
	173	</xs:complexContent>
87	174	</xs:complexType>
88	175
89	176	<!-- 3.2.7 Inline Encoding -->
90		<xs:simpleType name="encodingParamType">
	177
	178	<xs:simpleType name="EncodingValueType">
91	179	<xs:restriction base="xs:token">
92	180	<xs:enumeration value="8BIT"/>
…	…
95	183	</xs:simpleType>
96	184
	185	<xs:complexType name="EncodingParamType">
	186	<xs:complexContent mixed="false">
	187	<xs:extension base="xcal:TextParameterType"/>
	188	</xs:complexContent>
	189	</xs:complexType>
	190
97	191	<!-- 3.2.8 Format Type -->
98		<xs:simpleType name="fmttypeParamType">
99		<xs:restriction base="xs:string"/>
100		</xs:simpleType>
	192	<xs:complexType name="FmttypeParamType">
	193	<xs:complexContent mixed="false">
	194	<xs:extension base="xcal:TextParameterType"/>
	195	</xs:complexContent>
	196	</xs:complexType>
101	197
102	198	<!-- 3.2.9 Free/Busy Time Type -->
103		<xs:simpleType name="~~fbtypeParam~~Type">
	199	<xs:simpleType name="FbtypeValueType">
104	200	<xs:restriction base="xs:token">
105	201	<xs:enumeration value="FREE"/>
…	…
110	206	</xs:simpleType>
111	207
	208	<xs:complexType name="FbtypeParamType">
	209	<xs:complexContent mixed="false">
	210	<xs:extension base="xcal:TextParameterType"/>
	211	</xs:complexContent>
	212	</xs:complexType>
	213
112	214	<!-- 3.2.10 Language -->
113		<xs:simpleType name="languageParamType">
114		<xs:restriction base="xs:string"/>
115		</xs:simpleType>
	215	<xs:complexType name="LanguageParamType">
	216	<xs:complexContent mixed="false">
	217	<xs:extension base="xcal:TextParameterType"/>
	218	</xs:complexContent>
	219	</xs:complexType>
116	220
117	221	<!-- 3.2.11 Group or List Membership -->
118		<xs:complexType name="memberParamType">
119		<xs:complexContent mixed="false">
120		<xs:extension base="xcal:cal-addressListParamType"/>
	222	<xs:complexType name="MemberParamType">
	223	<xs:complexContent mixed="false">
	224	<xs:extension base="xcal:CalAddressListParamType">
	225	</xs:extension>
121	226	</xs:complexContent>
122	227	</xs:complexType>
123	228
124	229	<!-- 3.2.12 Participation Status -->
125		<xs:simpleType name="~~partstatParam~~Type">
126		<xs:union memberTypes="xcal:~~type-partstat-event xcal:type-partstat-todo xcal:type-partstat-j~~our"/>
127		</xs:simpleType>
128
129		<xs:simpleType name="~~type-partstat-e~~vent">
	230	<xs:simpleType name="PartstatValueType">
	231	<xs:union memberTypes="xcal:TypePartstatEvent xcal:TypePartstatTodo xcal:TypePartstatJour"/>
	232	</xs:simpleType>
	233
	234	<xs:simpleType name="TypePartstatEvent">
130	235	<xs:restriction base="xs:token">
131	236	<xs:enumeration value="NEEDS-ACTION"/>
…	…
137	242	</xs:simpleType>
138	243
139		<xs:simpleType name="~~type-partstat-t~~odo">
	244	<xs:simpleType name="TypePartstatTodo">
140	245	<xs:restriction base="xs:token">
141	246	<xs:enumeration value="NEEDS-ACTION"/>
…	…
149	254	</xs:simpleType>
150	255
151		<xs:simpleType name="~~type-partstat-j~~our">
	256	<xs:simpleType name="TypePartstatJour">
152	257	<xs:restriction base="xs:token">
153	258	<xs:enumeration value="NEEDS-ACTION"/>
…	…
157	262	</xs:simpleType>
158	263
	264	<xs:complexType name="PartstatParamType">
	265	<xs:complexContent mixed="false">
	266	<xs:extension base="xcal:TextParameterType"/>
	267	</xs:complexContent>
	268	</xs:complexType>
	269
159	270	<!-- 3.2.13 Recurrence Identifier Range -->
160		<xs:simpleType name="~~rangeParam~~Type">
	271	<xs:simpleType name="RangeValueType">
161	272	<xs:restriction base="xs:token">
162	273	<xs:enumeration value="THISANDFUTURE"/>
…	…
164	275	</xs:simpleType>
165	276
	277	<xs:complexType name="RangeParamType">
	278	<xs:complexContent mixed="false">
	279	<xs:extension base="xcal:BaseParameterType">
	280	<xs:sequence>
	281	<xs:element name="text" type="xcal:RangeValueType"/>
	282	</xs:sequence>
	283	</xs:extension>
	284	</xs:complexContent>
	285	</xs:complexType>
	286
166	287	<!-- 3.2.14 Alarm Trigger Relationship -->
167		<xs:simpleType name="~~relatedParam~~Type">
	288	<xs:simpleType name="RelatedValueType">
168	289	<xs:restriction base="xs:token">
169	290	<xs:enumeration value="START"/>
…	…
172	293	</xs:simpleType>
173	294
	295	<xs:complexType name="RelatedParamType">
	296	<xs:complexContent mixed="false">
	297	<xs:extension base="xcal:TextParameterType"/>
	298	</xs:complexContent>
	299	</xs:complexType>
	300
174	301	<!-- 3.2.15 Relationship Type -->
175		<xs:simpleType name="~~reltypeParam~~Type">
	302	<xs:simpleType name="ReltypeValueType">
176	303	<xs:restriction base="xs:token">
177	304	<xs:enumeration value="PARENT"/>
…	…
181	308	</xs:simpleType>
182	309
	310	<xs:complexType name="ReltypeParamType">
	311	<xs:complexContent mixed="false">
	312	<xs:extension base="xcal:TextParameterType"/>
	313	</xs:complexContent>
	314	</xs:complexType>
	315
183	316	<!-- 3.2.16 Participation Role -->
184		<xs:simpleType name="~~roleParam~~Type">
	317	<xs:simpleType name="RoleValueType">
185	318	<xs:restriction base="xs:token">
186	319	<xs:enumeration value="CHAIR"/>
…	…
191	324	</xs:simpleType>
192	325
	326	<xs:complexType name="RoleParamType">
	327	<xs:complexContent mixed="false">
	328	<xs:extension base="xcal:TextParameterType"/>
	329	</xs:complexContent>
	330	</xs:complexType>
	331
193	332	<!-- 3.2.17 RSVP Expectation -->
194		<xs:simpleType name="~~rsvpParam~~Type">
	333	<xs:simpleType name="RsvpValueType">
195	334	<xs:restriction base="xs:token">
196	335	<xs:enumeration value="TRUE"/>
…	…
199	338	</xs:simpleType>
200	339
	340	<xs:complexType name="RsvpParamType">
	341	<xs:complexContent mixed="false">
	342	<xs:extension base="xcal:TextParameterType"/>
	343	</xs:complexContent>
	344	</xs:complexType>
	345
201	346	<!-- 3.2.18 Sent By -->
202		<xs:complexType name="sent-byParamType">
203		<xs:sequence>
204		<xs:element ref="xcal:cal-address"/>
205		</xs:sequence>
	347	<xs:complexType name="SentByParamType">
	348	<xs:complexContent mixed="false">
	349	<xs:extension base="xcal:CalAddressParamType">
	350	</xs:extension>
	351	</xs:complexContent>
206	352	</xs:complexType>
207	353
208	354	<!-- 3.2.19 Time Zone Identifier -->
209		<xs:simpleType name="tzidParamType">
210		<xs:restriction base="xs:string"/>
211		</xs:simpleType>
	355	<xs:complexType name="TzidParamType">
	356	<xs:complexContent mixed="false">
	357	<xs:extension base="xcal:TextParameterType"/>
	358	</xs:complexContent>
	359	</xs:complexType>
	360
	361	<!-- Scheduling parameters - Defined by CalDAV scheduling -->
	362
	363	<xs:simpleType name="ScheduleAgentValueType">
	364	<xs:restriction base="xs:token">
	365	<xs:enumeration value="SERVER"/>
	366	<xs:enumeration value="CLIENT"/>
	367	<xs:enumeration value="NONE"/>
	368	</xs:restriction>
	369	</xs:simpleType>
	370
	371	<xs:complexType name="ScheduleAgentParamType">
	372	<xs:complexContent mixed="false">
	373	<xs:extension base="xcal:TextParameterType"/>
	374	</xs:complexContent>
	375	</xs:complexType>
	376
	377	<xs:simpleType name="ScheduleForceSendValueType">
	378	<xs:restriction base="xs:token">
	379	<xs:enumeration value="REQUEST"/>
	380	<xs:enumeration value="REPLY"/>
	381	</xs:restriction>
	382	</xs:simpleType>
	383
	384	<xs:complexType name="ScheduleForceSendParamType">
	385	<xs:complexContent mixed="false">
	386	<xs:extension base="xcal:TextParameterType"/>
	387	</xs:complexContent>
	388	</xs:complexType>
	389
	390	<xs:complexType name="ScheduleStatusParamType">
	391	<xs:complexContent mixed="false">
	392	<xs:extension base="xcal:TextParameterType"/>
	393	</xs:complexContent>
	394	</xs:complexType>
212	395	</xs:schema>

releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-props.xsd

r3055	r3115
13	13	<!-- ===================== Parameters ================================= -->
14	14	<xs:include schemaLocation="iCalendar-params.xsd" />
15
16		<!-- ===================== Extensions ================================= -->
17		<xs:include schemaLocation="iCalendar-bw-extensions.xsd" />
18		<xs:include schemaLocation="iCalendar-ms-extensions.xsd" />
19
20		<xs:complexType name="ArrayOfProperties">
21		<xs:sequence>
22		<xs:element ref="xcal:base-property" maxOccurs="unbounded"/>
23		</xs:sequence>
24		</xs:complexType>
25
26		<xs:element name="base-property" type="xcal:BasePropertyType" />
27
28		<xs:element name="calscale" type="xcal:calscalePropType"
29		substitutionGroup="xcal:base-property" />
30		<xs:element name="method" type="xcal:methodPropType"
31		substitutionGroup="xcal:base-property" />
32		<xs:element name="prodid" type="xcal:prodidPropType"
33		substitutionGroup="xcal:base-property" />
34		<xs:element name="version" type="xcal:versionPropType"
35		substitutionGroup="xcal:base-property" />
36		<xs:element name="attach" type="xcal:attachPropType"
37		substitutionGroup="xcal:base-property" />
38		<xs:element name="categories" type="xcal:categoriesPropType"
39		substitutionGroup="xcal:base-property" />
40		<xs:element name="class" type="xcal:classPropType"
41		substitutionGroup="xcal:base-property" />
42		<xs:element name="comment" type="xcal:commentPropType"
43		substitutionGroup="xcal:base-property" />
44		<xs:element name="description" type="xcal:descriptionPropType"
45		substitutionGroup="xcal:base-property" />
46		<xs:element name="geo" type="xcal:geoPropType"
47		substitutionGroup="xcal:base-property" />
48		<xs:element name="location" type="xcal:locationPropType"
49		substitutionGroup="xcal:base-property" />
50		<xs:element name="percent-complete" type="xcal:percent-completePropType"
51		substitutionGroup="xcal:base-property" />
52		<xs:element name="priority" type="xcal:priorityPropType"
53		substitutionGroup="xcal:base-property" />
54		<xs:element name="resources" type="xcal:resourcesPropType"
55		substitutionGroup="xcal:base-property" />
56		<xs:element name="status" type="xcal:statusPropType"
57		substitutionGroup="xcal:base-property" />
58		<xs:element name="summary" type="xcal:summaryPropType"
59		substitutionGroup="xcal:base-property" />
60		<xs:element name="completed" type="xcal:completedPropType"
61		substitutionGroup="xcal:base-property" />
62		<xs:element name="dtend" type="xcal:dtendPropType"
63		substitutionGroup="xcal:base-property" />
64		<xs:element name="dtstart" type="xcal:dtstartPropType"
65		substitutionGroup="xcal:base-property" />
66		<xs:element name="due" type="xcal:duePropType"
67		substitutionGroup="xcal:base-property" />
68		<xs:element name="duration" type="xcal:durationPropType"
69		substitutionGroup="xcal:base-property" />
70		<xs:element name="freebusy" type="xcal:freebusyPropType"
71		substitutionGroup="xcal:base-property" />
72		<xs:element name="transp" type="xcal:transpPropType"
73		substitutionGroup="xcal:base-property" />
74		<xs:element name="tzid" type="xcal:tzidPropType"
75		substitutionGroup="xcal:base-property" />
76		<xs:element name="tzname" type="xcal:tznamePropType"
77		substitutionGroup="xcal:base-property" />
78		<xs:element name="tzoffsetfrom" type="xcal:tzoffsetfromPropType"
79		substitutionGroup="xcal:base-property" />
80		<xs:element name="tzoffsetto" type="xcal:tzoffsettoPropType"
81		substitutionGroup="xcal:base-property" />
82		<xs:element name="tzurl" type="xcal:tzurlPropType"
83		substitutionGroup="xcal:base-property" />
84		<xs:element name="attendee" type="xcal:attendeePropType"
85		substitutionGroup="xcal:base-property" />
86		<xs:element name="contact" type="xcal:contactPropType"
87		substitutionGroup="xcal:base-property" />
88		<xs:element name="organizer" type="xcal:organizerPropType"
89		substitutionGroup="xcal:base-property" />
90		<xs:element name="recurrence-id" type="xcal:recurrence-idPropType"
91		substitutionGroup="xcal:base-property" />
92		<xs:element name="url" type="xcal:urlPropType"
93		substitutionGroup="xcal:base-property" />
94		<xs:element name="uid" type="xcal:uidPropType"
95		substitutionGroup="xcal:base-property" />
96		<xs:element name="exdate" type="xcal:exdatePropType"
97		substitutionGroup="xcal:base-property" />
98		<xs:element name="rdate" type="xcal:rdatePropType"
99		substitutionGroup="xcal:base-property" />
100		<xs:element name="related-to" type="xcal:related-toPropType"
101		substitutionGroup="xcal:base-property" />
102		<xs:element name="exrule" type="xcal:exrulePropType"
103		substitutionGroup="xcal:base-property" />
104		<xs:element name="rrule" type="xcal:rrulePropType"
105		substitutionGroup="xcal:base-property" />
106		<xs:element name="action" type="xcal:actionPropType"
107		substitutionGroup="xcal:base-property" />
108		<xs:element name="repeat" type="xcal:repeatPropType"
109		substitutionGroup="xcal:base-property" />
110		<xs:element name="trigger" type="xcal:triggerPropType"
111		substitutionGroup="xcal:base-property" />
112		<xs:element name="created" type="xcal:createdPropType"
113		substitutionGroup="xcal:base-property" />
114		<xs:element name="dtstamp" type="xcal:dtstampPropType"
115		substitutionGroup="xcal:base-property" />
116		<xs:element name="last-modified" type="xcal:last-modifiedPropType"
117		substitutionGroup="xcal:base-property" />
118		<xs:element name="sequence" type="xcal:request-statusPropType"
119		substitutionGroup="xcal:base-property" />
120		<xs:element name="request-status" type="xcal:request-statusPropType"
121		substitutionGroup="xcal:base-property" />
122
	15
	16	<!-- =====================================================================
	17	BasePropertyType
	18	All properties are based off this type which defines a property as
	19	nothing more than a list of parameters.
	20
	21	We make no attempt to define valid parameters for each property as this
	22	would complicate the schema significantly. Consumers can ignore
	23	property parameters they do not understand or expect.
	24	===================================================================== -->
123	25	<xs:complexType name="BasePropertyType" abstract="true" >
124	26	<xs:sequence>
…	…
127	29	</xs:complexType>
128	30
	31	<xs:element name="baseProperty" type="xcal:BasePropertyType" />
	32
	33	<xs:complexType name="ArrayOfProperties">
	34	<xs:sequence>
	35	<xs:element ref="xcal:baseProperty" maxOccurs="unbounded"/>
	36	</xs:sequence>
	37	</xs:complexType>
	38
	39	<!-- =====================================================================
	40	Define all the standard properties. By using a substitutionGroup we
	41	make it easy to extend the list of properties. As an example see
	42	the properties defined in iCalendar-ms-extensions.xsd
	43	===================================================================== -->
	44	<xs:element name="calscale" type="xcal:CalscalePropType"
	45	substitutionGroup="xcal:baseProperty" />
	46
	47	<xs:element name="method" type="xcal:MethodPropType"
	48	substitutionGroup="xcal:baseProperty" />
	49
	50	<xs:element name="prodid" type="xcal:ProdidPropType"
	51	substitutionGroup="xcal:baseProperty" />
	52
	53	<xs:element name="version" type="xcal:VersionPropType"
	54	substitutionGroup="xcal:baseProperty" />
	55
	56	<xs:element name="attach" type="xcal:AttachPropType"
	57	substitutionGroup="xcal:baseProperty" />
	58
	59	<xs:element name="categories" type="xcal:CategoriesPropType"
	60	substitutionGroup="xcal:baseProperty" />
	61
	62	<xs:element name="class" type="xcal:ClassPropType"
	63	substitutionGroup="xcal:baseProperty" />
	64
	65	<xs:element name="comment" type="xcal:CommentPropType"
	66	substitutionGroup="xcal:baseProperty" />
	67
	68	<xs:element name="description" type="xcal:DescriptionPropType"
	69	substitutionGroup="xcal:baseProperty" />
	70
	71	<xs:element name="geo" type="xcal:GeoPropType"
	72	substitutionGroup="xcal:baseProperty" />
	73
	74	<xs:element name="location" type="xcal:LocationPropType"
	75	substitutionGroup="xcal:baseProperty" />
	76
	77	<xs:element name="percent-complete" type="xcal:PercentCompletePropType"
	78	substitutionGroup="xcal:baseProperty" />
	79
	80	<xs:element name="priority" type="xcal:PriorityPropType"
	81	substitutionGroup="xcal:baseProperty" />
	82
	83	<xs:element name="resources" type="xcal:ResourcesPropType"
	84	substitutionGroup="xcal:baseProperty" />
	85
	86	<xs:element name="status" type="xcal:StatusPropType"
	87	substitutionGroup="xcal:baseProperty" />
	88
	89	<xs:element name="summary" type="xcal:SummaryPropType"
	90	substitutionGroup="xcal:baseProperty" />
	91
	92	<xs:element name="completed" type="xcal:CompletedPropType"
	93	substitutionGroup="xcal:baseProperty" />
	94
	95	<xs:element name="dtend" type="xcal:DtendPropType"
	96	substitutionGroup="xcal:baseProperty" />
	97
	98	<xs:element name="dtstart" type="xcal:DtstartPropType"
	99	substitutionGroup="xcal:baseProperty" />
	100
	101	<xs:element name="due" type="xcal:DuePropType"
	102	substitutionGroup="xcal:baseProperty" />
	103
	104	<xs:element name="duration" type="xcal:DurationPropType"
	105	substitutionGroup="xcal:baseProperty" />
	106
	107	<xs:element name="freebusy" type="xcal:FreebusyPropType"
	108	substitutionGroup="xcal:baseProperty" />
	109
	110	<xs:element name="transp" type="xcal:TranspPropType"
	111	substitutionGroup="xcal:baseProperty" />
	112
	113	<!-- Comment out tzid for the moment. It has the same name as the parameter
	114	and this is causing me some issues
	115	<xs:element name="tzid" type="xcal:TzidPropType"
	116	substitutionGroup="xcal:baseProperty" /> -->
	117	<xs:element name="tzname" type="xcal:TznamePropType"
	118	substitutionGroup="xcal:baseProperty" />
	119
	120	<xs:element name="tzoffsetfrom" type="xcal:TzoffsetfromPropType"
	121	substitutionGroup="xcal:baseProperty" />
	122
	123	<xs:element name="tzoffsetto" type="xcal:TzoffsettoPropType"
	124	substitutionGroup="xcal:baseProperty" />
	125
	126	<xs:element name="tzurl" type="xcal:TzurlPropType"
	127	substitutionGroup="xcal:baseProperty" />
	128
	129	<xs:element name="attendee" type="xcal:AttendeePropType"
	130	substitutionGroup="xcal:baseProperty" />
	131
	132	<xs:element name="contact" type="xcal:ContactPropType"
	133	substitutionGroup="xcal:baseProperty" />
	134
	135	<xs:element name="organizer" type="xcal:OrganizerPropType"
	136	substitutionGroup="xcal:baseProperty" />
	137
	138	<xs:element name="recurrence-id" type="xcal:RecurrenceIdPropType"
	139	substitutionGroup="xcal:baseProperty" />
	140
	141	<xs:element name="url" type="xcal:UrlPropType"
	142	substitutionGroup="xcal:baseProperty" />
	143
	144	<xs:element name="uid" type="xcal:UidPropType"
	145	substitutionGroup="xcal:baseProperty" />
	146
	147	<xs:element name="exdate" type="xcal:ExdatePropType"
	148	substitutionGroup="xcal:baseProperty" />
	149
	150	<xs:element name="rdate" type="xcal:RdatePropType"
	151	substitutionGroup="xcal:baseProperty" />
	152
	153	<xs:element name="related-to" type="xcal:RelatedToPropType"
	154	substitutionGroup="xcal:baseProperty" />
	155
	156	<xs:element name="exrule" type="xcal:ExrulePropType"
	157	substitutionGroup="xcal:baseProperty" />
	158
	159	<xs:element name="rrule" type="xcal:RrulePropType"
	160	substitutionGroup="xcal:baseProperty" />
	161
	162	<xs:element name="action" type="xcal:ActionPropType"
	163	substitutionGroup="xcal:baseProperty" />
	164
	165	<xs:element name="repeat" type="xcal:RepeatPropType"
	166	substitutionGroup="xcal:baseProperty" />
	167
	168	<xs:element name="trigger" type="xcal:TriggerPropType"
	169	substitutionGroup="xcal:baseProperty" />
	170
	171	<xs:element name="created" type="xcal:CreatedPropType"
	172	substitutionGroup="xcal:baseProperty" />
	173
	174	<xs:element name="dtstamp" type="xcal:DtstampPropType"
	175	substitutionGroup="xcal:baseProperty" />
	176
	177	<xs:element name="last-modified" type="xcal:LastModifiedPropType"
	178	substitutionGroup="xcal:baseProperty" />
	179
	180	<xs:element name="sequence" type="xcal:SequencePropType"
	181	substitutionGroup="xcal:baseProperty" />
	182
	183	<xs:element name="request-status" type="xcal:RequestStatusPropType"
	184	substitutionGroup="xcal:baseProperty" />
	185
129	186	<!-- Properties that take a simple text value -->
130	187	<xs:complexType name="TextPropertyType" >
…	…
158	215	</xs:complexContent>
159	216	</xs:complexType>
160
	217
161	218	<!-- Properties that take a simple integer value -->
162	219	<xs:complexType name="IntegerPropertyType" >
…	…
164	221	<xs:extension base="xcal:BasePropertyType">
165	222	<xs:sequence>
166		<xs:element ref="xcal:integer~~Type~~"/>
	223	<xs:element ref="xcal:integer"/>
167	224	</xs:sequence>
168	225	</xs:extension>
…	…
198	255	<xs:sequence>
199	256	<xs:element ref="xcal:date-time"/>
	257	</xs:sequence>
	258	</xs:extension>
	259	</xs:complexContent>
	260	</xs:complexType>
	261
	262	<!-- Properties that take a utc-date-time value -->
	263	<xs:complexType name="UtcDatetimePropertyType" >
	264	<xs:complexContent mixed="false">
	265	<xs:extension base="xcal:BasePropertyType">
	266	<xs:sequence>
	267	<xs:element ref="xcal:utc-date-time"/>
200	268	</xs:sequence>
201	269	</xs:extension>
…	…
222	290	<xs:extension base="xcal:BasePropertyType">
223	291	<xs:sequence>
224		<xs:element ~~ref="xcal:recur~~"/>
225		</xs:sequence>
226		</xs:extension>
227		</xs:complexContent>
228		</xs:complexType>
229
	292	<xs:element name="recur" type="xcal:RecurType"/>
	293	</xs:sequence>
	294	</xs:extension>
	295	</xs:complexContent>
	296	</xs:complexType>
	297
230	298	<!-- 3.7.1 Calendar Scale -->
231		<xs:simpleType name="calscaleValueType">
	299	<xs:simpleType name="CalscaleValueType">
232	300	<xs:restriction base="xs:string">
233	301	<xs:enumeration value="GREGORIAN"/>
…	…
235	303	</xs:simpleType>
236	304
237		<xs:complexType name="calscalePropType">
238		<xs:complexContent mixed="false">
239		<xs:extension base="xcal:BasePropertyType">
240		<xs:sequence>
241		<xs:element name="text" type="xcal:calscaleValueType"/>
	305	<xs:complexType name="CalscalePropType">
	306	<xs:complexContent mixed="false">
	307	<xs:extension base="xcal:BasePropertyType">
	308	<xs:sequence>
	309	<xs:element name="text" type="xcal:CalscaleValueType"/>
242	310	</xs:sequence>
243	311	</xs:extension>
…	…
246	314
247	315	<!-- 3.7.2 Method -->
248		<xs:complexType name="methodPropType">
	316	<xs:complexType name="MethodPropType">
249	317	<xs:complexContent mixed="false">
250	318	<xs:extension base="xcal:TextPropertyType"/>
…	…
253	321
254	322	<!-- 3.7.3 Product Identifier -->
255		<xs:complexType name="prodidPropType">
	323	<xs:complexType name="ProdidPropType">
256	324	<xs:complexContent mixed="false">
257	325	<xs:extension base="xcal:TextPropertyType"/>
…	…
260	328
261	329	<!-- 3.7.4 Version -->
262		<xs:complexType name="versionPropType">
	330	<xs:complexType name="VersionPropType">
263	331	<xs:complexContent mixed="false">
264	332	<xs:extension base="xcal:TextPropertyType"/>
…	…
269	337	<!-- 3.8.1 Descriptive Component Properties -->
270	338	<!-- 3.8.1.1 Attachment -->
271		<xs:complexType name="attachPropType">
	339	<xs:complexType name="AttachPropType">
272	340	<xs:complexContent mixed="false">
273	341	<xs:extension base="xcal:BasePropertyType">
…	…
281	349
282	350	<!-- 3.8.1.2 Categories -->
283		<xs:complexType name="categoriesPropType">
	351	<xs:complexType name="CategoriesPropType">
284	352	<xs:complexContent mixed="false">
285	353	<xs:extension base="xcal:TextListPropertyType"/>
…	…
289	357	<!-- 3.8.1.3 Classification -->
290	358	<!-- Would like something lie this but not extensible
291		<xs:simpleType name="classValueType">
	359	<xs:simpleType name="ClassValueType">
292	360	<xs:restriction base="xs:string">
293	361	<xs:enumeration value="PUBLIC"/>
…	…
297	365	</xs:simpleType>
298	366
299		<xs:complexType name="classPropType">
300		<xs:complexContent mixed="false">
301		<xs:extension base="xcal:BasePropertyType">
302		<xs:sequence>
303		<xs:element name="text" type="xcal:classValueType"/>
	367	<xs:complexType name="ClassPropType">
	368	<xs:complexContent mixed="false">
	369	<xs:extension base="xcal:BasePropertyType">
	370	<xs:sequence>
	371	<xs:element name="text" type="xcal:ClassValueType"/>
304	372	</xs:sequence>
305	373	</xs:extension>
…	…
307	375	</xs:complexType>
308	376	-->
309
310		<xs:complexType name="classPropType">
	377	<xs:simpleType name="ClassValueType">
	378	<xs:restriction base="xs:token">
	379	<xs:enumeration value="PUBLIC"/>
	380	<xs:enumeration value="PRIVATE"/>
	381	<xs:enumeration value="CONFIDENTIAL"/>
	382	</xs:restriction>
	383	</xs:simpleType>
	384
	385	<xs:complexType name="ClassPropType">
311	386	<xs:complexContent mixed="false">
312	387	<xs:extension base="xcal:TextPropertyType"/>
…	…
315	390
316	391	<!-- 3.8.1.4 Comment -->
317		<xs:complexType name="commentPropType">
	392	<xs:complexType name="CommentPropType">
318	393	<xs:complexContent mixed="false">
319	394	<xs:extension base="xcal:TextPropertyType"/>
…	…
322	397
323	398	<!-- 3.8.1.5 Description -->
324		<xs:complexType name="descriptionPropType">
	399	<xs:complexType name="DescriptionPropType">
325	400	<xs:complexContent mixed="false">
326	401	<xs:extension base="xcal:TextPropertyType"/>
…	…
329	404
330	405	<!-- 3.8.1.6 Geographic Position -->
331		<xs:complexType name="geoPropType">
	406	<xs:complexType name="GeoPropType">
332	407	<xs:complexContent mixed="false">
333	408	<xs:extension base="xcal:BasePropertyType">
…	…
344	419
345	420	<!-- 3.8.1.7 Location -->
346		<xs:complexType name="locationPropType">
	421	<xs:complexType name="LocationPropType">
347	422	<xs:complexContent mixed="false">
348	423	<xs:extension base="xcal:TextPropertyType"/>
…	…
351	426
352	427	<!-- 3.8.1.8 Percent Complete -->
353		<xs:complexType name="~~percent-c~~ompletePropType">
	428	<xs:complexType name="PercentCompletePropType">
354	429	<xs:complexContent mixed="false">
355	430	<xs:extension base="xcal:IntegerPropertyType"/>
…	…
358	433
359	434	<!-- 3.8.1.9 Priority -->
360		<xs:complexType name="priorityPropType">
	435	<xs:complexType name="PriorityPropType">
361	436	<xs:complexContent mixed="false">
362	437	<xs:extension base="xcal:IntegerPropertyType"/>
…	…
365	440
366	441	<!-- 3.8.1.10 Resources -->
367		<xs:complexType name="resourcesPropType">
	442	<xs:complexType name="ResourcesPropType">
368	443	<xs:complexContent mixed="false">
369	444	<xs:extension base="xcal:TextListPropertyType"/>
…	…
372	447
373	448	<!-- 3.8.1.11 Status -->
374		<xs:simpleType name="statusValueType">
375		<xs:restriction base="xs:~~string~~">
	449	<xs:simpleType name="StatusValueType">
	450	<xs:restriction base="xs:token">
376	451	<xs:enumeration value="TENTATIVE"/> <!-- event -->
377	452	<xs:enumeration value="CONFIRMED"/> <!-- event -->
…	…
385	460	</xs:simpleType>
386	461
387		<xs:complexType name="statusPropType">
388		<xs:complexContent mixed="false">
389		<xs:extension base="xcal:BasePropertyType">
390		<xs:sequence>
391		<xs:element name="text" type="xcal:statusValueType"/>
392		</xs:sequence>
393		</xs:extension>
	462	<xs:complexType name="StatusPropType">
	463	<xs:complexContent mixed="false">
	464	<xs:extension base="xcal:TextPropertyType"/>
394	465	</xs:complexContent>
395	466	</xs:complexType>
396	467
397	468	<!-- 3.8.1.12 Summary -->
398		<xs:complexType name="summaryPropType">
	469	<xs:complexType name="SummaryPropType">
399	470	<xs:complexContent mixed="false">
400	471	<xs:extension base="xcal:TextPropertyType"/>
…	…
404	475	<!-- 3.8.2 Date and Time Component Properties -->
405	476	<!-- 3.8.2.1 Date/Time Completed -->
406		<xs:complexType name="completedPropType">
	477	<xs:complexType name="CompletedPropType">
	478	<xs:complexContent mixed="false">
	479	<xs:extension base="xcal:UtcDatetimePropertyType"/>
	480	</xs:complexContent>
	481	</xs:complexType>
	482
	483	<!-- 3.8.2.2 Date/Time End -->
	484	<xs:complexType name="DtendPropType">
407	485	<xs:complexContent mixed="false">
408	486	<xs:extension base="xcal:DateDatetimePropertyType"/>
…	…
410	488	</xs:complexType>
411	489
412		<!-- 3.8.2.~~2 Date/Time End~~ -->
413		<xs:complexType name="~~dtend~~PropType">
	490	<!-- 3.8.2.3 Date/Time Due -->
	491	<xs:complexType name="DuePropType">
414	492	<xs:complexContent mixed="false">
415	493	<xs:extension base="xcal:DateDatetimePropertyType"/>
…	…
417	495	</xs:complexType>
418	496
419		<!-- 3.8.2.~~3 Date/Time Due~~ -->
420		<xs:complexType name="~~due~~PropType">
	497	<!-- 3.8.2.4 Date/Time Start -->
	498	<xs:complexType name="DtstartPropType">
421	499	<xs:complexContent mixed="false">
422	500	<xs:extension base="xcal:DateDatetimePropertyType"/>
…	…
424	502	</xs:complexType>
425	503
426		~~<!-- 3.8.2.4 Date/Time Start -->~~
427		~~<xs:complexType name="dtstartPropType">~~
428		~~<xs:complexContent mixed="false">~~
429		~~<xs:extension base="xcal:DateDatetimePropertyType"/>~~
430		~~</xs:complexContent>~~
431		~~</xs:complexType>~~
432
433	504	<!-- 3.8.2.5 Duration -->
434		<xs:complexType name="durationPropType">
	505	<xs:complexType name="DurationPropType">
435	506	<xs:complexContent mixed="false">
436	507	<xs:extension base="xcal:BasePropertyType">
…	…
443	514
444	515	<!-- 3.8.2.6 Free/Busy Time -->
445		<xs:complexType name="freebusyPropType">
	516	<xs:complexType name="FreebusyPropType">
446	517	<xs:complexContent mixed="false">
447	518	<xs:extension base="xcal:BasePropertyType">
…	…
454	525
455	526	<!-- 3.8.2.7 Time Transparency -->
456		<xs:simpleType name="transpValueType">
457		<xs:restriction base="xs:~~string~~">
	527	<xs:simpleType name="TranspValueType">
	528	<xs:restriction base="xs:token">
458	529	<xs:enumeration value="OPAQUE"/>
459	530	<xs:enumeration value="TRANSPARENT"/>
…	…
461	532	</xs:simpleType>
462	533
463		<xs:complexType name="transpPropType">
464		<xs:complexContent mixed="false">
465		<xs:extension base="xcal:BasePropertyType">
466		<xs:sequence>
467		<xs:element name="text" type="xcal:transpValueType"/>
468		</xs:sequence>
469		</xs:extension>
	534	<xs:complexType name="TranspPropType">
	535	<xs:complexContent mixed="false">
	536	<xs:extension base="xcal:TextPropertyType"/>
470	537	</xs:complexContent>
471	538	</xs:complexType>
…	…
497	564	<!-- 3.8.3 Time Zone Component Properties -->
498	565	<!-- 3.8.3.1 Time Zone Identifier -->
499		<xs:complexType name="tzidPropType">
	566	<xs:complexType name="TzidPropType">
500	567	<xs:complexContent mixed="false">
501	568	<xs:extension base="xcal:TextPropertyType"/>
…	…
504	571
505	572	<!-- 3.8.3.2 Time Zone Name -->
506		<xs:complexType name="tznamePropType">
	573	<xs:complexType name="TznamePropType">
507	574	<xs:complexContent mixed="false">
508	575	<xs:extension base="xcal:TextPropertyType"/>
…	…
511	578
512	579	<!-- 3.8.3.3 Time Zone Offset From -->
513		<xs:complexType name="tzoffsetfromPropType">
	580	<xs:complexType name="TzoffsetfromPropType">
514	581	<xs:complexContent mixed="false">
515	582	<xs:extension base="xcal:UtcOffsetPropertyType"/>
…	…
518	585
519	586	<!-- 3.8.3.4 Time Zone Offset To -->
520		<xs:complexType name="tzoffsettoPropType">
	587	<xs:complexType name="TzoffsettoPropType">
521	588	<xs:complexContent mixed="false">
522	589	<xs:extension base="xcal:UtcOffsetPropertyType"/>
…	…
525	592
526	593	<!-- 3.8.3.5 Time Zone URL -->
527		<xs:complexType name="tzurlPropType">
	594	<xs:complexType name="TzurlPropType">
528	595	<xs:complexContent mixed="false">
529	596	<xs:extension base="xcal:UriPropertyType"/>
…	…
533	600	<!-- 3.8.4 Relationship Component Properties -->
534	601	<!-- 3.8.4.1 Attendee -->
535		<xs:complexType name="attendeePropType">
	602	<xs:complexType name="AttendeePropType">
536	603	<xs:complexContent mixed="false">
537	604	<xs:extension base="xcal:CalAddressPropertyType"/>
…	…
540	607
541	608	<!-- 3.8.4.2 Contact -->
542		<xs:complexType name="contactPropType">
	609	<xs:complexType name="ContactPropType">
543	610	<xs:complexContent mixed="false">
544	611	<xs:extension base="xcal:TextPropertyType"/>
…	…
547	614
548	615	<!-- 3.8.4.3 Organizer -->
549		<xs:complexType name="organizerPropType">
	616	<xs:complexType name="OrganizerPropType">
550	617	<xs:complexContent mixed="false">
551	618	<xs:extension base="xcal:CalAddressPropertyType"/>
…	…
554	621
555	622	<!-- 3.8.4.4 Recurrence ID -->
556		<xs:complexType name="~~recurrence-i~~dPropType">
	623	<xs:complexType name="RecurrenceIdPropType">
557	624	<xs:complexContent mixed="false">
558	625	<xs:extension base="xcal:DateDatetimePropertyType"/>
…	…
562	629	<!-- 3.8.4.5 Related-To -->
563	630	<!-- 3.8.4.6 Uniform Resource Locator -->
564		<xs:complexType name="urlPropType">
	631	<xs:complexType name="UrlPropType">
565	632	<xs:complexContent mixed="false">
566	633	<xs:extension base="xcal:UriPropertyType"/>
…	…
569	636
570	637	<!-- 3.8.4.7 Unique Identifier -->
571		<xs:complexType name="uidPropType">
	638	<xs:complexType name="UidPropType">
572	639	<xs:complexContent mixed="false">
573	640	<xs:extension base="xcal:TextPropertyType"/>
…	…
577	644	<!-- 3.8.5 Recurrence Component Properties -->
578	645	<!-- 3.8.5.1 Exception Date/Times -->
579		<xs:complexType name="exdatePropType">
	646	<xs:complexType name="ExdatePropType">
580	647	<xs:complexContent mixed="false">
581	648	<xs:extension base="xcal:DateDatetimePropertyType"/>
…	…
584	651
585	652	<!-- 3.8.5.2 Recurrence Date/Times -->
586		<xs:complexType name="rdatePropType">
	653	<xs:complexType name="RdatePropType">
587	654	<xs:complexContent mixed="false">
588	655	<xs:extension base="xcal:DateDatetimePropertyType"/>
…	…
590	657	</xs:complexType>
591	658
592		<xs:complexType name="~~related-t~~oPropType">
	659	<xs:complexType name="RelatedToPropType">
593	660	<xs:complexContent mixed="false">
594	661	<xs:extension base="xcal:TextPropertyType"/>
…	…
597	664
598	665	<!-- 3.8.5.3 Recurrence Rule -->
599		<xs:complexType name="rrulePropType">
	666	<xs:complexType name="RrulePropType">
600	667	<xs:complexContent mixed="false">
601	668	<xs:extension base="xcal:RecurPropertyType"/>
…	…
604	671
605	672	<!-- x.x.x.x Deprecated ExRule -->
606		<xs:complexType name="exrulePropType">
	673	<xs:complexType name="ExrulePropType">
607	674	<xs:complexContent mixed="false">
608	675	<xs:extension base="xcal:RecurPropertyType"/>
…	…
612	679	<!-- 3.8.6 Alarm Component Properties -->
613	680	<!-- 3.8.6.1 Action -->
614		<xs:simpleType name="actionValueType">
615		<xs:restriction base="xs:~~string~~">
	681	<xs:simpleType name="ActionValueType">
	682	<xs:restriction base="xs:token">
616	683	<xs:enumeration value="AUDIO"/>
617	684	<xs:enumeration value="DISPLAY"/>
…	…
620	687	</xs:simpleType>
621	688
622		<xs:complexType name="actionPropType">
623		<xs:complexContent mixed="false">
624		<xs:extension base="xcal:BasePropertyType">
625		<xs:sequence>
626		<xs:element name="text" type="xcal:actionValueType"/>
627		</xs:sequence>
628		</xs:extension>
	689	<xs:complexType name="ActionPropType">
	690	<xs:complexContent mixed="false">
	691	<xs:extension base="xcal:TextPropertyType"/>
629	692	</xs:complexContent>
630	693	</xs:complexType>
631	694
632	695	<!-- 3.8.6.2 Repeat Count -->
633		<xs:complexType name="repeatPropType">
	696	<xs:complexType name="RepeatPropType">
634	697	<xs:complexContent mixed="false">
635	698	<xs:extension base="xcal:IntegerPropertyType"/>
…	…
638	701
639	702	<!-- 3.8.6.3 Trigger -->
640		<xs:complexType name="triggerPropType">
	703	<xs:complexType name="TriggerPropType">
641	704	<xs:complexContent mixed="false">
642	705	<xs:extension base="xcal:BasePropertyType">
…	…
653	716	<!-- 3.8.7 Change Management Component Properties -->
654	717	<!-- 3.8.7.1 Date/Time Created -->
655		<xs:complexType name="createdPropType">
656		<xs:complexContent mixed="false">
657		<xs:extension base="xcal:DatetimePropertyType"/>
	718	<xs:complexType name="CreatedPropType">
	719	<xs:complexContent mixed="false">
	720	<xs:extension base="xcal:UtcDatetimePropertyType"/>
658	721	</xs:complexContent>
659	722	</xs:complexType>
660	723
661	724	<!-- 3.8.7.2 Date/Time Stamp -->
662		<xs:complexType name="dtstampPropType">
663		<xs:complexContent mixed="false">
664		<xs:extension base="xcal:DatetimePropertyType"/>
	725	<xs:complexType name="DtstampPropType">
	726	<xs:complexContent mixed="false">
	727	<xs:extension base="xcal:UtcDatetimePropertyType"/>
665	728	</xs:complexContent>
666	729	</xs:complexType>
667	730
668	731	<!-- 3.8.7.3 Last Modified -->
669		<xs:complexType name="~~last-m~~odifiedPropType">
670		<xs:complexContent mixed="false">
671		<xs:extension base="xcal:DatetimePropertyType"/>
	732	<xs:complexType name="LastModifiedPropType">
	733	<xs:complexContent mixed="false">
	734	<xs:extension base="xcal:UtcDatetimePropertyType"/>
672	735	</xs:complexContent>
673	736	</xs:complexType>
674	737
675	738	<!-- 3.8.7.4 Sequence Number -->
676		<xs:complexType name="sequencePropType">
	739	<xs:complexType name="SequencePropType">
677	740	<xs:complexContent mixed="false">
678	741	<xs:extension base="xcal:IntegerPropertyType"/>
…	…
682	745	<!-- 3.8.8 Miscellaneous Component Properties -->
683	746	<!-- 3.8.8.3 Request Status -->
684		<xs:complexType name="~~request-s~~tatusPropType">
	747	<xs:complexType name="RequestStatusPropType">
685	748	<xs:complexContent mixed="false">
686	749	<xs:extension base="xcal:BasePropertyType">

releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-valtypes.xsd

r3063	r3115
15	15
16	16	<!-- 3.3.2 BOOLEAN -->
17		<xs:element name="boolean" type="xcal:booleanType" />
	17	<xs:element name="boolean" type="xcal:BooleanType" />
18	18
19		<xs:simpleType name="booleanType">
	19	<xs:simpleType name="BooleanType">
20	20	<xs:restriction base="xs:token">
21	21	<xs:enumeration value="TRUE"/>
…	…
25	25
26	26	<!-- 3.3.3 CAL-ADDRESS -->
27		<xs:simpleType name="~~cal-a~~ddressType">
	27	<xs:simpleType name="CalAddressType">
28	28	<xs:restriction base="xs:string"/>
29	29	</xs:simpleType>
30	30
31		<xs:element name="cal-address" type="xcal:~~cal-a~~ddressType" />
	31	<xs:element name="cal-address" type="xcal:CalAddressType" />
32	32
33	33	<!-- 3.3.4 DATE -->
…	…
36	36	<!-- 3.3.5 DATE-TIME -->
37	37	<xs:element name="date-time" type="xs:string"/>
	38
	39	<!-- Patterns should allow us to restrict this
	40	e.g. 19980119T070000Z
	41	-->
	42	<xs:element name="utc-date-time" type="xs:string"/>
38	43
39	44	<!-- 3.3.6 DURATION
…	…
44	49
45	50	<!-- 3.3.8 INTEGER -->
46		<xs:element name="integer~~Type~~" type="xs:string"/>
	51	<xs:element name="integer" type="xs:string"/>
47	52
48	53	<!-- 3.3.9 PERIOD -->
…	…
50	55
51	56	<!-- 3.3.10 RECUR -->
52		<xs:element name="recur" type="xcal:recurType"/>
53		<xs:complexType name="recurType">
	57	<xs:complexType name="RecurType">
54	58	<xs:sequence>
55		<xs:element name="freq" type="xcal:freqRecurType"/>
	59	<xs:element name="freq" type="xcal:FreqRecurType"/>
56	60	<xs:sequence>
57	61	<xs:choice>
…	…
66	70	<xs:element name="byday" type="xs:string" maxOccurs="unbounded"/>
67	71	<xs:element name="byyearday" type="xs:string" maxOccurs="unbounded"/>
68		<xs:element name="bymonthday" type="xcal:bymonthdayRecurType" maxOccurs="unbounded"/>
	72	<xs:element name="bymonthday" type="xcal:BymonthdayRecurType" maxOccurs="unbounded"/>
69	73	<xs:element name="byweekno" type="xs:string" maxOccurs="unbounded"/>
70		<xs:element name="bymonth" type="xcal:bymonthRecurType" maxOccurs="unbounded"/>
	74	<xs:element name="bymonth" type="xcal:BymonthRecurType" maxOccurs="unbounded"/>
71	75	<xs:element name="bysetpos" type="xs:integer" maxOccurs="unbounded"/>
72		<xs:element name="wkst" type="xcal:weekdayRecurType" />
	76	<xs:element name="wkst" type="xcal:WeekdayRecurType" />
73	77	</xs:sequence>
74	78	</xs:complexType>
75	79
76		<xs:simpleType name="freqRecurType">
	80	<xs:simpleType name="FreqRecurType">
77	81	<xs:restriction base="xs:token">
78	82	<xs:enumeration value="SECONDLY"/>
…	…
86	90	</xs:simpleType>
87	91
88		<xs:element name="until" type="xcal:untilRecurType"/>
89		<xs:complexType name="untilRecurType" >
	92	<xs:element name="until" type="xcal:UntilRecurType"/>
	93
	94	<xs:complexType name="UntilRecurType" >
90	95	<xs:sequence>
91	96	<xs:choice>
…	…
98	103	<xs:element name="count" type="xs:integer"/>
99	104
100		<xs:simpleType name="weekdayRecurType">
	105	<xs:simpleType name="WeekdayRecurType">
101	106	<xs:restriction base="xs:token">
102	107	<xs:enumeration value="SU"/>
…	…
110	115	</xs:simpleType>
111	116
112		<xs:simpleType name="bymonthdayRecurType">
	117	<xs:simpleType name="BymonthdayRecurType">
113	118	<xs:restriction base="xs:integer">
114	119	<xs:minInclusive value="-31"/>
…	…
117	122	</xs:simpleType>
118	123
119		<xs:simpleType name="bymonthRecurType">
	124	<xs:simpleType name="BymonthRecurType">
120	125	<xs:restriction base="xs:integer">
121	126	<xs:minInclusive value="1"/>
…	…
131	136
132	137	<!-- 3.3.13 URI -->
133		<xs:simpleType name="uriType">
	138	<xs:simpleType name="UriType">
134	139	<xs:restriction base="xs:string"/>
135	140	</xs:simpleType>
136	141
137		<xs:element name="uri" type="xcal:uriType" />
	142	<xs:element name="uri" type="xcal:UriType" />
138	143
139	144	<!-- 3.3.14 UTC-OFFSET -->
140		<xs:simpleType name="~~utc-o~~ffsetType">
	145	<xs:simpleType name="UtcOffsetType">
141	146	<xs:restriction base="xs:string"/>
142	147	</xs:simpleType>
143	148
144		<xs:element name="utc-offset" type="xcal:~~utc-o~~ffsetType" />
	149	<xs:element name="utc-offset" type="xcal:UtcOffsetType" />
145	150
146	151	</xs:schema>

releases/bedework-3.7/resources/exsynchwsdefs/iCalendar.xsd

r3037	r3115
6	6	targetNamespace="urn:ietf:params:xml:ns:icalendar-2.0"
7	7	elementFormDefault="qualified">
	8
	9	<!-- ===================== Standard Extensions ======================= -->
	10	<xs:include schemaLocation="iCalendar-link-extension.xsd" />
	11
	12	<!-- ===================== Proprietary Extensions ======================= -->
	13	<xs:include schemaLocation="iCalendar-bw-extensions.xsd" />
	14	<xs:include schemaLocation="iCalendar-ms-extensions.xsd" />
	15	<xs:include schemaLocation="iCalendar-wscal-extensions.xsd" />
	16
8	17	<!-- =====================================================================
9	18	3.4 Calendar Components
…	…
11	20
12	21	<xs:include schemaLocation="iCalendar-props.xsd" />
13
14		~~<xs:complexType name="ArrayOfComponents">~~
15		~~<xs:choice maxOccurs="unbounded">~~
16		~~<xs:element name="vevent" type="xcal:veventType"/>~~
17		~~<xs:element name="vtodo" type="xcal:vtodoType"/>~~
18		~~<xs:element name="vjournal" type="xcal:vjournalType"/>~~
19		~~<xs:element name="vfreebusy" type="xcal:vfreebusyType"/>~~
20		~~<xs:element name="vtimezone" type="xcal:vtimezoneType"/>~~
21		~~<xs:element name="standard" type="xcal:standardType"/>~~
22		~~<xs:element name="daylight" type="xcal:daylightType"/>~~
23		~~<xs:element name="valarm" type="xcal:valarmType"/>~~
24		~~</xs:choice>~~
25		~~</xs:complexType>~~
26	22
27		<xs:complexType name="BaseComponentType">
	23	<xs:complexType name="BaseComponentType" abstract="true" >
28	24	<xs:sequence>
29	25	<xs:element name="properties" type="xcal:ArrayOfProperties"/>
…	…
31	27	</xs:sequence>
32	28	</xs:complexType>
	29
	30	<xs:element name="baseComponent" type="xcal:BaseComponentType" />
	31
	32	<xs:complexType name="ArrayOfComponents">
	33	<xs:sequence>
	34	<xs:element ref="xcal:baseComponent" maxOccurs="unbounded"/>
	35	</xs:sequence>
	36	</xs:complexType>
	37
	38	<xs:element name="vevent" type="xcal:VeventType"
	39	substitutionGroup="xcal:baseComponent"/>
	40
	41	<xs:element name="vtodo" type="xcal:VtodoType"
	42	substitutionGroup="xcal:baseComponent"/>
	43
	44	<xs:element name="vjournal" type="xcal:VjournalType"
	45	substitutionGroup="xcal:baseComponent"/>
	46
	47	<xs:element name="vfreebusy" type="xcal:VfreebusyType"
	48	substitutionGroup="xcal:baseComponent"/>
	49
	50	<xs:element name="vtimezone" type="xcal:VtimezoneType"
	51	substitutionGroup="xcal:baseComponent"/>
	52
	53	<xs:element name="standard" type="xcal:StandardType"
	54	substitutionGroup="xcal:baseComponent"/>
	55
	56	<xs:element name="daylight" type="xcal:DaylightType"
	57	substitutionGroup="xcal:baseComponent"/>
	58
	59	<xs:element name="valarm" type="xcal:ValarmType"
	60	substitutionGroup="xcal:baseComponent"/>
33	61
34	62	<!-- 3.4 iCalendar Stream -->
35		<xs:complexType name="icalendarType">
	63	<xs:complexType name="IcalendarType">
36	64	<xs:sequence>
37		<xs:element name="vcalendar" type="xcal:vcalendarType" maxOccurs="unbounded"/>
	65	<xs:element name="vcalendar" type="xcal:VcalendarType" maxOccurs="unbounded"/>
38	66	</xs:sequence>
39	67	</xs:complexType>
40	68
41	69	<!-- 3.6 Calendar Components -->
42		<xs:complexType name="vcalendarType">
	70	<xs:complexType name="VcalendarType">
43	71	<xs:complexContent mixed="false">
44	72	<xs:extension base="xcal:BaseComponentType"/>
…	…
47	75
48	76	<!-- 3.6.1 Event Component -->
49		<xs:complexType name="veventType">
	77	<xs:complexType name="VeventType">
50	78	<xs:complexContent mixed="false">
51	79	<xs:extension base="xcal:BaseComponentType"/>
…	…
54	82
55	83	<!-- 3.6.2 To-do Component -->
56		<xs:complexType name="vtodoType">
	84	<xs:complexType name="VtodoType">
57	85	<xs:complexContent mixed="false">
58	86	<xs:extension base="xcal:BaseComponentType"/>
…	…
61	89
62	90	<!-- 3.6.3 Journal Component -->
63		<xs:complexType name="vjournalType">
	91	<xs:complexType name="VjournalType">
64	92	<xs:complexContent mixed="false">
65	93	<xs:extension base="xcal:BaseComponentType"/>
…	…
68	96
69	97	<!-- 3.6.4 Free/Busy Component -->
70		<xs:complexType name="vfreebusyType">
	98	<xs:complexType name="VfreebusyType">
71	99	<xs:complexContent mixed="false">
72	100	<xs:extension base="xcal:BaseComponentType"/>
…	…
75	103
76	104	<!-- 3.6.5 timezone -->
77		<xs:complexType name="vtimezoneType">
	105	<xs:complexType name="VtimezoneType">
78	106	<xs:complexContent mixed="false">
79	107	<xs:extension base="xcal:BaseComponentType"/>
…	…
81	109	</xs:complexType>
82	110
83		<xs:complexType name="standardType">
	111	<xs:complexType name="StandardType">
84	112	<xs:complexContent mixed="false">
85	113	<xs:extension base="xcal:BaseComponentType"/>
…	…
87	115	</xs:complexType>
88	116
89		<xs:complexType name="daylightType">
	117	<xs:complexType name="DaylightType">
90	118	<xs:complexContent mixed="false">
91	119	<xs:extension base="xcal:BaseComponentType"/>
…	…
94	122
95	123	<!-- 3.6.6 Alarm Component -->
96		<xs:complexType name="valarmType">
	124	<xs:complexType name="ValarmType">
97	125	<xs:complexContent mixed="false">
98	126	<xs:extension base="xcal:BaseComponentType"/>

releases/bedework-3.7/resources/exsynchwsdefs/wsmessages.xsd

r3063	r3115
3	3	xmlns:tns="http://www.bedework.org/exsynch/wsmessages"
4	4	xmlns:xcal="urn:ietf:params:xml:ns:icalendar-2.0"
5		xmlns:xcup="urn:ietf:params:xml:ns:icalendar-upd-1.0"
	5	xmlns:p="urn:ietf:params:xml:ns:pidf-diff"
	6	xmlns:perr="urn:ietf:params:xml:ns:patch-ops-error"
6	7	targetNamespace="http://www.bedework.org/exsynch/wsmessages"
7	8	elementFormDefault="qualified">
…	…
9	10	<import schemaLocation="iCalendar.xsd"
10	11	namespace="urn:ietf:params:xml:ns:icalendar-2.0" />
11
12		<import schemaLocation="iCalendar-update.xsd"
13		namespace="urn:ietf:params:xml:ns:icalendar-upd-1.0" />
	12
	13	<!-- The schemas for RFC 5261 patch operations and errors. -->
	14	<import schemaLocation="patch.xsd"
	15	namespace="urn:ietf:params:xml:ns:pidf-diff" />
	16	<import schemaLocation="patch-errors.xsd"
	17	namespace="urn:ietf:params:xml:ns:patch-ops-error" />
14	18
15	19	<!-- Schema for messages passed from exsynch processor to the remote service. -->
…	…
269	273	<extension base="tns:base-synch-entity-request">
270	274	<sequence>
271		<element name="icalendar" type="xcal:icalendarType" />
	275	<element name="icalendar" type="xcal:IcalendarType" />
272	276	</sequence>
273	277	</extension>
…	…
313	317	</annotation>
314	318	<sequence>
315		<element name="icalendar" type="xcal:icalendarType" />
	319	<element name="icalendar" type="xcal:IcalendarType" />
316	320	<element name="status" type="tns:StatusType" />
317	321	<element name="message" type="string" />
…	…
332	336	<extension base="tns:base-synch-entity-request">
333	337	<sequence>
334		<element ref="xcup:updates" />
	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>
335	343	</sequence>
336	344	</extension>
…	…
348	356	<sequence>
349	357	<element name="status" type="tns:StatusType" />
	358	<element ref="perr:patch-ops-error" />
350	359	<element name="message" type="string" />
351	360	</sequence>

Download in other formats: