TUSCANY-2918, Update jms support so that the service listener can be pluggable via host-jms

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@758239 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 24 insertions, 114 deletions

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 bb578ef25b..106d0b37cf 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
@@ -21,20 +21,14 @@ package org.apache.tuscany.sca.binding.jms.provider;
 
 import java.util.logging.Logger;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.Topic;
-
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
 import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
 import org.apache.tuscany.sca.binding.jms.transport.TransportServiceInterceptor;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.host.jms.JMSServiceListener;
+import org.apache.tuscany.sca.host.jms.JMSServiceListenerDetails;
 import org.apache.tuscany.sca.host.jms.JMSServiceListenerFactory;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.invocation.InvocationChain;
@@ -55,7 +49,7 @@ import org.apache.tuscany.sca.runtime.RuntimeWire;
  * 
  * @version $Rev$ $Date$
  */
-public class JMSBindingServiceBindingProvider implements ServiceBindingProviderRRB {
+public class JMSBindingServiceBindingProvider implements ServiceBindingProviderRRB, JMSServiceListenerDetails {
     private static final Logger logger = Logger.getLogger(JMSBindingServiceBindingProvider.class.getName());
 
     private RuntimeComponentService service;
@@ -142,8 +136,7 @@ public class JMSBindingServiceBindingProvider implements ServiceBindingProviderR
     public void start() {
         try {
 
-            MessageListener listener = new RRBJMSBindingListener(jmsBinding, jmsResourceFactory, service, targetBinding, messageFactory);
-            this.serviceListener = serviceListenerFactory.createJMSServiceListener(service.getName(), service.isCallback(), jmsBinding, listener);
+            this.serviceListener = serviceListenerFactory.createJMSServiceListener(this);
             serviceListener.start();
             
         } catch (Exception e) {
@@ -190,4 +183,25 @@ public class JMSBindingServiceBindingProvider implements ServiceBindingProviderR
                                         responseWireFormatProvider.createInterceptor());
         }
     }
+
+    public RuntimeComponent getComponent() {
+        return component;
+    }
+
+    public RuntimeComponentService getService() {
+        return service;
+    }
+
+    public Binding getTargetBinding() {
+        return targetBinding;
+    }
+
+    public JMSBinding getJmsBinding() {
+        return jmsBinding;
+    }
+
+    public MessageFactory getMessageFactory() {
+        return messageFactory;
+    }
+
 }
diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
deleted file mode 100644
index 4821943bd3..0000000000
--- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.binding.jms.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.naming.NamingException;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * TODO RRB experiement
- * Listener for the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public class RRBJMSBindingListener implements MessageListener {
-
-    private static final Logger logger = Logger.getLogger(RRBJMSBindingListener.class.getName());
-
-    private JMSBinding jmsBinding;
-    private Binding targetBinding;
-    private JMSResourceFactory jmsResourceFactory;
-    private RuntimeComponentService service;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private String correlationScheme;
-    private List<Operation> serviceOperations;
-    private MessageFactory messageFactory;
-    
-
-    public RRBJMSBindingListener(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeComponentService service, Binding targetBinding, MessageFactory messageFactory) throws NamingException {
-        this.jmsBinding = jmsBinding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.service = service;
-        this.targetBinding = targetBinding;
-        this.messageFactory = messageFactory;
-        
-        requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        correlationScheme = jmsBinding.getCorrelationScheme();
-        serviceOperations = service.getInterfaceContract().getInterface().getOperations();
-        
-    }
-
-    public void onMessage(Message requestJMSMsg) {
-        logger.log(Level.FINE, "JMS service '" + service.getName() + "' received message " + requestJMSMsg);
-        try {
-            invokeService(requestJMSMsg);
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, "Exception send fault response '" + service.getName(), e);
-        }
-    }
-
-    protected void invokeService(Message requestJMSMsg) throws JMSException, InvocationTargetException {
-
-        // create the tuscany message
-        org.apache.tuscany.sca.invocation.Message tuscanyMsg = messageFactory.createMessage();
-        
-        // populate the message context with JMS binding information
-        JMSBindingContext context = new JMSBindingContext();
-        tuscanyMsg.setBindingContext(context);
-        
-        context.setJmsMsg(requestJMSMsg);
-        context.setJmsResourceFactory(jmsResourceFactory);
-        context.setReplyToDestination(requestJMSMsg.getJMSReplyTo());
-        
-        // set the message body
-        tuscanyMsg.setBody(requestJMSMsg);
-        
-        // call the runtime wire - the response is handled by the 
-        // transport interceptor
-        service.getRuntimeWire(targetBinding).invoke(tuscanyMsg);
-            
-    }   
-
-}