diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-08 23:46:24 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-08 23:46:24 +0000 |
| commit | 40a58f49d232694b942b855fd493296a25881f05 (patch) | |
| tree | e8cf2c32c197e041088aefb4033f7c2c1b3224d9 /sca-java-2.x/trunk | |
| parent | 9c978d4756b58506f7eb2207d3ef9ce0b2788a7c (diff) | |
Update to latest OASIS XSDs
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1043780 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
35 files changed, 1000 insertions, 1072 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd04.xml index 4505850072..0d6c5ac714 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd04.xml @@ -1,249 +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> +<?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>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions index 381c0ba23b..7e75c402e3 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-META-INF/sca-policy-1.1-intents-definitions-cd03.xml
+META-INF/sca-policy-1.1-intents-definitions-cd04.xml
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java index d782b20a4f..6a42cdbd2e 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java @@ -108,7 +108,7 @@ public interface Constants { static class XSDCache { static Map<String, URL> cache() { Map<String, URL> cachedXSDs = new HashMap<String, URL>(); - cachedXSDs.put(Constants.SCA11_NS, Constants.class.getResource("/sca-1.1-cd05.xsd")); + cachedXSDs.put(Constants.SCA11_NS, Constants.class.getResource("/sca-1.1-cd06.xsd")); cachedXSDs .put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", Constants.class diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema index ba25c9908a..863d161954 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema @@ -16,4 +16,4 @@ # under the License. # tuscany-sca-1.1.xsd -sca-1.1-cd05-rev1.xsd
+sca-1.1-cd06.xsd
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd deleted file mode 100644 index d85a905c3e..0000000000 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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-cd05-rev1.xsd"/> - - <include schemaLocation="sca-interface-java-1.1-cd04-rev1.xsd"/> - <include schemaLocation="sca-interface-wsdl-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/> - <include schemaLocation="sca-interface-c-1.1-cd05-rev1.xsd"/> - - <include schemaLocation="sca-implementation-java-1.1-cd02-rev1.xsd"/> - <include schemaLocation="sca-implementation-composite-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-implementation-cpp-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-implementation-c-1.1-cd05-rev1.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-rev1.xsd"/> - <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/> - <include schemaLocation="sca-binding-jms-1.1-cd04-rev2.xsd"/> - <include schemaLocation="sca-binding-jca-1.1-cd04-rev1.xsd"/> - <include schemaLocation="sca-binding-sca-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-binding-ejb-1.1-cd02-rev1.xsd"/> - - <include schemaLocation="sca-definitions-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-policy-1.1-cd03-rev1.xsd"/> - - <include schemaLocation="sca-contribution-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-contribution-cpp-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-contribution-c-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-contribution-java-1.1-cd02-rev1.xsd"/> - - <include schemaLocation="sca-jee-1.1-wd03.xsd"/> -</schema> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd deleted file mode 100644 index 5f3c796810..0000000000 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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-cd05.xsd"/> - - <include schemaLocation="sca-interface-java-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-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"/> - <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-cd05.xsd"/> - <include schemaLocation="sca-binding-ejb-1.1-cd01.xsd"/> - - <include schemaLocation="sca-definitions-1.1-cd05.xsd"/> - <include schemaLocation="sca-policy-1.1-cd03.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> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd06.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd06.xsd new file mode 100644 index 0000000000..b6be5df43b --- /dev/null +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd06.xsd @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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-cd06.xsd"/> + + <include schemaLocation="sca-interface-java-1.1-cd05.xsd"/> + <include schemaLocation="sca-interface-wsdl-1.1-cd06.xsd"/> + <include schemaLocation="sca-interface-cpp-1.1-cd06.xsd"/> + <include schemaLocation="sca-interface-c-1.1-cd06.xsd"/> + + <include schemaLocation="sca-implementation-java-1.1-cd03.xsd"/> + <include schemaLocation="sca-implementation-composite-1.1-cd06.xsd"/> + <include schemaLocation="sca-implementation-cpp-1.1-cd06.xsd"/> + <include schemaLocation="sca-implementation-c-1.1-cd06.xsd"/> + <include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/> + <include schemaLocation="sca-implementation-spring-1.1-cd01.xsd"/> + + <!-- [rfeng] Added by Tuscany --> + <include schemaLocation="sca-jee-1.1-wd03.xsd"/> + + <include schemaLocation="sca-binding-ws-1.1-cd04-rev2.xsd"/> + <include schemaLocation="sca-binding-ws-callback-1.1-cd04-rev1.xsd"/> + <include schemaLocation="sca-binding-jms-1.1-cd04-rev2.xsd"/> + <include schemaLocation="sca-binding-jca-1.1-cd04-rev2.xsd"/> + <include schemaLocation="sca-binding-sca-1.1-cd06.xsd"/> + <include schemaLocation="sca-binding-ejb-1.1-cd02-rev2.xsd"/> + + <include schemaLocation="sca-definitions-1.1-cd06.xsd"/> + <include schemaLocation="sca-policy-1.1-cd04.xsd"/> + + <include schemaLocation="sca-contribution-1.1-cd06.xsd"/> + <include schemaLocation="sca-contribution-cpp-1.1-cd06.xsd"/> + <include schemaLocation="sca-contribution-c-1.1-cd06.xsd"/> + <include schemaLocation="sca-contribution-java-1.1-cd03.xsd"/> + +</schema> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev2.xsd index 0ac63d4a86..0b388fcf17 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev2.xsd @@ -6,7 +6,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <element name="binding.ejb" type="sca:EJBSessionBeanBinding" substitutionGroup="sca:binding" /> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev2.xsd index 789918f41e..75446411db 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev2.xsd @@ -5,7 +5,7 @@ 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-cd05-rev1.xsd" /> + <include schemaLocation="sca-core-1.1-cd06.xsd" /> <complexType name="JCABinding"> <complexContent> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd06.xsd index 6cdbf1656e..9cc22601b3 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd06.xsd @@ -6,7 +6,7 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <!-- SCA Binding --> <element name="binding.sca" type="sca:SCABinding" diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev2.xsd index 9d6d97e32c..f080e4ef49 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev2.xsd @@ -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-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <element name="binding.ws" type="sca:WebServiceBinding" substitutionGroup="sca:binding"/> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04-rev1.xsd index 72d84b31ff..7d5482e9f0 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04-rev1.xsd @@ -13,7 +13,6 @@ maxOccurs="unbounded"/> </sequence> <anyAttribute namespace="##any" processContents="lax"/> - </complexType> </element> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd06.xsd index 346bfe485e..a3dea7eab4 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd06.xsd @@ -6,7 +6,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <!-- Contribution --> <element name="contribution" type="sca:ContributionType"/> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd06.xsd index 9e29607c5d..2a0feadac9 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd06.xsd @@ -1,35 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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-cd05-rev1.xsd" /> - - <element name="export.c" type="sca:CExport" - substitutionGroup="sca:exportBase" /> - - <complexType name="CExport"> - <complexContent> - <extension base="sca:Export"> - <attribute name="name" type="QName" use="required" /> - <attribute name="path" type="string" use="optional" /> - </extension> - </complexContent> - </complexType> - - <element name="import.c" type="sca:CImport" - substitutionGroup="sca:importBase" /> - - <complexType name="CImport"> - <complexContent> - <extension base="sca:Import"> - <attribute name="name" type="QName" use="required" /> - <attribute name="location" type="string" use="required" /> - </extension> - </complexContent> - </complexType> - -</schema> +<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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-cd06.xsd" />
+
+ <element name="export.c" type="sca:CExport"
+ substitutionGroup="sca:exportBase" />
+
+ <complexType name="CExport">
+ <complexContent>
+ <extension base="sca:Export">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="path" type="string" use="optional" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="import.c" type="sca:CImport"
+ substitutionGroup="sca:importBase" />
+
+ <complexType name="CImport">
+ <complexContent>
+ <extension base="sca:Import">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="location" type="string" use="required" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd06.xsd index 94813bf6ac..a5201661c1 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd06.xsd @@ -1,35 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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-cd05-rev1.xsd" /> - - <element name="export.cpp" type="sca:CPPExport" - substitutionGroup="sca:exportBase" /> - - <complexType name="CPPExport"> - <complexContent> - <extension base="sca:Export"> - <attribute name="name" type="QName" use="required" /> - <attribute name="path" type="string" use="optional" /> - </extension> - </complexContent> - </complexType> - - <element name="import.cpp" type="sca:CPPImport" - substitutionGroup="sca:importBase" /> - - <complexType name="CPPImport"> - <complexContent> - <extension base="sca:Import"> - <attribute name="name" type="QName" use="required" /> - <attribute name="location" type="string" use="required" /> - </extension> - </complexContent> - </complexType> - +<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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-cd06.xsd" />
+
+ <element name="export.cpp" type="sca:CPPExport"
+ substitutionGroup="sca:exportBase" />
+
+ <complexType name="CPPExport">
+ <complexContent>
+ <extension base="sca:Export">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="path" type="string" use="optional" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="import.cpp" type="sca:CPPImport"
+ substitutionGroup="sca:importBase" />
+
+ <complexType name="CPPImport">
+ <complexContent>
+ <extension base="sca:Import">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="location" type="string" use="required" />
+ </extension>
+ </complexContent>
+ </complexType>
+
</schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd03.xsd index 92642591cd..89b90965a4 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd03.xsd @@ -6,7 +6,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-contribution-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-contribution-1.1-cd06.xsd"/> <!-- Import.java --> <element name="import.java" type="sca:JavaImportType" @@ -31,4 +31,4 @@ </complexContent> </complexType> -</schema> +</schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd06.xsd index 541a5c324c..668e3b1ce3 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd06.xsd @@ -6,7 +6,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-policy-1.1-cd03-rev1.xsd"/> + <include schemaLocation="sca-policy-1.1-cd04.xsd"/> <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd06.xsd index fcd3cc0f8d..4781421138 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd06.xsd @@ -6,8 +6,8 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> - <include schemaLocation="sca-policy-1.1-cd03-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> + <include schemaLocation="sca-policy-1.1-cd04.xsd"/> <!-- Definitions --> <element name="definitions" type="sca:tDefinitions"/> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd index 967dadf395..ad5daf8224 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd @@ -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
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
@@ -9,7 +9,7 @@ elementFormDefault="qualified">
<!-- SCA-Assembly XML Schema -->
- <include schemaLocation="sca-core-1.1-cd05.xsd" />
+ <include schemaLocation="sca-core-1.1-cd06.xsd" />
<!-- SCA-BPEL Component Implementation Type -->
<element name="implementation.bpel"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd06.xsd index 2f394bc260..8616c73de3 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd06.xsd @@ -1,55 +1,55 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - 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-cd05-rev1.xsd" /> - - <element name="implementation.c" type="sca:CImplementation" - substitutionGroup="sca:implementation" /> - - <complexType name="CImplementation"> - <complexContent> - <extension base="sca:Implementation"> - <sequence> - <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="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" /> - </extension> - </complexContent> - </complexType> - - <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="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" /> - </complexType> - -</schema> +<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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-cd06.xsd" />
+
+ <element name="implementation.c" type="sca:CImplementation"
+ substitutionGroup="sca:implementation" />
+
+ <complexType name="CImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <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="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" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <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="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" />
+ </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd06.xsd index 5ca0e598de..77ef5f3b0c 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd06.xsd @@ -6,7 +6,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <!-- Composite Implementation --> <element name="implementation.composite" type="sca:SCAImplementation" diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd06.xsd index 93f3c85884..534f401d50 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd06.xsd @@ -1,63 +1,63 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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-cd05-rev1.xsd" /> - - <element name="implementation.cpp" type="sca:CPPImplementation" - substitutionGroup="sca:implementation" /> - <complexType name="CPPImplementation"> - <complexContent> - <extension base="sca:Implementation"> - <sequence> - <element name="function" - type="sca:CPPImplementationFunction" minOccurs="0" - maxOccurs="unbounded" /> - <any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /> - </sequence> - <attribute name="library" type="NCName" use="required" /> - <attribute name="header" type="NCName" use="required" /> - <attribute name="path" type="string" use="optional" /> - <attribute name="class" type="Name" use="optional" /> - <attribute name="componentType" type="string" - use="optional" /> - <attribute name="scope" - type="sca:CPPImplementationScope" use="optional" /> - <attribute name="eagerInit" type="boolean" - use="optional" /> - <attribute name="allowsPassByReference" type="boolean" - use="optional" /> - </extension> - </complexContent> - </complexType> - - <simpleType name="CPPImplementationScope"> - <restriction base="string"> - <enumeration value="stateless" /> - <enumeration value="composite" /> - </restriction> - </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" /> - </complexType> - -</schema> +<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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-cd06.xsd" />
+
+ <element name="implementation.cpp" type="sca:CPPImplementation"
+ substitutionGroup="sca:implementation" />
+ <complexType name="CPPImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <element name="function"
+ type="sca:CPPImplementationFunction" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="library" type="NCName" use="required" />
+ <attribute name="header" type="NCName" use="required" />
+ <attribute name="path" type="string" use="optional" />
+ <attribute name="class" type="Name" use="optional" />
+ <attribute name="componentType" type="string"
+ use="optional" />
+ <attribute name="scope"
+ type="sca:CPPImplementationScope" use="optional" />
+ <attribute name="eagerInit" type="boolean"
+ use="optional" />
+ <attribute name="allowsPassByReference" type="boolean"
+ use="optional" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <simpleType name="CPPImplementationScope">
+ <restriction base="string">
+ <enumeration value="stateless" />
+ <enumeration value="composite" />
+ </restriction>
+ </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" />
+ </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd index 90fe13c015..4fbbff25e2 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd @@ -6,7 +6,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <!-- Java Implementation --> <element name="implementation.java" type="sca:JavaImplementation" diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd index 5ef3e86c92..279b9abdb1 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd @@ -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" elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"> - <include schemaLocation="sca-core-1.1-cd05.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/> <complexType name="SpringImplementation"> <complexContent> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd06.xsd index 0dca94a6d5..33abeb456a 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd06.xsd @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - 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-cd05-rev1.xsd" /> - - <element name="interface.c" type="sca:CInterface" - substitutionGroup="sca:interface" /> - - <complexType name="CInterface"> - <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" minOccurs="0" - maxOccurs="unbounded" /> - </sequence> - <attribute name="header" type="string" use="required" /> - <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="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" /> - </complexType> - -</schema> +<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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-cd06.xsd" />
+
+ <element name="interface.c" type="sca:CInterface"
+ substitutionGroup="sca:interface" />
+
+ <complexType name="CInterface">
+ <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" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="header" type="string" use="required" />
+ <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="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" />
+ </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd deleted file mode 100644 index b07bf01f1d..0000000000 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - 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-cd05.xsd" /> - - <element name="interface.cpp" type="sca:CPPInterface" - substitutionGroup="sca:interface" /> - - <complexType name="CPPInterface"> - <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" 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" /> - </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="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> - -</schema> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd06.xsd index 0dee25b649..e4881e5bb4 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd06.xsd @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - 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-cd05-rev1.xsd" /> - - <element name="interface.cpp" type="sca:CPPInterface" - substitutionGroup="sca:interface" /> - - <complexType name="CPPInterface"> - <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" 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" /> - </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="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> - -</schema> +<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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-cd06.xsd" />
+
+ <element name="interface.cpp" type="sca:CPPInterface"
+ substitutionGroup="sca:interface" />
+
+ <complexType name="CPPInterface">
+ <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" 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" />
+ </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="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>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd05.xsd index 7dcf79a797..a505ddd3fc 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd05.xsd @@ -6,7 +6,7 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <!-- Java Interface --> <element name="interface.java" type="sca:JavaInterface" @@ -25,4 +25,4 @@ </complexContent> </complexType> -</schema> +</schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd06.xsd index 532c0a6bd0..6db2ca7d22 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd06.xsd @@ -6,7 +6,7 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <!-- WSDL Interface --> <element name="interface.wsdl" type="sca:WSDLPortType" diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd index 97b44f8da5..06f15cc9ca 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd @@ -5,7 +5,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <element name="implementation.ejb" type="sca:EJBImplementation" substitutionGroup="sca:implementation"/> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd index 8de738cf73..adc66487fe 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd @@ -1,131 +1,134 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - elementFormDefault="qualified"> - - <include schemaLocation="sca-core-1.1-cd06.xsd"/> - <import namespace="http://www.w3.org/ns/ws-policy" - schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/> - - <element name="intent" type="sca:Intent"/> - <complexType name="Intent"> - <sequence> - <element name="description" type="string" minOccurs="0" - maxOccurs="1" /> - <element name="qualifier" type="sca:IntentQualifier" - minOccurs="0" maxOccurs="unbounded" /> - <any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="name" type="NCName" use="required"/> - <attribute name="constrains" type="sca:listOfQNames" - use="optional"/> - <attribute name="requires" type="sca:listOfQNames" - use="optional"/> - <attribute name="excludes" type="sca:listOfQNames" - use="optional"/> - <attribute name="mutuallyExclusive" type="boolean" - use="optional" default="false"/> - <attribute name="intentType" - type="sca:InteractionOrImplementation" - use="optional" default="interaction"/> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - - <complexType name="IntentQualifier"> - <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="externalAttachment"> - <complexType> - <sequence minOccurs="0" maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> - </sequence> - <attribute name="intents" type="sca:listOfQNames" use="optional"/> - <attribute name="policySets" type="sca:listOfQNames" use="optional"/> - <attribute name="attachTo" type="string" use="required"/> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - </element> - - <element name="policySet" type="sca:PolicySet"/> - <complexType name="PolicySet"> - <choice minOccurs="0" maxOccurs="unbounded"> - <element name="policySetReference" - type="sca:PolicySetReference"/> - <element name="intentMap" type="sca:IntentMap"/> - <any namespace="##other" processContents="lax"/> - </choice> - <attribute name="name" type="NCName" use="required"/> - <attribute name="provides" type="sca:listOfQNames"/> - <attribute name="appliesTo" type="string" use="optional"/> - <attribute name="attachTo" type="string" use="optional"/> - <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"/> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - - <complexType name="IntentMap"> - <choice minOccurs="1" maxOccurs="unbounded"> - <element name="qualifier" type="sca:Qualifier"/> - <any namespace="##other" processContents="lax"/> - </choice> - <attribute name="provides" type="QName" use="required"/> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - - <complexType name="Qualifier"> - <sequence minOccurs="0" maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> - </sequence> - <attribute name="name" type="string" use="required"/> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - - <simpleType name="listOfNCNames"> - <list itemType="NCName"/> - </simpleType> - - <simpleType name="InteractionOrImplementation"> - <restriction base="string"> - <enumeration value="interaction"/> - <enumeration value="implementation"/> - </restriction> - </simpleType> - +<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ elementFormDefault="qualified">
+
+ <!-- [rfeng] Comment out the include to avoid circular dependency -->
+ <!--
+ <include schemaLocation="sca-core-1.1-cd06.xsd"/>
+ -->
+ <import namespace="http://www.w3.org/ns/ws-policy"
+ schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
+
+ <element name="intent" type="sca:Intent"/>
+ <complexType name="Intent">
+ <sequence>
+ <element name="description" type="string" minOccurs="0"
+ maxOccurs="1" />
+ <element name="qualifier" type="sca:IntentQualifier"
+ minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="name" type="NCName" use="required"/>
+ <attribute name="constrains" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="excludes" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="mutuallyExclusive" type="boolean"
+ use="optional" default="false"/>
+ <attribute name="intentType"
+ type="sca:InteractionOrImplementation"
+ use="optional" default="interaction"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <complexType name="IntentQualifier">
+ <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="externalAttachment">
+ <complexType>
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ </sequence>
+ <attribute name="intents" type="sca:listOfQNames" use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="attachTo" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+ </element>
+
+ <element name="policySet" type="sca:PolicySet"/>
+ <complexType name="PolicySet">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element name="policySetReference"
+ type="sca:PolicySetReference"/>
+ <element name="intentMap" type="sca:IntentMap"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ <attribute name="name" type="NCName" use="required"/>
+ <attribute name="provides" type="sca:listOfQNames"/>
+ <attribute name="appliesTo" type="string" use="optional"/>
+ <attribute name="attachTo" type="string" use="optional"/>
+ <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"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <complexType name="IntentMap">
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element name="qualifier" type="sca:Qualifier"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ <attribute name="provides" type="QName" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <complexType name="Qualifier">
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ </sequence>
+ <attribute name="name" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <simpleType name="listOfNCNames">
+ <list itemType="NCName"/>
+ </simpleType>
+
+ <simpleType name="InteractionOrImplementation">
+ <restriction base="string">
+ <enumeration value="interaction"/>
+ <enumeration value="implementation"/>
+ </restriction>
+ </simpleType>
+
</schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd04.xml index 58770f71a0..0d6c5ac714 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd04.xml @@ -1,242 +1,249 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright(C) OASIS(R) 2005,2009. 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:qualifier name="fineGrain" default="true"/> - </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="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> +<?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>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd index 0259a17abb..115c789225 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd @@ -23,7 +23,7 @@ <!-- <import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/> --> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05-rev1.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd06.xsd"/> <include schemaLocation="tuscany-sca-1.1-binding-atom.xsd"/> diff --git a/sca-java-2.x/trunk/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/sca-java-2.x/trunk/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java index d87f1a3ef1..80bdeb1a41 100644 --- a/sca-java-2.x/trunk/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java +++ b/sca-java-2.x/trunk/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java @@ -24,7 +24,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -366,13 +365,20 @@ public class XSDModelResolver implements ModelResolver { return new InputSource(schemaLocation); } } else { - // look to see whether Tuscany has a local version of the - // required schema. It can load the local version rather - // than going out to the network in order to improve performance - url = Constants.CACHED_XSDS.get(targetNamespace); - - if (url == null) { - url = new URL(new URL(baseUri), schemaLocation); + url = new URL(new URL(baseUri), schemaLocation); + String scheme = url.getProtocol(); + if ("file".equalsIgnoreCase(scheme) || "jar".equalsIgnoreCase(scheme) + || "zip".equalsIgnoreCase(scheme) + || "wsjar".equalsIgnoreCase(scheme)) { + // For local URLs, use as-is + } else { + // look to see whether Tuscany has a local version of the + // required schema. It can load the local version rather + // than going out to the network in order to improve performance + URL cached = Constants.CACHED_XSDS.get(targetNamespace); + if (cached != null) { + url = cached; + } } } return XMLDocumentHelper.getInputSource(url); diff --git a/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml index d607832554..38ee71d76a 100644 --- a/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml +++ b/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml @@ -51,9 +51,9 @@ attachTo="IntentRefs('sca:suspendsTransaction')"/> <policySet name="AuthorizationFineGrainPolicy" - provides="sca:authorization.fineGrain" + provides="sca:authorization" appliesTo="//binding.sca | //implementation.java" - attachTo="IntentRefs('sca:authorization') | IntentRefs('sca:authorization.fineGrain')"/> + attachTo="IntentRefs('sca:authorization')"/> <policySet name="ConfidentialityTransportPolicy" provides="sca:confidentiality.transport" |