diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-23 13:06:49 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-23 13:06:49 +0000 |
| commit | 7553afa5b55dbec08082299f199600c786eba60b (patch) | |
| tree | 0e17fc9939ffca5d669c1a384b0056037b754ae3 /sca-java-2.x | |
| parent | e9fc3c9cf81db2869a9d2e5a0b3f08a89829508a (diff) | |
TUSCANY-3877 - fix up test policies to match the corrected appliesTo processing.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1138865 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
3 files changed, 14 insertions, 13 deletions
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 38ee71d76a..ffcae358b1 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 @@ -24,7 +24,8 @@ <policySet name="JDKLoggingPolicy" provides="tuscany:logging" - appliesTo="//binding | //implementation"> + appliesTo="//sca:binding.sca" + attachTo="//sca:component[@name='CreditCardPayment']"> <tuscany:jdkLogger name="test.logger"> <tuscany:logLevel>FINE</tuscany:logLevel> <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle> @@ -34,7 +35,7 @@ <policySet name="JDKLoggingImplPolicy" provides="tuscany:logging" - appliesTo="//implementation.java" + appliesTo="//sca:implementation.java" attachTo="//sca:component[@name='CreditCardPayment']"> <tuscany:jdkLogger name="test.logger"> <tuscany:logLevel>INFO</tuscany:logLevel> @@ -47,36 +48,36 @@ <policySet name="SuspendsTransactionPolicy" provides="sca:suspendsTransaction" - appliesTo="//binding.sca | //implementation.java" + appliesTo="//sca:binding.sca | //sca:implementation.java" attachTo="IntentRefs('sca:suspendsTransaction')"/> <policySet name="AuthorizationFineGrainPolicy" provides="sca:authorization" - appliesTo="//binding.sca | //implementation.java" + appliesTo="//sca:binding.sca | //sca:implementation.java" attachTo="IntentRefs('sca:authorization')"/> <policySet name="ConfidentialityTransportPolicy" provides="sca:confidentiality.transport" - appliesTo="//binding.sca | //implementation.java" + appliesTo="//sca:binding.sca | //sca:implementation.java" attachTo="IntentRefs('sca:confidentiality.transport')"/> <policySet name="ConfidentialityMessagePolicy" provides="sca:confidentiality.message" - appliesTo="//binding.sca | //implementation.java" + appliesTo="//sca:binding.sca | //sca:implementation.java" attachTo="IntentRefs('sca:confidentiality.message')"/> <policySet name="ClientAuthenticationTransportPolicy" provides="sca:clientAuthentication.transport" - appliesTo="//binding.sca | //implementation.java" + appliesTo="//sca:binding.sca | //sca:implementation.java" attachTo="IntentRefs('sca:clientAuthentication.transport') | //sca:service[@name='CreditCardPayment']"/> <policySet name="IntegrityTransportPolicy" provides="sca:integrity.transport" - appliesTo="//binding.sca | //implementation.java" + appliesTo="//sca:binding.sca | //sca:implementation.java" attachTo="IntentRefs('sca:integrity.transport')"/> <policySet name="ManagedTransactionGlobalPolicy" provides="sca:managedTransaction.global" - appliesTo="//implementation.composite | //implementation.java" + appliesTo="//sca:implementation.composite | //sca:implementation.java" attachTo="IntentRefs('sca:managedTransaction.global')"/> </definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml b/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml index f37b1ee739..c70aae996b 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml +++ b/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml @@ -37,12 +37,12 @@ <policySet name="testPolicy1" provides="tuscany:testIntent1" - appliesTo="//binding | //implementation"> + appliesTo="//sca:binding.sca | //sca:implementation.java"> </policySet> <policySet name="testPolicy2" provides="tuscany:testIntent4 tuscany:testIntent5" - appliesTo="//binding | //implementation"> + appliesTo="//sca:binding.sca | //sca:implementation.java"> <tuscany:jdkLogger name="test.logger"> <tuscany:logLevel>FINE</tuscany:logLevel> <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle> @@ -51,7 +51,7 @@ <policySet name="testPolicy3" provides="tuscany:testIntent6" - appliesTo="//binding | //implementation"> + appliesTo="//sca:binding.sca | //sca:implementation.java"> <wsp:Policy> <wsp:ExactlyOne> <wsp:All> diff --git a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml index 425f511273..535c31d414 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml +++ b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml @@ -25,7 +25,7 @@ <policySet name="JDKLoggingPolicy" provides="tuscany:logging" - appliesTo="//binding | //implementation" + appliesTo="//sca:binding.ws" attachTo="//sca:service | //sca:reference"> <wsp:Policy> <wsp:ExactlyOne> |