Author: slaws
Date: Thu Jun 23 13:06:49 2011
New Revision: 1138865
URL: http://svn.apache.org/viewvc?rev=1138865&view=rev
Log:
TUSCANY-3877 - fix up test policies to match the corrected appliesTo
processing.
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml
tuscany/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
tuscany/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml?rev=1138865&r1=1138864&r2=1138865&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/policies/src/main/resources/META-INF/definitions.xml
Thu Jun 23 13:06:49 2011
@@ -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
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml?rev=1138865&r1=1138864&r2=1138865&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
Thu Jun 23 13:06:49 2011
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml?rev=1138865&r1=1138864&r2=1138865&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
Thu Jun 23 13:06:49 2011
@@ -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>
