From b6715ee3e9048154c28e62dda28df390afaea724 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 12 Feb 2009 22:56:42 +0000 Subject: TUSCANY-2836 remove DEFAULT_DESTINATION_NAME and DEFAULT_RESPONSE_DESTINATION_NAME and use null instead as these are just strings to indicated that there is no destination rather than being a default destination git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@743917 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java | 4 ++-- .../apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java | 2 -- .../apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca') 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 296ad1aa44..d4542c6d5f 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 @@ -67,7 +67,7 @@ public class JMSBinding implements BindingRRB, PolicySetAttachPoint { private String initialContextFactoryName; private String jndiURL; - private String destinationName = JMSBindingConstants.DEFAULT_DESTINATION_NAME; + private String destinationName = null; private String destinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE; private String destinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST; private Map destinationProperties = new HashMap(); @@ -87,7 +87,7 @@ public class JMSBinding implements BindingRRB, PolicySetAttachPoint { private String responseActivationSpecCreate = null; private Map responseActivationSpecProperties = new HashMap(); - private String responseDestinationName = JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME; + private String responseDestinationName = null; private String responseDestinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE; private String responseDestinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST; private Map responseDestinationProperties = new HashMap(); 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 a3dfa8f618..c869a31cde 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,8 +48,6 @@ public interface JMSBindingConstants { String CREATE_ALWAYS = "always"; String CREATE_NEVER = "never"; String CREATE_IF_NOT_EXIST = "ifnotexist"; - String DEFAULT_DESTINATION_NAME = "NODESTINATION"; - String DEFAULT_RESPONSE_DESTINATION_NAME = "NORESPONSEDESTINATION"; String DEFAULT_CONNECTION_FACTORY_NAME = "ConnectionFactory"; String DEFAULT_CONTEXT_FACTORY_NAME = "org.apache.activemq.jndi.ActiveMQInitialContextFactory"; String DEFAULT_JNDI_URL = "tcp://localhost:61616"; 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 ef942bdab0..820d652895 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 @@ -868,7 +868,7 @@ public class JMSBindingProcessor implements StAXArtifactProcessor { String dest = jmsBinding.getDestinationName(); if (dest != null) { - if ( !dest.equals( JMSBindingConstants.DEFAULT_DESTINATION_NAME ) ) { + if ( dest != null ) { writer.writeAttribute("uri", "jms:" + jmsBinding.getDestinationName()); } } @@ -914,7 +914,7 @@ public class JMSBindingProcessor implements StAXArtifactProcessor { String responseDestName = jmsBinding.getResponseDestinationName(); String responseCFName = jmsBinding.getResponseConnectionFactoryName(); String responseASName = jmsBinding.getResponseActivationSpecName(); - if (( responseDestName != null && !responseDestName.equals(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME)) || + if (( responseDestName != null ) || (responseCFName != null && !responseCFName.equals(JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME)) || responseASName != null ) { @@ -1193,7 +1193,7 @@ public class JMSBindingProcessor implements StAXArtifactProcessor { if (destinationName == null || (destinationName.length() < 1)) { return; } - if (destinationName.equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) { + if (destinationName == null) { return; } @@ -1302,7 +1302,7 @@ public class JMSBindingProcessor implements StAXArtifactProcessor { if (destinationName == null || (destinationName.length() < 1)) { return; } - if (destinationName.equals(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME)) { + if (destinationName == null) { return; } -- cgit v1.2.3