svn commit: r1235180 - in /tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms: JMSBinding.java JMSBindingProcessor.java

[antelder]

Author: antelder
Date: Tue Jan 24 09:24:13 2012
New Revision: 1235180

URL: http://svn.apache.org/viewvc?rev=1235180&view=rev
Log:
TUSCANY-4008: Apply patch from Jennifer A Thompson to fix JMS binding 
operationProperties 'selectedOperation' element not selecting the correct 
operation

Modified:
    
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
    
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java?rev=1235180&r1=1235179&r2=1235180&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
 Tue Jan 24 09:24:13 2012
@@ -131,6 +131,7 @@ public class JMSBinding implements Bindi
     private Map<String, Object> properties = new HashMap<String, Object>();
     private Map<String, Map<String, Object>> operationProperties = new 
HashMap<String, Map<String,Object>>();
     private Map<String, String> nativeOperationNames = new HashMap<String, 
String>();
+    private Map<String, String> nativeOperationNamesToOpName = new 
HashMap<String, String>();
     private Map<String, String> operationJMSTypes = new HashMap<String, 
String>();
     private Map<String, String> operationJMSCorrelationIds = new 
HashMap<String, String>();
     private Map<String, Boolean> operationJMSDeliveryModes = new 
HashMap<String, Boolean>();
@@ -667,6 +668,14 @@ public class JMSBinding implements Bindi
     public Map<String, String> getNativeOperationNames() {
         return nativeOperationNames;
     }
+    
+    public void setNativeOperationNameToOpName(String nativeOpName, String 
opName) {
+        this.nativeOperationNamesToOpName.put(nativeOpName, opName);
+    }
+    
+    public String getOpNameFromNativeOperationName(String nativeOpName) {
+            return nativeOperationNamesToOpName.get(nativeOpName);
+    }
 
     public String getOperationJMSType(String opName) {
         if (operationPropertiesBinding != null && 
operationPropertiesBinding.getOperationJMSType(opName) != null) {

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?rev=1235180&r1=1235179&r2=1235180&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
 Tue Jan 24 09:24:13 2012
@@ -846,6 +846,7 @@ public class JMSBindingProcessor extends
         String nativeOpName = reader.getAttributeValue(null, 
"selectedOperation"); // optional
         if (nativeOpName != null && nativeOpName.length() > 0) {
             jmsBinding.setNativeOperationName(opName, nativeOpName);
+            jmsBinding.setNativeOperationNameToOpName(nativeOpName, opName);
         }
 
         Map<String, BindingProperty> props = new HashMap<String, 
BindingProperty>();