Author: slaws
Date: Thu Feb 12 22:56:42 2009
New Revision: 743917
URL: http://svn.apache.org/viewvc?rev=743917&view=rev
Log:
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
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
Thu Feb 12 22:56:42 2009
@@ -163,7 +163,7 @@
queueName = jmsBinding.getResponseDestinationName();
queueType = "JMS Response Destination ";
qCreateMode = jmsBinding.getResponseDestinationCreate();
- if
(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) {
+ if (queueName == null) {
return null;
}
} else {
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
Thu Feb 12 22:56:42 2009
@@ -92,7 +92,7 @@
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());
}
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
Thu Feb 12 22:56:42 2009
@@ -94,7 +94,7 @@
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());
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
Thu Feb 12 22:56:42 2009
@@ -163,7 +163,7 @@
* @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;
}
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
Thu Feb 12 22:56:42 2009
@@ -129,7 +129,7 @@
queueName = jmsBinding.getResponseDestinationName();
queueType = "JMS Response Destination ";
qCreateMode = jmsBinding.getResponseDestinationCreate();
- if
(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) {
+ if (queueName == null) {
return null;
}
} else {
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
Thu Feb 12 22:56:42 2009
@@ -67,7 +67,7 @@
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 @@
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>();
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
Thu Feb 12 22:56:42 2009
@@ -48,8 +48,6 @@
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";
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
Thu Feb 12 22:56:42 2009
@@ -868,7 +868,7 @@
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 @@
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 @@
if (destinationName == null || (destinationName.length() < 1)) {
return;
}
- if
(destinationName.equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) {
+ if (destinationName == null) {
return;
}
@@ -1302,7 +1302,7 @@
if (destinationName == null || (destinationName.length() < 1)) {
return;
}
- if
(destinationName.equals(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME))
{
+ if (destinationName == null) {
return;
}
Modified:
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
Thu Feb 12 22:56:42 2009
@@ -163,7 +163,7 @@
*/
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;
}
Modified:
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java?rev=743917&r1=743916&r2=743917&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
Thu Feb 12 22:56:42 2009
@@ -158,7 +158,7 @@
* @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;
}
