TUSCANY-3418 add missing equals operator to JMS wire formats so that interceptors are not injected twice.

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

5 files changed, 28 insertions, 2 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.5.2/itest/jms-format/src/main/resources/jmstext/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/jms-format/src/main/resources/jmstext/helloworld.composite
index 5b3e710a51..bad348e48b 100644
--- a/sca-java-1.x/branches/sca-java-1.5.2/itest/jms-format/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/jms-format/src/main/resources/jmstext/helloworld.composite
@@ -28,7 +28,10 @@
         <reference name="helloWorldService1" >
            <binding.jms>
                 <destination name="HelloWorldService1"/>
-                <tuscany:wireFormat.jmsText/>
+                <response>
+                   <tuscany:wireFormat.jmsdefault sendFormat="text"/>
+                </response>                
+                <tuscany:wireFormat.jmsdefault sendFormat="text"/>
             </binding.jms>
         </reference>  
     </component>
@@ -38,7 +41,10 @@
         <service name="HelloWorldService">
             <binding.jms>
                 <destination name="HelloWorldService1"/>
-                <tuscany:wireFormat.jmsText/>
+                <response>
+                   <tuscany:wireFormat.jmsdefault sendFormat="text"/>
+                </response>                
+                <tuscany:wireFormat.jmsdefault sendFormat="text"/>
             </binding.jms>
         </service>
     </component> 
diff --git a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
index 84d1a2740f..93e9c80cdd 100644
--- a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
@@ -42,4 +42,9 @@ public class WireFormatJMSBytes implements WireFormat {
 
     public void setUnresolved(boolean unresolved) {
     }
+    
+    @Override
+    public boolean equals(Object obj) {
+        return this.getClass() == obj.getClass();
+    }    
 }
diff --git a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
index 668171fc9f..8dcf538ffb 100644
--- a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
@@ -37,4 +37,9 @@ public class WireFormatJMSBytesXML implements WireFormat {
 
     public void setUnresolved(boolean unresolved) {
     }
+    
+    @Override
+    public boolean equals(Object obj) {
+        return this.getClass() == obj.getClass();
+    }    
 }
diff --git a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
index a485d2b5ec..385eab7117 100644
--- a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
@@ -54,4 +54,9 @@ public class WireFormatJMSObject implements WireFormat {
     public boolean isWrappedSingleInput() {
         return wrappedSingleInput;
     }
+    
+    @Override
+    public boolean equals(Object obj) {
+        return this.getClass() == obj.getClass();
+    }
 }
diff --git a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
index fff33df1f4..47b60c33e5 100644
--- a/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
@@ -42,4 +42,9 @@ public class WireFormatJMSText implements WireFormat {
 
     public void setUnresolved(boolean unresolved) {
     }
+    
+    @Override
+    public boolean equals(Object obj) {
+        return this.getClass() == obj.getClass();
+    }
 }