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

8 files changed, 197 insertions, 343 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/host-jms-asf/pom.xml b/branches/sca-java-1.x/modules/host-jms-asf/pom.xml
index 179d98459e..0a62322a51 100644
--- a/branches/sca-java-1.x/modules/host-jms-asf/pom.xml
+++ b/branches/sca-java-1.x/modules/host-jms-asf/pom.xml
@@ -46,6 +46,11 @@
             <artifactId>tuscany-binding-jms</artifactId>

             <version>1.5-SNAPSHOT</version>

         </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-jms-runtime</artifactId>

+            <version>1.5-SNAPSHOT</version>

+        </dependency>

 

         <dependency>

            <groupId>org.apache.geronimo.specs</groupId>

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 28cb93afc2..f1e7637f6b 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
@@ -35,6 +35,8 @@ import javax.naming.NamingException;
 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.provider.JMSResourceFactory;

+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;

 import org.apache.tuscany.sca.host.jms.JMSServiceListener;

 import org.apache.tuscany.sca.work.WorkScheduler;

 

@@ -52,7 +54,7 @@ public class ASFListener implements JMSServiceListener {
     private JMSBinding jmsBinding;

     private WorkScheduler workScheduler;

 

-    private JMSResourceFactoryImpl jmsResourceFactory;

+    private JMSResourceFactory jmsResourceFactory;

     private MessageConsumer consumer;

     private boolean running;

 

@@ -64,7 +66,7 @@ public class ASFListener implements JMSServiceListener {
         this.isCallbackService = isCallbackService;

         this.jmsBinding = jmsBinding;

         this.workScheduler = workScheduler;

-        this.jmsResourceFactory = new JMSResourceFactoryImpl(jmsBinding.getConnectionFactoryName(), jmsBinding.getInitialContextFactoryName(), jmsBinding.getJndiURL());

+        this.jmsResourceFactory = new JMSResourceFactoryImpl(jmsBinding.getConnectionFactoryName(), jmsBinding.getResponseConnectionFactoryName(), jmsBinding.getInitialContextFactoryName(), jmsBinding.getJndiURL());

     }

     

     public void start() {

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
deleted file mode 100644
index 1b50525069..0000000000
--- a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
+++ /dev/null
@@ -1,223 +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.host.jms.asf;

-

-import java.util.Properties;

-

-import javax.jms.Connection;

-import javax.jms.ConnectionFactory;

-import javax.jms.Destination;

-import javax.jms.JMSException;

-import javax.jms.Session;

-import javax.naming.Context;

-import javax.naming.InitialContext;

-import javax.naming.NamingException;

-

-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;

-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;

-

-/**

- * Abstracts away any JMS provide specific feature from the JMS binding

- * 

- * @version $Rev: 705229 $ $Date: 2008-10-16 13:43:47 +0100 (Thu, 16 Oct 2008) $

- */

-public class JMSResourceFactoryImpl {

-

-    protected String initialContextFactoryName;

-    protected String connectionFactoryName = "ConnectionFactory";

-    protected String jndiURL;

-

-    protected Connection connection;

-    protected Context context;

-    protected boolean isConnectionStarted;

-

-    public JMSResourceFactoryImpl(String connectionFactoryName, String initialContextFactoryName, String jndiURL) {

-        if (connectionFactoryName != null && connectionFactoryName.trim().length() > 0) {

-            this.connectionFactoryName = connectionFactoryName.trim();

-        }

-        if (initialContextFactoryName != null && initialContextFactoryName.trim().length() > 0) {

-            this.initialContextFactoryName = initialContextFactoryName.trim();

-        }

-        if (jndiURL != null) {

-            this.jndiURL = jndiURL.trim();

-        }

-    }

-

-    /*

-     * This is a simple implementation where a connection is created per binding Ideally the resource factory should be

-     * able to leverage the host environment to provide connection pooling if it can. E.g. if Tuscany is running inside 

-     * an AppServer Then we could leverage the JMS resources it provides

-     * 

-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#getConnection()

-     */

-    public Connection getConnection() throws NamingException, JMSException {

-        if (connection == null) {

-            createConnection();

-        }

-        return connection;

-    }

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#createSession()

-     */

-    public Session createSession() throws JMSException, NamingException {

-        return getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);

-    }

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#startConnection()

-     */

-    public void startConnection() throws JMSException, NamingException {

-        if (!isConnectionStarted) {

-            getConnection().start();

-            isConnectionStarted = true;

-        }

-    }

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#closeConnection()

-     */

-    public void closeConnection() throws JMSException {

-        if (connection != null) {

-            try {

-                connection.close();

-            } catch (JMSException e) {

-                // if using an embedded broker then when shutting down Tuscany the broker may get closed

-                // before this stop method is called. I can't see how to detect that so for now just

-                // ignore the exception if the message is that the transport is already disposed

-                if (!e.getMessage().contains("disposed")) {

-                    throw e;

-                }

-            }

-        }

-    }

-

-    protected void createConnection() throws NamingException, JMSException {

-        ConnectionFactory connectionFactory = (ConnectionFactory)jndiLookUp(connectionFactoryName);

-        if (connectionFactory == null) {

-            throw new JMSBindingException("connection factory not found: " + connectionFactoryName);

-        }

-        connection = connectionFactory.createConnection();

-    }

-

-    protected synchronized Context getInitialContext() throws NamingException {

-        if (context == null) {

-            Properties props = new Properties();

-

-            if (initialContextFactoryName != null) {

-                props.setProperty(Context.INITIAL_CONTEXT_FACTORY, initialContextFactoryName);

-            }

-            if (jndiURL != null) {

-                props.setProperty(Context.PROVIDER_URL, jndiURL);

-            }

-

-            initJREEnvironment(props);

-

-            context = new InitialContext(props);

-        }

-        return context;

-    }

-

-    /**

-     * If using the WAS JMS Client with a non-IBM JRE then an additional

-     * environment property needs to be set to initialize the ORB correctly. 

-     * See: http://www-1.ibm.com/support/docview.wss?uid=swg24012804

-     */

-    protected void initJREEnvironment(Properties props) {

-        if ("com.ibm.websphere.naming.WsnInitialContextFactory".equals(props.get(Context.INITIAL_CONTEXT_FACTORY))) {

-            String vendor = System.getProperty("java.vendor");

-            if (vendor == null || !vendor.contains("IBM")) {

-                props.setProperty("com.ibm.CORBA.ORBInit", "com.ibm.ws.sib.client.ORB");

-            }

-        }

-    }

-

-    /* (non-Javadoc)

-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#lookupDestination(java.lang.String)

-     */

-    public Destination lookupDestination(String destName) throws NamingException {

-        if (destName == null) {

-            return null;

-        }

-        

-        Destination dest = (Destination)jndiLookUp(destName);

-        if (dest == null) {

-            dest = lookupPhysical(destName);

-        }

-        return dest;

-    }

-

-    protected Destination lookupPhysical(String jndiName) {

-

-        // TODO: the SCA JMS spec says a destination name may be a non-jndi plain destination name 

-        

-//        Session session = null;

-//        try {

-//

-//            Destination dest;

-//            session = createSession();

-//            dest = session.createQueue(jndiName);

-//            return dest;

-//

-//        } catch (JMSException e) {

-//            throw new JMSBindingException(e);

-//        } catch (NamingException e) {

-//            throw new JMSBindingException(e);

-//        } finally {

-//            if (session != null) {

-//                try {

-//                    session.close();

-//                } catch (JMSException e) {

-//                    throw new JMSBindingException(e);

-//                }

-//            }

-//        }

-        return null;

-    }

-

-    /* (non-Javadoc)

-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#createDestination(java.lang.String)

-     */

-    public Destination createDestination(String jndiName) throws NamingException {

-        return lookupDestination("dynamicQueues/" + jndiName);

-    }

-

-    protected Object jndiLookUp(String name) {

-        Object o = null;

-        try {

-            o = getInitialContext().lookup("java:comp/env/" + name);

-        } catch (Exception ex) {

-            // ignore

-        }

-        if (o == null) {

-            try {

-                o = getInitialContext().lookup(name);

-            } catch (NamingException ex) {

-                // ignore

-            }

-        }

-        return o;

-    }

-}

diff --git a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
index 0729ea4659..495f046eca 100644
--- a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
@@ -20,10 +20,14 @@
 package org.apache.tuscany.sca.host.jms.asf;

 

 import javax.jms.MessageListener;

+import javax.naming.NamingException;

 

 import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;

+import org.apache.tuscany.sca.host.jms.JMSServiceListenerDetails;

 import org.apache.tuscany.sca.host.jms.JMSServiceListener;

 import org.apache.tuscany.sca.host.jms.JMSServiceListenerFactory;

+import org.apache.tuscany.sca.runtime.RuntimeComponentService;

 import org.apache.tuscany.sca.work.WorkScheduler;

 

 public class JMSServiceListenerFactoryImpl implements JMSServiceListenerFactory {

@@ -38,4 +42,15 @@ public class JMSServiceListenerFactoryImpl implements JMSServiceListenerFactory
         return new ASFListener(listener, serviceName, isCallbackService, jmsBinding, workScheduler);

     }

 

+    public JMSServiceListener createJMSServiceListener(JMSServiceListenerDetails jmsSLD) {

+        try {

+

+            MessageListener listener = new ServiceInvoker(jmsSLD.getJmsBinding(), jmsSLD.getService(), jmsSLD.getTargetBinding(), jmsSLD.getMessageFactory());

+            RuntimeComponentService service = jmsSLD.getService();

+            return new ASFListener(listener, service.getName(), service.isCallback(), jmsSLD.getJmsBinding(), workScheduler);

+

+        } catch (NamingException e) {

+            throw new JMSBindingException(e);

+        }

+    }

 }

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/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java
index 4821943bd3..1c4efd03aa 100644
--- 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/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java
@@ -1,104 +1,108 @@
-/*
- * 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);
-            
-    }   
-
-}
+/*

+ * 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.host.jms.asf;

+

+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.binding.jms.provider.JMSMessageProcessor;

+import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;

+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;

+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;

+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: 721811 $ $Date: 2008-11-30 13:46:51 +0000 (Sun, 30 Nov 2008) $

+ */

+public class ServiceInvoker implements MessageListener {

+

+    private static final Logger logger = Logger.getLogger(ServiceInvoker.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 ServiceInvoker(JMSBinding jmsBinding, RuntimeComponentService service, Binding targetBinding, MessageFactory messageFactory) throws NamingException {

+        this.jmsBinding = jmsBinding;

+        this.jmsResourceFactory = new JMSResourceFactoryImpl(jmsBinding.getConnectionFactoryName(), jmsBinding.getResponseConnectionFactoryName(), jmsBinding.getInitialContextFactoryName(), jmsBinding.getJndiURL());

+        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);

+            

+    }   

+

+}

diff --git a/branches/sca-java-1.x/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java b/branches/sca-java-1.x/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java
new file mode 100644
index 0000000000..4dc5214525
--- /dev/null
+++ b/branches/sca-java-1.x/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java
@@ -0,0 +1,40 @@
+/*

+ * 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.host.jms;

+

+import org.apache.tuscany.sca.assembly.Binding;

+import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

+import org.apache.tuscany.sca.invocation.MessageFactory;

+import org.apache.tuscany.sca.runtime.RuntimeComponent;

+import org.apache.tuscany.sca.runtime.RuntimeComponentService;

+

+public interface JMSServiceListenerDetails {

+

+    JMSBinding getJmsBinding();

+

+    Binding getTargetBinding();

+

+    RuntimeComponentService getService();

+

+    RuntimeComponent getComponent();

+

+    MessageFactory getMessageFactory();

+

+}

diff --git a/branches/sca-java-1.x/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java b/branches/sca-java-1.x/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java
index 94d4418d8f..a71df420b5 100644
--- a/branches/sca-java-1.x/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java
+++ b/branches/sca-java-1.x/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java
@@ -19,12 +19,9 @@
 

 package org.apache.tuscany.sca.host.jms;

 

-import javax.jms.MessageListener;

-

-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

 

 public interface JMSServiceListenerFactory {

     

-    JMSServiceListener createJMSServiceListener(String serviceName, boolean isCallbackService, JMSBinding jmsBinding, MessageListener listener);

+    JMSServiceListener createJMSServiceListener(JMSServiceListenerDetails jmsServiceBindingProvider);

 

 }