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

3 files changed, 5 insertions, 13 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
index b2019bfef6..03157061d9 100644
--- a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
+++ b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
@@ -82,7 +82,7 @@ public class JMSBinding implements BindingRRB, PolicySetAttachPoint, OperationsC
     private String destinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
     private Map<String, BindingProperty> destinationProperties = new HashMap<String, BindingProperty>();
 
-    private String connectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
+    private String connectionFactoryName = null;
     private String connectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
     private Map<String, BindingProperty> connectionFactoryProperties = new HashMap<String, BindingProperty>();
 
diff --git a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
index c869a31cde..db02d6b53c 100644
--- a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
+++ b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
@@ -48,7 +48,6 @@ public interface JMSBindingConstants {
     String CREATE_ALWAYS = "always";
     String CREATE_NEVER = "never";
     String CREATE_IF_NOT_EXIST = "ifnotexist";
-    String DEFAULT_CONNECTION_FACTORY_NAME = "ConnectionFactory";
     String DEFAULT_CONTEXT_FACTORY_NAME = "org.apache.activemq.jndi.ActiveMQInitialContextFactory";
     String DEFAULT_JNDI_URL = "tcp://localhost:61616";
     int DEFAULT_TIME_TO_LIVE = 20000; // in milliseconds
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");