From f2e5a288fee44a1af4d72d8f8bf4fac64b35f01f Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 18 Mar 2010 01:33:59 +0000
Subject: TUSCANY-3451 - Updating to latest drafts of OASIS 1.1 XSDs

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924579 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/sca-interface-c-1.1-cd04.xsd    | 38 +++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd')

diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
index d5bff5d542..518f0747fb 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	<!--
+		Copyright(C) OASIS(R) 2007,2010. All Rights Reserved. OASIS trademark,
+		IPR and other policies apply.
+	-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	<include schemaLocation="sca-core-1.1-cd05.xsd" />
 
 	<element name="interface.c" type="sca:CInterface"
 		substitutionGroup="sca:interface" />
@@ -15,26 +16,33 @@
 		<complexContent>
 			<extension base="sca:Interface">
 				<sequence>
-					<element name="function" type="sca:CFunction"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="callbackFunction"
-						type="sca:CFunction" minOccurs="0" maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
+					<element name="function" type="sca:CFunction" minOccurs="0"
+						maxOccurs="unbounded" />
+					<element name="callbackFunction" type="sca:CFunction"
 						minOccurs="0" maxOccurs="unbounded" />
+					<any namespace="##other" processContents="lax" minOccurs="0"
+						maxOccurs="unbounded" />
 				</sequence>
 				<attribute name="header" type="string" use="required" />
-				<attribute name="callbackHeader" type="string"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
+				<attribute name="callbackHeader" type="string" use="optional" />
 			</extension>
 		</complexContent>
 	</complexType>
 
 	<complexType name="CFunction">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="unbounded">
+				<element ref="sca:requires"/>
+				<element ref="sca:policySetAttachment"/>
+			</choice>
+			<any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</sequence>
 		<attribute name="name" type="NCName" use="required" />
-		<attribute name="requires" type="sca:listOfQNames"
-			use="optional" />
+		<attribute name="requires" type="sca:listOfQNames" use="optional" />
+		<attribute name="policySets" type="sca:listOfQNames" use="optional" />
 		<attribute name="oneWay" type="boolean" use="optional" />
+		<attribute name="exclude" type="boolean" use="optional" />
 		<attribute name="input" type="NCName" use="optional" />
 		<attribute name="output" type="NCName" use="optional" />
 		<anyAttribute namespace="##other" processContents="lax" />
-- 
cgit v1.2.3