diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-04-20 13:46:25 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-04-20 13:46:25 +0000 |
commit | dec2e1819a92853eddbeb5b4bd3575c68363260c (patch) | |
tree | deb098970dda806e186ee06a49b765bf5ae6fe95 /branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java | |
parent | 9eeee2e4a9bd14662e954d088c03d5ffb80a825d (diff) |
TUSCANY-2976: Apply patch from Greg Dritschler to Remove default 'ConnectionFactory' in JMSBinding model
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@766689 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java')
-rw-r--r-- | branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java index 99a14d6cbb..4642a51d45 100644 --- a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java +++ b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java @@ -843,8 +843,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St } // Connection factory and activation Specification are mutually exclusive. - if (( connectionFactoryName != null ) && ( connectionFactoryName.length() > 0 ) - && !JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME.equals(connectionFactoryName) ) { + if (( connectionFactoryName != null ) && ( connectionFactoryName.length() > 0 )) { String activationSpecName = jmsBinding.getActivationSpecName(); if ((activationSpecName != null) && (activationSpecName.length() > 0 )) { error("ConnectionFactoryActivationSpecContradiction", jmsBinding, connectionFactoryName, activationSpecName ); @@ -939,9 +938,9 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St String responseDestName = jmsBinding.getResponseDestinationName(); String responseCFName = jmsBinding.getResponseConnectionFactoryName(); String responseASName = jmsBinding.getResponseActivationSpecName(); - if (( responseDestName != null ) || - (responseCFName != null && !responseCFName.equals(JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME)) || - responseASName != null ) { + if ( responseDestName != null || + responseCFName != null || + responseASName != null ) { writer.writeStartElement("response"); writeResponseDestinationProperties( jmsBinding, writer ); @@ -1277,9 +1276,6 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St if (cfName == null || (cfName.length() < 1)) { return; } - if ( cfName.equals(JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME) ) { - return; - } writer.writeStartElement("connectionFactory"); @@ -1387,9 +1383,6 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St if (cfName == null || (cfName.length() < 1)) { return; } - if (cfName.equals(JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME)) { - return; - } writer.writeStartElement("connectionFactory"); |