diff options
Diffstat (limited to 'java')
5 files changed, 20 insertions, 24 deletions
diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java index c674ea776a..69d00f4f85 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java @@ -99,9 +99,9 @@ public class JMSBindingReferenceBindingProvider implements ReferenceBindingProvi public Invoker createInvoker(Operation operation) { if (jmsBinding.getDestinationName() == null) { - if (!reference.isCallback()) { +// if (!reference.isCallback()) { // TODO: 2.x migration, is this check needed? throw new JMSBindingException("No destination specified for reference " + reference.getName()); - } +// } } Invoker invoker = null; diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java index 3bf18c763e..59392b35d6 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java @@ -91,10 +91,10 @@ public class JMSBindingServiceBindingProvider implements ServiceBindingProviderR // because the activation spec provides the destination. if (jmsBinding.getDestinationName() == null && (jmsBinding.getActivationSpecName() == null || jmsBinding.getActivationSpecName().equals(""))) { - if (!service.isCallback()) { +// if (!service.isCallback()) { // TODO: 2.x migration, is this check needed? // use the SCA service name as the default destination name jmsBinding.setDestinationName(service.getName()); - } +// } } // Get Message factory diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java index 7a621c930e..84938558bf 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java @@ -69,9 +69,9 @@ public class RRBJMSBindingInvoker implements Invoker, DataExchangeSemantics { // properties of the inbound service request. We should not look for or require a // statically-configured destination unless a message is received that does not have // the necessary properties. - if (!reference.isCallback()) { +// if (!reference.isCallback()) { // TODO: 2.x migration, is this check needed? bindingRequestDest = lookupDestination(); - } +// } bindingReplyDest = lookupResponseDestination(); } catch (NamingException e) { throw new JMSBindingException(e); @@ -232,18 +232,18 @@ public class RRBJMSBindingInvoker implements Invoker, DataExchangeSemantics { protected Destination getRequestDestination(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Session session) throws JMSBindingException, NamingException, JMSException { Destination requestDestination; - if (reference.isCallback()) { - String toURI = tuscanyMsg.getTo().getURI(); - if (toURI != null && toURI.startsWith("jms:")) { - // the msg to uri contains the callback destination name - // this is an jms physical name not a jndi name so need to use session.createQueue - requestDestination = session.createQueue(toURI.substring(4)); - } else { - requestDestination = lookupDestination(); - } - } else { +// if (!reference.isCallback()) { // TODO: 2.x migration, is this check needed? +// String toURI = tuscanyMsg.getTo().getURI(); +// if (toURI != null && toURI.startsWith("jms:")) { +// // the msg to uri contains the callback destination name +// // this is an jms physical name not a jndi name so need to use session.createQueue +// requestDestination = session.createQueue(toURI.substring(4)); +// } else { +// requestDestination = lookupDestination(); +// } +// } else { requestDestination = bindingRequestDest; - } +// } return requestDestination; } diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java index f67d5404c3..c0258cd672 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java @@ -27,7 +27,6 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.naming.NamingException; -import org.apache.tuscany.sca.assembly.impl.EndpointReferenceImpl; import org.apache.tuscany.sca.binding.jms.JMSBinding; import org.apache.tuscany.sca.binding.jms.JMSBindingConstants; import org.apache.tuscany.sca.binding.jms.JMSBindingException; @@ -39,7 +38,6 @@ import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java index cd4d21bdce..d25691e55f 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java @@ -23,14 +23,12 @@ import javax.jms.JMSException; import javax.jms.Queue; import javax.jms.Topic; -import org.apache.tuscany.sca.assembly.impl.EndpointReferenceImpl; import org.apache.tuscany.sca.binding.jms.JMSBindingConstants; import org.apache.tuscany.sca.binding.jms.JMSBindingException; import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext; import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; @@ -61,7 +59,7 @@ public class CallbackDestinationInterceptor implements Interceptor { JMSBindingContext context = msg.getBindingContext(); javax.jms.Message jmsMsg = context.getJmsMsg(); - ReferenceParameters parameters = msg.getFrom().getReferenceParameters(); + //ReferenceParameters parameters = msg.getFrom().getReferenceParameters(); TODO: 2.x migration, are these needed? if (service.getInterfaceContract().getCallbackInterface() != null) { @@ -78,12 +76,12 @@ public class CallbackDestinationInterceptor implements Interceptor { if (callbackdestName != null) { // append "jms:" to make it an absolute uri so the invoker can determine it came in on the request // as otherwise the invoker should use the uri from the service callback binding - parameters.setCallbackReference(new EndpointReferenceImpl("jms:" + callbackdestName)); +// parameters.setCallbackReference(new EndpointReferenceImpl("jms:" + callbackdestName)); } String callbackID = jmsMsg.getStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY); if (callbackID != null) { - parameters.setCallbackID(callbackID); +// parameters.setCallbackID(callbackID); } } |