Fix the definitions.xml and move them into META-INF folder to be recognized

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@901065 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 26 insertions, 11 deletions

diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
index f7e26fdd7c..6b22874b39 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
@@ -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
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
index 8c608adec9..7e417723f2 100644
--- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
@@ -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