You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/03/18 02:34:00 UTC
svn commit: r924579 [1/2] -
/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/
Author: lresende
Date: Thu Mar 18 01:33:59 2010
New Revision: 924579
URL: http://svn.apache.org/viewvc?rev=924579&view=rev
Log:
TUSCANY-3451 - Updating to latest drafts of OASIS 1.1 XSDs
Added:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd (contents, props changed)
- copied, changed from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml (with props)
Removed:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd Thu Mar 18 01:33:59 2010
@@ -1,39 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,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">
- <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05.xsd"/>
<include schemaLocation="sca-interface-java-1.1-cd04.xsd"/>
- <include schemaLocation="sca-interface-wsdl-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-interface-wsdl-1.1-cd05.xsd"/>
<include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/>
<include schemaLocation="sca-interface-c-1.1-cd04.xsd"/>
- <include schemaLocation="sca-implementation-java-1.1-cd03.xsd"/>
- <include schemaLocation="sca-implementation-composite-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-implementation-java-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-implementation-composite-1.1-cd05.xsd"/>
<include schemaLocation="sca-implementation-cpp-1.1-cd04.xsd"/>
<include schemaLocation="sca-implementation-c-1.1-cd04.xsd"/>
<include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/>
<include schemaLocation="sca-implementation-spring-1.1-cd01.xsd"/>
<include schemaLocation="sca-binding-ws-1.1-cd04.xsd"/>
- <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/> <!-- New -->
+ <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/>
<include schemaLocation="sca-binding-jms-1.1-cd04.xsd"/>
<include schemaLocation="sca-binding-jca-1.1-cd04.xsd"/>
- <include schemaLocation="sca-binding-sca-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-sca-1.1-cd05.xsd"/>
<include schemaLocation="sca-binding-ejb-1.1-cd01.xsd"/>
- <include schemaLocation="sca-definitions-1.1-cd04.xsd"/>
- <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-definitions-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
- <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-contribution-1.1-cd05.xsd"/>
<include schemaLocation="sca-contribution-cpp-1.1-cd04.xsd"/>
<include schemaLocation="sca-contribution-c-1.1-cd04.xsd"/>
<include schemaLocation="sca-contribution-java-1.1-cd02.xsd"/>
- <include schemaLocation="sca-jee-1.1-wd03.xsd"/>
-
</schema>
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd Thu Mar 18 01:33:59 2010
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark,
- IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-cd04.xsd" />
-
- <element name="binding.ejb" type="sca:EJBSessionBeanBinding"
- substitutionGroup="sca:binding" />
-
- <simpleType name="VersionValue">
- <restriction base="string">
- <enumeration value="EJB2" />
- <enumeration value="EJB3" />
- </restriction>
- </simpleType>
-
- <complexType name="EJBSessionBeanBinding">
- <complexContent>
- <extension base="sca:Binding">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </sequence>
- <attribute name="homeInterface" type="NCName" use="optional" />
- <attribute name="ejb-link-name" type="string" use="optional" />
- <attribute name="ejb-version" type="sca:VersionValue" use="optional"
- default="EJB3" />
- </extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+
+ <element name="binding.ejb" type="sca:EJBSessionBeanBinding"
+ substitutionGroup="sca:binding" />
+
+ <simpleType name="VersionValue">
+ <restriction base="string">
+ <enumeration value="EJB2"/>
+ <enumeration value="EJB3"/>
+ </restriction>
+ </simpleType>
+
+ <complexType name="EJBSessionBeanBinding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <sequence>
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="homeInterface" type="NCName" use="optional"/>
+ <attribute name="ejb-link-name" type="string" use="optional"/>
+ <attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB3"/>
+ </extension>
+ </complexContent>
+ </complexType>
+</schema>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -6,7 +6,7 @@
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"/>
<complexType name="JCABinding">
<complexContent>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -6,7 +6,7 @@
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"/>
<complexType name="JMSBinding">
<complexContent>
@@ -95,11 +95,6 @@
<element name="connectionFactory" type="sca:JMSConnectionFactory"/>
<element name="activationSpec" type="sca:JMSActivationSpec"/>
</choice>
-
- <!-- TUSCANY-3297 -->
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
-
</sequence>
</complexType>
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd Thu Mar 18 01:33:59 2010
@@ -6,7 +6,7 @@
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"/>
<!-- SCA Binding -->
<element name="binding.sca" type="sca:SCABinding"
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -13,7 +13,7 @@
<import namespace="http://www.w3.org/2005/08/addressing"
schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
- <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05.xsd"/>
<element name="binding.ws" type="sca:WebServiceBinding"
substitutionGroup="sca:binding"/>
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd Thu Mar 18 01:33:59 2010
@@ -6,7 +6,7 @@
targetNamespace="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"/>
<!-- Contribution -->
<element name="contribution" type="sca:ContributionType"/>
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
+<!-- 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-contribution-1.1-cd04.xsd" />
+ <include schemaLocation="sca-contribution-1.1-cd05.xsd" />
<element name="export.c" type="sca:CExport"
substitutionGroup="sca:exportBase" />
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2006,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-contribution-1.1-cd04.xsd" />
+ <include schemaLocation="sca-contribution-1.1-cd05.xsd" />
<element name="export.cpp" type="sca:CPPExport"
substitutionGroup="sca:exportBase" />
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd Thu Mar 18 01:33:59 2010
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-contribution-1.1-cd05.xsd"/>
<!-- Import.java -->
<element name="import.java" type="sca:JavaImportType"
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd Thu Mar 18 01:33:59 2010
@@ -6,6 +6,7 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
+ <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
<import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="http://www.w3.org/2001/xml.xsd"/>
@@ -33,10 +34,7 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <!-- Comment out the sca:implementation to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. -->
- <!--
<element ref="sca:implementation" minOccurs="0"/>
- -->
<choice minOccurs="0" maxOccurs="unbounded">
<element name="service" type="sca:ComponentService"/>
<element name="reference"
@@ -46,7 +44,6 @@
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
- <attribute name="constrainingType" type="QName" use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -60,6 +57,8 @@
<element ref="sca:include" minOccurs="0"
maxOccurs="unbounded"/>
<choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="sca:requires"/>
+ <element ref="sca:policySetAttachment"/>
<element name="service" type="sca:Service"/>
<element name="property" type="sca:Property"/>
<element name="component" type="sca:Component"/>
@@ -75,7 +74,6 @@
default="false"/>
<attribute name="autowire" type="boolean" use="optional"
default="false"/>
- <attribute name="constrainingType" type="QName" use="optional"/>
<attribute name="requires" type="sca:listOfQNames"
use="optional"/>
<attribute name="policySets" type="sca:listOfQNames"
@@ -93,8 +91,11 @@
<element ref="sca:binding" minOccurs="0"
maxOccurs="unbounded" />
<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
+ <element ref="sca:requires" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <element ref="sca:policySetAttachment" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
</sequence>
<attribute name="name" type="NCName" use="required" />
<attribute name="requires" type="sca:listOfQNames"
@@ -119,6 +120,10 @@
<complexType name="Interface" abstract="true">
<complexContent>
<extension base="sca:CommonExtensionBase">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="sca:requires"/>
+ <element ref="sca:policySetAttachment"/>
+ </choice>
<attribute name="remotable" type="boolean" use="optional"/>
<attribute name="requires" type="sca:listOfQNames"
use="optional"/>
@@ -132,13 +137,12 @@
<complexType name="Reference">
<complexContent>
<extension base="sca:Contract">
- <attribute name="autowire" type="boolean" use="optional"/>
<attribute name="target" type="sca:listOfAnyURIs"
use="optional"/>
<attribute name="wiredByImpl" type="boolean" use="optional"
default="false"/>
<attribute name="multiplicity" type="sca:Multiplicity"
- use="optional" default="1..1"/>
+ use="required"/>
<attribute name="promote" type="sca:listOfAnyURIs"
use="required"/>
</extension>
@@ -155,58 +159,29 @@
i.e. no element-based extension point under "sca:property" -->
</sequence>
<!-- mixed="true" to handle simple type -->
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="name" type="NCName" use="required"/>
+ <attribute name="type" type="QName" use="optional"/>
+ <attribute name="element" type="QName" use="optional"/>
+ <attribute name="many" type="boolean" use="optional" default="false"/>
+ <attribute name="value" type="anySimpleType" use="optional"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
</complexType>
<complexType name="Property" mixed="true">
<complexContent mixed="true">
<extension base="sca:SCAPropertyBase">
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="type" type="QName" use="optional"/>
- <attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional"
- default="false"/>
<attribute name="mustSupply" type="boolean" use="optional"
default="false"/>
- <anyAttribute namespace="##other" processContents="lax"/>
</extension>
- <!-- extension defines the place to hold default value -->
- <!-- an extension point ; attribute-based only -->
- </complexContent>
- </complexType>
-
- <!-- ConstrainingProperty is equivalent to the Property type but removes
- the capability to contain a value -->
- <complexType name="ConstrainingProperty" mixed="true">
- <complexContent mixed="true">
- <restriction base="sca:Property">
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="type" type="QName" use="optional"/>
- <attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional"
- default="false"/>
- <attribute name="mustSupply" type="boolean" use="optional"
- default="false"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </restriction>
</complexContent>
</complexType>
<complexType name="PropertyValue" mixed="true">
<complexContent mixed="true">
<extension base="sca:SCAPropertyBase">
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="type" type="QName" use="optional"/>
- <attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional"
- default="false"/>
<attribute name="source" type="string" use="optional"/>
<attribute name="file" type="anyURI" use="optional"/>
- <attribute name="value" type="string" use="optional"/>
- <anyAttribute namespace="##other" processContents="lax"/>
</extension>
- <!-- an extension point ; attribute-based only -->
</complexContent>
</complexType>
@@ -219,6 +194,10 @@
<element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
<element ref="sca:operationSelector" minOccurs="0"
maxOccurs="1" />
+ <element ref="sca:requires" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <element ref="sca:policySetAttachment" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="uri" type="anyURI" use="optional"/>
<attribute name="name" type="NCName" use="optional"/>
@@ -259,7 +238,8 @@
</complexType>
<!-- OperationSelector Type -->
- <element name="operationSelector" type="sca:OperationSelectorType" abstract="true"/>
+ <element name="operationSelector" type="sca:OperationSelectorType"
+ abstract="true"/>
<complexType name="OperationSelectorType" abstract="true">
<sequence>
<any namespace="##other" processContents="lax" minOccurs="0"
@@ -275,6 +255,8 @@
<extension base="sca:CommonExtensionBase">
<choice minOccurs="0" maxOccurs="unbounded">
<element ref="sca:binding"/>
+ <element ref="sca:requires"/>
+ <element ref="sca:policySetAttachment"/>
<any namespace="##other" processContents="lax"/>
</choice>
<attribute name="requires" type="sca:listOfQNames"
@@ -290,19 +272,20 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <!-- Set minOccurs="1" instead of "0" to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. -->
- <element ref="sca:implementation" minOccurs="1"/>
+ <element ref="sca:implementation" minOccurs="1"
+ maxOccurs="1"/>
<choice minOccurs="0" maxOccurs="unbounded">
<element name="service" type="sca:ComponentService"/>
<element name="reference" type="sca:ComponentReference"/>
<element name="property" type="sca:PropertyValue"/>
+ <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="autowire" type="boolean" use="optional"/>
- <attribute name="constrainingType" type="QName" use="optional"/>
<attribute name="requires" type="sca:listOfQNames"
use="optional"/>
<attribute name="policySets" type="sca:listOfQNames"
@@ -319,22 +302,6 @@
</complexContent>
</complexType>
- <!-- Constraining Service -->
- <complexType name="ConstrainingService">
- <complexContent>
- <restriction base="sca:ComponentService">
- <sequence>
- <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
- <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </sequence>
- <attribute name="name" type="NCName" use="required" />
- </restriction>
- </complexContent>
- </complexType>
-
-
<!-- Component Reference -->
<complexType name="ComponentReference">
<complexContent>
@@ -352,26 +319,6 @@
</complexContent>
</complexType>
- <!-- Constraining Reference -->
- <complexType name="ConstrainingReference">
- <complexContent>
- <restriction base="sca:ComponentReference">
- <sequence>
- <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
- <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </sequence>
- <attribute name="name" type="NCName" use="required" />
- <attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional"
- default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity"
- use="optional" default="1..1"/>
- </restriction>
- </complexContent>
- </complexType>
-
<!-- Component Type Reference -->
<complexType name="ComponentTypeReference">
<complexContent>
@@ -383,8 +330,11 @@
<element ref="sca:binding" minOccurs="0"
maxOccurs="unbounded"/>
<element ref="sca:callback" minOccurs="0"/>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
+ <element ref="sca:requires" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <element ref="sca:policySetAttachment" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="autowire" type="boolean" use="optional"/>
@@ -407,6 +357,10 @@
<complexType name="Implementation" abstract="true">
<complexContent>
<extension base="sca:CommonExtensionBase">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="sca:requires"/>
+ <element ref="sca:policySetAttachment"/>
+ </choice>
<attribute name="requires" type="sca:listOfQNames"
use="optional"/>
<attribute name="policySets" type="sca:listOfQNames"
@@ -458,27 +412,16 @@
</extension>
</complexContent>
</complexType>
-
- <!-- Constraining Type -->
- <element name="constrainingType" type="sca:ConstrainingType"/>
- <complexType name="ConstrainingType">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="service" type="sca:ConstrainingService"/>
- <element name="reference"
- type="sca:ConstrainingReference"/>
- <element name="property" type="sca:ConstrainingProperty"/>
- </choice>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="targetNamespace" type="anyURI"/>
- </extension>
- </complexContent>
- </complexType>
+
+ <!-- Extensions element -->
+ <element name="extensions">
+ <complexType>
+ <sequence>
+ <any namespace="##other" processContents="lax"
+ minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
<!-- Intents within WSDL documents -->
<attribute name="requires" type="sca:listOfQNames"/>
@@ -492,7 +435,8 @@
<element name="value" type="sca:ValueType"/>
<complexType name="ValueType" mixed="true">
<sequence>
- <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs='unbounded'/>
+ <any namespace="##any" processContents="lax" minOccurs="0"
+ maxOccurs='unbounded'/>
</sequence>
<!-- mixed="true" to handle simple type -->
<anyAttribute namespace="##any" processContents="lax"/>
@@ -524,11 +468,11 @@
<list itemType="anyURI"/>
</simpleType>
- <simpleType name="CreateResource">
- <restriction base="string">
- <enumeration value="always" />
- <enumeration value="never" />
- <enumeration value="ifnotexist" />
- </restriction>
- </simpleType>
+ <simpleType name="CreateResource">
+ <restriction base="string">
+ <enumeration value="always" />
+ <enumeration value="never" />
+ <enumeration value="ifnotexist" />
+ </restriction>
+ </simpleType>
</schema>
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd Thu Mar 18 01:33:59 2010
@@ -6,8 +6,8 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd04.xsd"/>
- <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
<!-- Definitions -->
<element name="definitions" type="sca:tDefinitions"/>
@@ -17,7 +17,6 @@
<choice minOccurs="0" maxOccurs="unbounded">
<element ref="sca:intent"/>
<element ref="sca:policySet"/>
- <element ref="sca:binding"/>
<element ref="sca:bindingType"/>
<element ref="sca:implementationType"/>
<any namespace="##other" processContents="lax"
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd Thu Mar 18 01:33:59 2010
@@ -9,7 +9,7 @@
elementFormDefault="qualified">
<!-- SCA-Assembly XML Schema -->
- <include schemaLocation="sca-core-1.1-cd04.xsd" />
+ <include schemaLocation="sca-core-1.1-cd05.xsd" />
<!-- SCA-BPEL Component Implementation Type -->
<element name="implementation.bpel"
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -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="implementation.c" type="sca:CImplementation"
substitutionGroup="sca:implementation" />
@@ -15,40 +16,37 @@
<complexContent>
<extension base="sca:Implementation">
<sequence>
- <element name="operation"
- type="sca:CImplementationFunction" minOccurs="0"
- maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
+ <element name="operation" type="sca:CImplementationFunction"
minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
</sequence>
<attribute name="module" type="NCName" use="required" />
<attribute name="path" type="string" use="optional" />
<attribute name="library" type="boolean" use="optional" />
<attribute name="componentType" type="string" use="required" />
- <attribute name="scope" type="sca:CImplementationScope"
- use="optional" />
- <attribute name="eagerInit" type="boolean"
- use="optional" />
+ <attribute name="eagerInit" type="boolean" use="optional" />
<attribute name="init" type="boolean" use="optional" />
<attribute name="destoy" type="boolean" use="optional" />
<attribute name="allowsPassByReference" type="boolean"
use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
</extension>
</complexContent>
</complexType>
- <simpleType name="CImplementationScope">
- <restriction base="string">
- <enumeration value="stateless" />
- <enumeration value="composite" />
- </restriction>
- </simpleType>
-
<complexType name="CImplementationFunction">
+ <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="allowsPassByReference" type="boolean"
- use="optional" />
+ <attribute name="requires" type="sca:listOfQNames" use="optional" />
+ <attribute name="policySets" type="sca:listOfQNames" use="optional" />
+ <attribute name="allowsPassByReference" type="boolean" use="optional" />
<attribute name="init" type="boolean" use="optional" />
<attribute name="destoy" type="boolean" use="optional" />
<anyAttribute namespace="##other" processContents="lax" />
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd Thu Mar 18 01:33:59 2010
@@ -6,7 +6,7 @@
targetNamespace="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"/>
<!-- Composite Implementation -->
<element name="implementation.composite" type="sca:SCAImplementation"
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2006,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="implementation.cpp" type="sca:CPPImplementation"
substitutionGroup="sca:implementation" />
@@ -32,7 +32,6 @@
use="optional" />
<attribute name="allowsPassByReference" type="boolean"
use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
</extension>
</complexContent>
</complexType>
@@ -45,7 +44,17 @@
</simpleType>
<complexType name="CPPImplementationFunction">
+ <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="policySets" type="sca:listOfQNames" use="optional" />
<attribute name="allowsPassByReference" type="boolean"
use="optional" />
<anyAttribute namespace="##other" processContents="lax" />
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd Thu Mar 18 01:33:59 2010
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved.
OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="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"/>
<!-- Java Implementation -->
<element name="implementation.java" type="sca:JavaImplementation"
@@ -19,9 +19,8 @@
maxOccurs="unbounded"/>
</sequence>
<attribute name="class" type="NCName" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
</extension>
</complexContent>
</complexType>
-</schema>
+</schema>
\ No newline at end of file
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd Thu Mar 18 01:33:59 2010
@@ -6,7 +6,7 @@
elementFormDefault="qualified"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">
- <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05.xsd"/>
<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
<complexType name="SpringImplementation">
<complexContent>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -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" />
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,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) 2006,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.cpp" type="sca:CPPInterface"
substitutionGroup="sca:interface" />
@@ -15,29 +16,35 @@
<complexContent>
<extension base="sca:Interface">
<sequence>
- <element name="function" type="sca:CPPFunction"
- minOccurs="0" maxOccurs="unbounded" />
- <element name="callbackFunction"
- type="sca:CPPFunction" minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
+ <element name="function" type="sca:CPPFunction" minOccurs="0"
+ maxOccurs="unbounded" />
+ <element name="callbackFunction" type="sca:CPPFunction"
minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
</sequence>
<attribute name="header" type="string" use="required" />
<attribute name="class" type="Name" use="required" />
- <attribute name="callbackHeader" type="string"
- use="optional" />
- <attribute name="callbackClass" type="Name"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
+ <attribute name="callbackHeader" type="string" use="optional" />
+ <attribute name="callbackClass" type="Name" use="optional" />
</extension>
</complexContent>
</complexType>
<complexType name="CPPFunction">
+ <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" />
<anyAttribute namespace="##other" processContents="lax" />
</complexType>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd Thu Mar 18 01:33:59 2010
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,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"/>
<!-- Java Interface -->
<element name="interface.java" type="sca:JavaInterface"
@@ -21,7 +21,6 @@
<attribute name="interface" type="NCName" use="required"/>
<attribute name="callbackInterface" type="NCName"
use="optional"/>
- <anyAttribute namespace="##other" processContents="lax"/>
</extension>
</complexContent>
</complexType>
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd Thu Mar 18 01:33:59 2010
@@ -6,7 +6,7 @@
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"/>
<!-- WSDL Interface -->
<element name="interface.wsdl" type="sca:WSDLPortType"
@@ -21,7 +21,6 @@
<attribute name="interface" type="anyURI" use="required"/>
<attribute name="callbackInterface" type="anyURI"
use="optional"/>
- <anyAttribute namespace="##other" processContents="lax"/>
</extension>
</complexContent>
</complexType>
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd Thu Mar 18 01:33:59 2010
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
- <element name="implementation.ejb" type="sca:EJBImplementation"
- substitutionGroup="sca:implementation"/>
- <complexType name="EJBImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <attribute name="ejb-link" type="string" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="implementation.web" type="sca:WebImplementation"
- substitutionGroup="sca:implementation"/>
- <complexType name="WebImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <attribute name="web-uri" type="string" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="implementation.jee" type="sca:JEEImplementation"
- substitutionGroup="sca:implementation"/>
- <complexType name="JEEImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <attribute name="archive" type="string" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+
+ <element name="implementation.ejb" type="sca:EJBImplementation"
+ substitutionGroup="sca:implementation"/>
+ <complexType name="EJBImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="ejb-link" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="implementation.web" type="sca:WebImplementation"
+ substitutionGroup="sca:implementation"/>
+ <complexType name="WebImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="web-uri" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="implementation.jee" type="sca:JEEImplementation"
+ substitutionGroup="sca:implementation"/>
+ <complexType name="JEEImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="archive" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </extension>
+ </complexContent>
+ </complexType>
+</schema>
Copied: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd (from r924358, tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd?p2=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd&p1=tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd&r1=924358&r2=924579&rev=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd Thu Mar 18 01:33:59 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,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"
@@ -7,7 +7,7 @@
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05.xsd"/>
<import namespace="http://www.w3.org/ns/ws-policy"
schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
@@ -40,12 +40,24 @@
<sequence>
<element name="description" type="string" minOccurs="0"
maxOccurs="1" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="default" type="boolean" use="optional"
default="false"/>
</complexType>
+ <element name="requires">
+ <complexType>
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ </sequence>
+ <attribute name="intents" type="sca:listOfQNames" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+ </element>
+
<element name="policySet" type="sca:PolicySet"/>
<complexType name="PolicySet">
<choice minOccurs="0" maxOccurs="unbounded">
@@ -61,12 +73,15 @@
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
- <element name="policySetAttachment"
- type="sca:PolicySetAttachment"/>
- <complexType name="PolicySetAttachment">
- <attribute name="name" type="QName" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </complexType>
+ <element name="policySetAttachment">
+ <complexType>
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ </sequence>
+ <attribute name="name" type="QName" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+ </element>
<complexType name="PolicySetReference">
<attribute name="name" type="QName" use="required"/>
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml?rev=924579&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml (added)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml Thu Mar 18 01:33:59 2010
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">
+
+ <!-- Security related intents -->
+ <sca:intent name="serverAuthentication" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ Communication through the binding requires that the
+ server is authenticated by the client
+ </sca:description>
+ <sca:qualifier name="transport" default="true"/>
+ <sca:qualifier name="message"/>
+ </sca:intent>
+
+ <sca:intent name="clientAuthentication" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ Communication through the binding requires that the
+ client is authenticated by the server
+ </sca:description>
+ <sca:qualifier name="transport" default="true"/>
+ <sca:qualifier name="message"/>
+ </sca:intent>
+
+ <sca:intent name="authentication" requires="sca:clientAuthentication">
+ <sca:description>
+ A convenience intent to help migration
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="mutualAuthentication"
+ requires="sca:clientAuthentication sca:serverAuthentication">
+ <sca:description>
+ Communication through the binding requires that the
+ client and server to authenticate each other
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="confidentiality" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ Communication through the binding prevents unauthorized
+ users from reading the messages
+ </sca:description>
+ <sca:qualifier name="transport" default="true"/>
+ <sca:qualifier name="message"/>
+ </sca:intent>
+
+ <sca:intent name="integrity" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ Communication through the binding prevents tampering
+ with the messages sent between the client and the service.
+ </sca:description>
+ <sca:qualifier name="transport" default="true"/>
+ <sca:qualifier name="message"/>
+ </sca:intent>
+
+ <sca:intent name="authorization" constrains="sca:implementation"
+ intentType="implementation">
+ <sca:description>
+ Ensures clients are authorized to use services.
+ </sca:description>
+ </sca:intent>
+
+
+ <!-- Reliable messaging related intents -->
+ <sca:intent name="atLeastOnce" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ This intent is used to indicate that a message sent
+ by a client is always delivered to the component.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="atMostOnce" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ This intent is used to indicate that a message that was
+ successfully sent by a client is not delivered more than
+ once to the component.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="exactlyOnce" requires="sca:atLeastOnce sca:atMostOnce"
+ constrains="sca:binding" intentType="interaction">
+ <sca:description>
+ This profile intent is used to indicate that a message sent
+ by a client is always delivered to the component. It also
+ indicates that duplicate messages are not delivered to the
+ component.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="ordered" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ This intent is used to indicate that all the messages are
+ delivered to the component in the order they were sent by
+ the client.
+ </sca:description>
+ </sca:intent>
+
+ <!-- Transaction related intents -->
+ <sca:intent name="managedTransaction" excludes="sca:noManagedTransaction"
+ mutuallyExclusive="true" constrains="sca:implementation"
+ intentType="implementation">
+ <sca:description>
+ A managed transaction environment is necessary in order to
+ run the component. The specific type of managed transaction
+ needed is not constrained.
+ </sca:description>
+ <sca:qualifier name="global" default="true">
+ <sca:description>
+ For a component marked with managedTransaction.global
+ a global transaction needs to be present before dispatching
+ any method on the component - using any transaction
+ propagated from the client or else beginning and completing
+ a new transaction.
+ </sca:description>
+ </sca:qualifier>
+ <sca:qualifier name="local">
+ <sca:description>
+ A component marked with managedTransaction.local needs to
+ run within a local transaction containment (LTC) that
+ is started and ended by the SCA runtime.
+ </sca:description>
+ </sca:qualifier>
+ </sca:intent>
+
+ <sca:intent name="noManagedTransaction" excludes="sca:managedTransaction"
+ constrains="sca:implementation" intentType="implementation">
+ <sca:description>
+ A component marked with noManagedTransaction needs to run without
+ a managed transaction, under neither a global transaction nor
+ an LTC. A transaction propagated to the hosting SCA runtime
+ is not joined by the hosting runtime on behalf of a
+ component marked with noManagedtransaction.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="transactedOneWay" excludes="sca:immediateOneWay"
+ constrains="sca:binding" intentType="implementation">
+ <sca:description>
+ For a reference marked as transactedOneWay any OneWay invocation
+ messages are transacted as part of a client global
+ transaction.
+ For a service marked as transactedOneWay any OneWay invocation
+ message are received from the transport binding in a
+ transacted fashion, under the serviceâs global transaction.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="immediateOneWay" excludes="sca:transactedOneWay"
+ constrains="sca:binding" intentType="implementation">
+ <sca:description>
+ For a reference indicates that any OneWay invocation messages
+ are sent immediately regardless of any client transaction.
+ For a service indicates that any OneWay invocation is
+ received immediately regardless of any target service
+ transaction.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="propagatesTransaction" excludes="sca:suspendsTransaction"
+ constrains="sca:binding" intentType="interaction">
+ <sca:description>
+ A service marked with propagatesTransaction is dispatched
+ under any propagated (client) transaction and the service binding
+ needs to be capable of receiving a transaction context.
+ A reference marked with propagatesTransaction propagates any
+ transaction context under which the client runs when the
+ reference is used for a request-response interaction and the
+ binding of a reference marked with propagatesTransaction needs to
+ be capable of propagating a transaction context.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="suspendsTransaction" excludes="sca:propagatesTransaction"
+ constrains="sca:binding" intentType="interaction">
+ <sca:description>
+ A service marked with suspendsTransaction is not dispatched
+ under any propagated (client) transaction.
+ A reference marked with suspendsTransaction does not propagate
+ any transaction context under which the client runs when the
+ reference is used.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="managedSharedTransaction"
+ requires="sca:managedTransaction.global sca:propagatesTransaction">
+ <sca:description>
+ Used to indicate that the component requires both the
+ managedTransaction.global and the propagatesTransactions
+ intents
+ </sca:description>
+ </sca:intent>
+
+ <!-- Miscellaneous intents -->
+ <sca:intent name="asyncInvocation" excludes="sca:propagatesTransaction"
+ constrains="sca:binding" intentType="interaction">
+ <sca:description>
+ Indicates that request/response operations for the
+ interface of this wire are "long running" and must be
+ treated as two separate message transmissions
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="EJB" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ Specifies that the EJB API is needed to communicate with
+ the service or reference.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="SOAP" constrains="sca:binding" intentType="interaction" mutuallyExclusive="true">
+ <sca:description>
+ Specifies that the SOAP messaging model is used for delivering
+ messages.
+ </sca:description>
+ <sca:qualifier name="v1_1" default="true"/>
+ <sca:qualifier name="v1_2"/>
+ </sca:intent>
+
+ <sca:intent name="JMS" constrains="sca:binding" intentType="interaction">
+ <sca:description>
+ Requires that the messages are delivered and received via the
+ JMS API.
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="noListener" constrains="sca:binding"
+ intentType="interaction">
+ <sca:description>
+ This intent can only be used on a reference. Indicates that the
+ client is not able to handle new inbound connections. The binding
+ and callback binding are configured so that any
+ response or callback comes either through a back channel of the
+ connection from the client to the server or by having the client
+ poll the server for messages.
+ </sca:description>
+ </sca:intent>
+
+</sca:definitions>
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd Thu Mar 18 01:33:59 2010
@@ -23,7 +23,7 @@
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
elementFormDefault="qualified">
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
<element name="binding.dwr" type="t:DWRBinding"/>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd?rev=924579&r1=924578&r2=924579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd Thu Mar 18 01:33:59 2010
@@ -23,7 +23,7 @@
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
elementFormDefault="qualified">
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
<element name="binding.http" type="t:HTTPBinding"/>