Author: slaws
Date: Mon Jan 11 09:46:37 2010
New Revision: 897821
URL: http://svn.apache.org/viewvc?rev=897821&view=rev
Log:
TUSCANY-3418 add missing equals operator to JMS wire formats so that
interceptors are not injected twice.
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/itest/jms-format/src/main/resources/jmstext/helloworld.composite
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/itest/jms-format/src/main/resources/jmstext/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/itest/jms-format/src/main/resources/jmstext/helloworld.composite?rev=897821&r1=897820&r2=897821&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/itest/jms-format/src/main/resources/jmstext/helloworld.composite
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/itest/jms-format/src/main/resources/jmstext/helloworld.composite
Mon Jan 11 09:46:37 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java?rev=897821&r1=897820&r2=897821&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
Mon Jan 11 09:46:37 2010
@@ -42,4 +42,9 @@
public void setUnresolved(boolean unresolved) {
}
+
+ @Override
+ public boolean equals(Object obj) {
+ return this.getClass() == obj.getClass();
+ }
}
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java?rev=897821&r1=897820&r2=897821&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
Mon Jan 11 09:46:37 2010
@@ -37,4 +37,9 @@
public void setUnresolved(boolean unresolved) {
}
+
+ @Override
+ public boolean equals(Object obj) {
+ return this.getClass() == obj.getClass();
+ }
}
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java?rev=897821&r1=897820&r2=897821&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
Mon Jan 11 09:46:37 2010
@@ -54,4 +54,9 @@
public boolean isWrappedSingleInput() {
return wrappedSingleInput;
}
+
+ @Override
+ public boolean equals(Object obj) {
+ return this.getClass() == obj.getClass();
+ }
}
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java?rev=897821&r1=897820&r2=897821&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
Mon Jan 11 09:46:37 2010
@@ -42,4 +42,9 @@
public void setUnresolved(boolean unresolved) {
}
+
+ @Override
+ public boolean equals(Object obj) {
+ return this.getClass() == obj.getClass();
+ }
}
