You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/01/20 06:28:43 UTC
svn commit: r901065 - in /tuscany/sca-java-2.x/trunk/itest:
implementation-spring/src/main/resources/implementation/policies/
implementation-spring/src/main/resources/implementation/policies/META-INF/
jms/policy-headers/src/main/resources/META-INF/ jms...
Author: rfeng
Date: Wed Jan 20 05:28:35 2010
New Revision: 901065
URL: http://svn.apache.org/viewvc?rev=901065&view=rev
Log:
Fix the definitions.xml and move them into META-INF folder to be recognized
Added:
tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
- copied, changed from r900469, tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
- copied, changed from r900469, tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
Removed:
tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
Copied: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml (from r900469, tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml?p2=tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml&p1=tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml&r1=900469&r2=901065&rev=901065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml Wed Jan 20 05:28:35 2010
@@ -22,19 +22,23 @@
xmlns:calc="http://calculator">
<!-- PolicySets -->
- <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java"
- xmlns="http://www.osoa.org/xmlns/sca/1.0">
+ <!--
+ <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java">
<tuscany:jaasAuthentication>
<tuscany:configurationName>Calculator</tuscany:configurationName>
<tuscany:callbackHandler>calculator.security.CalculatorCallbackHandler</tuscany:callbackHandler>
</tuscany:jaasAuthentication>
</policySet>
+ -->
<!-- PolicySets -->
- <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.spring"
- xmlns="http://www.osoa.org/xmlns/sca/1.0">
+ <!--
+ <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.spring">
<tuscany:jdkLogger name="calculator">
<logLevel>FINER</logLevel>
</tuscany:jdkLogger>
</policySet>
+ -->
+
+ <intent name="logging" constrains="sca:implementation" intentType="interaction"/>
</definitions>
\ No newline at end of file
Copied: tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml (from r900469, tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml?p2=tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml&p1=tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml&r1=900469&r2=901065&rev=901065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml Wed Jan 20 05:28:35 2010
@@ -17,15 +17,15 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<policySet name="JMSPolicySet1"
provides="priority"
appliesTo="sca:binding.jms">
- <intentMap provides="priority" default="medium">
+ <intentMap provides="priority">
<qualifier name="high">
<tuscany:jmsHeader JMSPriority="9"/>
</qualifier>
@@ -41,7 +41,7 @@
<policySet name="JMSPolicySet2"
provides="deliveryMode"
appliesTo="sca:binding.jms">
- <intentMap provides="deliveryMode" default="nonPersistent">
+ <intentMap provides="deliveryMode">
<qualifier name="persistent">
<tuscany:jmsHeader JMSDeliveryMode="PERSISTENT"/>
</qualifier>
@@ -49,6 +49,17 @@
<tuscany:jmsHeader JMSDeliveryMode="NON_PERSISTENT"/>
</qualifier>
</intentMap>
- </policySet>
+ </policySet>
+
+ <intent name="priority" constrains="sca:binding" intentType="interaction">
+ <qualifier name="high" default="true"/>
+ <qualifier name="medium"/>
+ <qualifier name="low"/>
+ </intent>
+
+ <intent name="deliveryMode" constrains="sca:binding" intentType="interaction">
+ <qualifier name="nonPersistent" default="true"/>
+ <qualifier name="persistent"/>
+ </intent>
</definitions>
\ No newline at end of file