Update the old jms binding policy and intent definitions to work in 2.x

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

2 files changed, 8 insertions, 70 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index f30da64ca4..01b45bf203 100644
--- a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
@@ -14,6 +14,4 @@
 # KIND, either express or implied.  See the License for the

 # specific language governing permissions and limitations

 # under the License. 

-

-# Implementation class for SCA Definitions Providers

-org.apache.tuscany.sca.binding.jms.policy.JMSBindingDefinitionsProvider

+org/apache/tuscany/sca/binding/jms/policy/definitions.xml

diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
index 1b94f139dd..343b4fc295 100644
--- a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
@@ -17,73 +17,13 @@
  * 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:sca="http://www.osoa.org/xmlns/sca/1.0">
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
-    <!-- intents not yet enabled -->
-    <!--sca:bindingType type="sca:binding.jms"  
-                     alwaysProvides="JMS"
-                     mayProvide="atLeastOnce atMostOnce ordered conversation" /-->
-                     
-    <!-- MJE 22/06/2010 - add asyncInvocation to the @mayProvide list, for async services support -->
     <sca:bindingType type="sca:binding.jms"  
-                     alwaysProvides=""
-                     mayProvide="sca:asyncInvocation" />
+                     alwaysProvides="sca:JMS"
+                     mayProvide="sca:atLeastOnce sca:atMostOnce sca:ordered sca:asyncInvocation" />
 
-    <!-- PolicyIntents defined by the SCA Runtime Extension for JMS Binding -->
-    
-    <sca:intent name="JMS" constrains="sca:binding.jms">
-        <sca:description>
-            Communication through this binding requires JMS
-        </sca:description>
-    </sca:intent>
-    
-    <!-- delivery mode -->
-    <intent name="deliveryMode" 
-            constrains="sca:binding.jms">
-        <description>
-            This intent is used to indicate the deliver mode
-            of the sent message
-        </description>
-    </intent>
-    
-    <intent name="deliveryMode.persistent">
-        <description>
-            Message are sent persistently
-        </description>
-    </intent>
-    
-    <intent name="deliveryMode.nonPersistent">
-        <description>
-            Message are sent non-persistently
-        </description>
-    </intent>
-        
-    <!-- priority -->
-	<intent name="priority" 
-	 		constrains="sca:binding.jms">
-		<description>
-            This intent is used to indicate the priority of the 
-            sent message
-		</description>
-	</intent>
-    
-    <intent name="priority.high">
-        <description>
-            Messages are high priority
-        </description>
-    </intent>   
-    
-    <intent name="priority.medium">
-        <description>
-            Messages are medium priority
-        </description>
-    </intent>
-	  
-    <intent name="priority.low">
-        <description>
-            Messages are low priority
-        </description>
-    </intent>      
-</definitions>
\ No newline at end of file
+</sca:definitions>
\ No newline at end of file