diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-12 22:56:42 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-12 22:56:42 +0000 |
commit | b6715ee3e9048154c28e62dda28df390afaea724 (patch) | |
tree | 9be82c8d7ed0ae3c915d33b0b2b9c13c1931ab89 /branches/sca-java-1.x/modules | |
parent | 160dae5a8478a346b453631fcee85a4d57bbb9d0 (diff) |
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
Diffstat (limited to 'branches/sca-java-1.x/modules')
10 files changed, 13 insertions, 15 deletions
diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java index 46d71897ad..07e1380bba 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java @@ -163,7 +163,7 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics { queueName = jmsBinding.getResponseDestinationName(); queueType = "JMS Response Destination "; qCreateMode = jmsBinding.getResponseDestinationCreate(); - if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) { + if (queueName == null) { return null; } } else { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java index e7562000e9..f39f070321 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java @@ -92,7 +92,7 @@ public class JMSBindingReferenceBindingProvider implements ReferenceBindingProvi public Invoker createInvoker(Operation operation) { - if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) { + if (jmsBinding.getDestinationName() == null) { if (!reference.isCallback()) { throw new JMSBindingException("No destination specified for reference " + reference.getName()); } diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java index dd0a2c0b3e..93bf0cb03e 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java @@ -94,7 +94,7 @@ public class JMSBindingServiceBindingProvider implements ServiceBindingProviderR this.extensionPoints = extensionPoints; this.jmsResourceFactory = jmsResourceFactory; - if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) { + if (jmsBinding.getDestinationName() == null) { if (!service.isCallback()) { // use the SCA service name as the default destination name jmsBinding.setDestinationName(service.getName()); diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java index 8136c524c6..d3197c1f43 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java @@ -163,7 +163,7 @@ public class JMSResourceFactoryImpl implements JMSResourceFactory { * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#lookupDestination(java.lang.String) */ public Destination lookupDestination(String destName) throws NamingException { - if (JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(destName)) { + if (destName == null) { return null; } diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java index c5cc5998ce..08849e6245 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java @@ -129,7 +129,7 @@ public class RRBJMSBindingInvoker implements Invoker, DataExchangeSemantics { queueName = jmsBinding.getResponseDestinationName(); queueType = "JMS Response Destination "; qCreateMode = jmsBinding.getResponseDestinationCreate(); - if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) { + if (queueName == null) { return null; } } else { 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<String, BindingProperty> destinationProperties = new HashMap<String, BindingProperty>(); @@ -87,7 +87,7 @@ public class JMSBinding implements BindingRRB, PolicySetAttachPoint { private String responseActivationSpecCreate = null; private Map<String, BindingProperty> responseActivationSpecProperties = new HashMap<String, BindingProperty>(); - 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<String, BindingProperty> responseDestinationProperties = 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 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<JMSBinding> { 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<JMSBinding> { 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<JMSBinding> { 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<JMSBinding> { if (destinationName == null || (destinationName.length() < 1)) { return; } - if (destinationName.equals(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME)) { + if (destinationName == null) { return; } diff --git a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java index 078a7f36ac..28cb93afc2 100644 --- a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java +++ b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java @@ -163,7 +163,7 @@ public class ASFListener implements JMSServiceListener { */
private Destination lookupDestinationQueue() throws NamingException, JMSBindingException {
- if (isCallbackService && JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(jmsBinding.getDestinationName())) {
+ if (isCallbackService && (jmsBinding.getDestinationName() == null)) {
// if its a callback service returning null indicates to use a temporary queue
return null;
}
diff --git a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java index fc327d593d..1b50525069 100644 --- a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java +++ b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java @@ -158,7 +158,7 @@ public class JMSResourceFactoryImpl { * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#lookupDestination(java.lang.String)
*/
public Destination lookupDestination(String destName) throws NamingException {
- if (JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(destName)) {
+ if (destName == null) {
return null;
}
|