diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-19 05:27:58 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-19 05:27:58 +0000 |
| commit | 5f3869c451e46aadc943d00087d6847877dd1c50 (patch) | |
| tree | e22baaff1fb9ea42606b7d04af52e032e3bc03bc /java/sca/modules/policy-security/src/main/resources/org/apache | |
| parent | 60744a36aae604ac3c4499ed54f1082ab8f5947d (diff) | |
Merging the 1.x delta on top of the equinox based modules
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718858 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/policy-security/src/main/resources/org/apache')
2 files changed, 11 insertions, 5 deletions
diff --git a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml index e1be4ab03c..f8f0634a9a 100644 --- a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml +++ b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml @@ -31,7 +31,7 @@ <!-- Policy Intents Defined by the SCA Runtime --> <intent name="authentication" - constrains="sca:binding"> + constrains="sca:binding tuscany:binding"> <description> Specifying this intent on references requires necessary authentication information to be sent along with outgoing messages. Specifying this intent on service requires @@ -40,16 +40,16 @@ </intent> <intent name="confidentiality" - constrains="sca:binding"> + constrains="sca:binding tuscany:binding"> <description> Specifying this intent requires message exchanged to be encrypted </description> </intent> <intent name="integrity" - constrains="sca:binding"> + constrains="sca:binding tuscany:binding"> <description> Specifying this intent requires message exchanged to be signed </description> </intent> -</definitions>
\ No newline at end of file +</definitions> diff --git a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml index f5b79af7ee..91383eaf6a 100644 --- a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml +++ b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml @@ -20,7 +20,13 @@ <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"> - <intent name="jaasAuthentication" constrains="sca:implementation.java"> + <intent name="identity" constrains="sca:implementation.java + sca:implementation.spring"> + <description>All invocations are must have an identity set</description> + </intent> + + <intent name="jaasAuthentication" constrains="sca:implementation.java + sca:implementation.spring"> <description>All invocations to be authenticated</description> </intent> </definitions>
\ No newline at end of file |