Author: antelder
Date: Fri Jan 14 13:49:42 2011
New Revision: 1059008
URL: http://svn.apache.org/viewvc?rev=1059008&view=rev
Log:
Remove actspec == destname check as thats not strictly correct and the test
requirement isn't in the compliance tests anymore
Modified:
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/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=1059008&r1=1059007&r2=1059008&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
Fri Jan 14 13:49:42 2011
@@ -1005,20 +1005,6 @@ public class JMSBindingProcessor extends
error(monitor, "DestinationURIContradiction", jmsBinding,
jmsBinding.getJMSURI(), jmsBinding.getDestinationName());
}
- // If activation spec and destination are both specified, they have to
match
- if ( ( jmsBinding.getActivationSpecName() != null ) &&
(jmsBinding.getActivationSpecName().length() > 0 ) &&
- (jmsBinding.getDestinationName() != null) &&
(jmsBinding.getDestinationName().length() > 0 ) ) {
- if (
!jmsBinding.getActivationSpecName().equals(jmsBinding.getDestinationName())) {
- error(monitor, "ActivationSpecAndDestinationMismatch",
jmsBinding, jmsBinding.getActivationSpecName(),
jmsBinding.getDestinationName());
- }
- }
-
- if ( ( jmsBinding.getResponseActivationSpecName() != null ) &&
(jmsBinding.getResponseActivationSpecName().length() > 0 ) &&
- (jmsBinding.getResponseDestinationName() != null ) &&
(jmsBinding.getResponseDestinationName().length() > 0 ) ) {
- if (
!jmsBinding.getResponseActivationSpecName().equals(jmsBinding.getResponseDestinationName()))
{
- error(monitor, "ActivationSpecAndDestinationMismatch",
jmsBinding, jmsBinding.getResponseActivationSpecName(),
jmsBinding.getResponseDestinationName());
- }
- }
// If activation spec exists with create=always, a jndiName must be
specified
if
(JMSBindingConstants.CREATE_ALWAYS.equals(jmsBinding.getActivationSpecCreate())
&&
(jmsBinding.getActivationSpecName() == null)) {
