Setting svn:eol-style for java and xml files

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

13 files changed, 938 insertions, 938 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java
index 7de30c265a..cac346adf4 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java
@@ -1,40 +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.binding.jms.host;

-

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.core.UtilityExtensionPoint;

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

-

-public class DefaultJMSHostExtensionPoint implements JMSHostExtensionPoint {

-

-    private JMSServiceListenerFactory jmsServiceListenerFactory;

-

-    public DefaultJMSHostExtensionPoint(ExtensionPointRegistry extensionPoints) {

-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);

-        WorkScheduler workScheduler = utilities.getUtility(WorkScheduler.class);

-        this.jmsServiceListenerFactory = new DefaultJMSServiceListenerFactory(workScheduler);

-    }

-

-    public JMSServiceListenerFactory getJMSServiceListenerFactory() {

-        return jmsServiceListenerFactory;

-    }

-

-}

+/*
+ * 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.host;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.work.WorkScheduler;
+
+public class DefaultJMSHostExtensionPoint implements JMSHostExtensionPoint {
+
+    private JMSServiceListenerFactory jmsServiceListenerFactory;
+
+    public DefaultJMSHostExtensionPoint(ExtensionPointRegistry extensionPoints) {
+        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+        WorkScheduler workScheduler = utilities.getUtility(WorkScheduler.class);
+        this.jmsServiceListenerFactory = new DefaultJMSServiceListenerFactory(workScheduler);
+    }
+
+    public JMSServiceListenerFactory getJMSServiceListenerFactory() {
+        return jmsServiceListenerFactory;
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
index 9dc41eb3bc..3bd7b8c345 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
@@ -1,234 +1,234 @@
-/*

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

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-import javax.jms.Destination;

-import javax.jms.JMSException;

-import javax.jms.Message;

-import javax.jms.MessageConsumer;

-import javax.jms.MessageListener;

-import javax.jms.Queue;

-import javax.jms.Session;

-import javax.jms.Topic;

-import javax.naming.NamingException;

-

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

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

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

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

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

-

-/**

- * Implementation of the JMS service binding provider.

- * 

- * @version $Rev: 721811 $ $Date: 2008-11-30 13:46:51 +0000 (Sun, 30 Nov 2008) $

- */

-public class DefaultJMSServiceListener implements JMSServiceListener {

-    private static final Logger logger = Logger.getLogger(DefaultJMSServiceListener.class.getName());

-

-    private MessageListener listener;

-    private String serviceName;

-    private boolean isCallbackService;

-    private JMSBinding jmsBinding;

-    private WorkScheduler workScheduler;

-

-    private JMSResourceFactory jmsResourceFactory;

-    private MessageConsumer consumer;

-    private boolean running;

-

-    private Destination destination;

-

-    public DefaultJMSServiceListener(MessageListener listener, String serviceName, boolean isCallbackService, JMSBinding jmsBinding, WorkScheduler workScheduler, JMSResourceFactory rf) {

-        this.listener = listener;

-        this.serviceName = serviceName;

-        this.isCallbackService = isCallbackService;

-        this.jmsBinding = jmsBinding;

-        this.workScheduler = workScheduler;

-        this.jmsResourceFactory = rf;

-    }

-    

-    public void start() {

-        this.running = true;

-

-        try {

-            registerListerner();

-        } catch (Exception e) {

-            throw new JMSBindingException("Error starting JMSServiceBinding", e);

-        }

-    }

-

-    public void stop() {

-        this.running = false;

-        try {

-            consumer.close();

-            jmsResourceFactory.closeConnection();

-            jmsResourceFactory.closeResponseConnection();

-        } catch (Exception 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() == null) || !e.getMessage().contains("disposed")) {

-                throw new JMSBindingException("Error stopping JMSServiceBinding", e);

-            }

-        }

-    }

-

-    private void registerListerner() throws NamingException, JMSException {

-

-        Session session = jmsResourceFactory.createSession();

-        destination = lookupDestinationQueue();

-        if (destination == null) {

-            destination = session.createTemporaryQueue();

-        }

-

-        if (jmsBinding.getJMSSelector() != null) {

-            consumer = session.createConsumer(destination, jmsBinding.getJMSSelector());

-        } else {

-            consumer = session.createConsumer(destination);

-        }

-

-        try {

-

-            consumer.setMessageListener(listener);

-            jmsResourceFactory.startConnection();

-

-        } catch (javax.jms.JMSException e) {

-

-            // setMessageListener not allowed in JEE container so use Tuscany threads

-

-            jmsResourceFactory.startConnection();

-            workScheduler.scheduleWork(new Runnable() {

-                public void run() {

-                    try {

-                        while (running) {

-                            final Message msg = consumer.receive();

-                            workScheduler.scheduleWork(new Runnable() {

-                                public void run() {

-                                    try {

-                                        listener.onMessage(msg);

-                                    } catch (Exception e) {

-                                        e.printStackTrace();

-                                    }

-                                }

-                            });

-                        }

-                    } catch (Exception e) {

-                        e.printStackTrace();

-                    }

-                }

-            });

-        }

-        logger.log(Level.INFO, "JMS " + (isCallbackService ? "callback service" : "service")

-            + " '"

-            + serviceName

-            + "' listening on destination "

-            + ((destination instanceof Queue) ? ((Queue)destination).getQueueName() : ((Topic)destination).getTopicName()));

-    }

-

-    /**

-     * Looks up the Destination Queue for the JMS Binding.

-     * <p>

-     * What happens in the look up will depend on the create mode specified for the JMS Binding:

-     * <ul>

-     * <li>always - the JMS queue is always created. It is an error if the queue already exists

-     * <li>ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists

-     * <li>never - the JMS queue is never created. It is an error if the queue does not exist

-     * </ul>

-     * See the SCA JMS Binding specification for more information.

-     * <p>

-     * 

-     * @return The Destination queue.

-     * @throws NamingException Failed to lookup JMS queue

-     * @throws JMSBindingException Failed to lookup JMS Queue. Probable cause is that the JMS queue's current existence/non-existence is not

-     *                 compatible with the create mode specified on the binding

-     */

-    private Destination lookupDestinationQueue() throws NamingException, JMSBindingException {

-

-        if (isCallbackService && (jmsBinding.getDestinationName() == null)) {

-            // if its a callback service returning null indicates to use a temporary queue

-            return null;

-        }

-

-        Destination destination = jmsResourceFactory.lookupDestination(jmsBinding.getDestinationName());

-

-        String qCreateMode = jmsBinding.getDestinationCreate();

-        if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) {

-            // In this mode, the queue must not already exist as we are creating it

-            if (destination != null) {

-                throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()

-                    + " already exists but has create mode of \""

-                    + qCreateMode

-                    + "\" while registering service "

-                    + serviceName

-                    + " listener");

-            }

-

-            // Create the queue

-            destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName());

-

-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) {

-            // In this mode, the queue may nor may not exist. It will be created if it does not exist

-            if (destination == null) {

-                destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName());

-            }

-

-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) {

-            // In this mode, the queue must have already been created.

-            if (destination == null) {

-                throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()

-                    + " not found but create mode of \""

-                    + qCreateMode

-                    + "\" while registering service "

-                    + serviceName

-                    + " listener");

-            }

-        }

-

-        // Make sure we ended up with a queue

-        if (destination == null) {

-            throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()

-                + " not found with create mode of \""

-                + qCreateMode

-                + "\" while registering service "

-                + serviceName

-                + " listener");

-        }

-

-        return destination;

-    }

-

-    public String getDestinationName() {

-        try {

-            if (destination instanceof Queue) {

-                return ((Queue)destination).getQueueName();

-            } else if (destination instanceof Topic) {

-                return ((Topic)destination).getTopicName();

-            } else {

-                return null;

-            }

-        } catch (JMSException e) {

-            throw new JMSBindingException(e);

-        }

-    }

-

-}

+/*
+ * 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.host;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.naming.NamingException;
+
+import org.apache.tuscany.sca.binding.jms.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.JMSBindingConstants;
+import org.apache.tuscany.sca.binding.jms.JMSBindingException;
+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
+import org.apache.tuscany.sca.work.WorkScheduler;
+
+/**
+ * Implementation of the JMS service binding provider.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultJMSServiceListener implements JMSServiceListener {
+    private static final Logger logger = Logger.getLogger(DefaultJMSServiceListener.class.getName());
+
+    private MessageListener listener;
+    private String serviceName;
+    private boolean isCallbackService;
+    private JMSBinding jmsBinding;
+    private WorkScheduler workScheduler;
+
+    private JMSResourceFactory jmsResourceFactory;
+    private MessageConsumer consumer;
+    private boolean running;
+
+    private Destination destination;
+
+    public DefaultJMSServiceListener(MessageListener listener, String serviceName, boolean isCallbackService, JMSBinding jmsBinding, WorkScheduler workScheduler, JMSResourceFactory rf) {
+        this.listener = listener;
+        this.serviceName = serviceName;
+        this.isCallbackService = isCallbackService;
+        this.jmsBinding = jmsBinding;
+        this.workScheduler = workScheduler;
+        this.jmsResourceFactory = rf;
+    }
+    
+    public void start() {
+        this.running = true;
+
+        try {
+            registerListerner();
+        } catch (Exception e) {
+            throw new JMSBindingException("Error starting JMSServiceBinding", e);
+        }
+    }
+
+    public void stop() {
+        this.running = false;
+        try {
+            consumer.close();
+            jmsResourceFactory.closeConnection();
+            jmsResourceFactory.closeResponseConnection();
+        } catch (Exception 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() == null) || !e.getMessage().contains("disposed")) {
+                throw new JMSBindingException("Error stopping JMSServiceBinding", e);
+            }
+        }
+    }
+
+    private void registerListerner() throws NamingException, JMSException {
+
+        Session session = jmsResourceFactory.createSession();
+        destination = lookupDestinationQueue();
+        if (destination == null) {
+            destination = session.createTemporaryQueue();
+        }
+
+        if (jmsBinding.getJMSSelector() != null) {
+            consumer = session.createConsumer(destination, jmsBinding.getJMSSelector());
+        } else {
+            consumer = session.createConsumer(destination);
+        }
+
+        try {
+
+            consumer.setMessageListener(listener);
+            jmsResourceFactory.startConnection();
+
+        } catch (javax.jms.JMSException e) {
+
+            // setMessageListener not allowed in JEE container so use Tuscany threads
+
+            jmsResourceFactory.startConnection();
+            workScheduler.scheduleWork(new Runnable() {
+                public void run() {
+                    try {
+                        while (running) {
+                            final Message msg = consumer.receive();
+                            workScheduler.scheduleWork(new Runnable() {
+                                public void run() {
+                                    try {
+                                        listener.onMessage(msg);
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            });
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+        logger.log(Level.INFO, "JMS " + (isCallbackService ? "callback service" : "service")
+            + " '"
+            + serviceName
+            + "' listening on destination "
+            + ((destination instanceof Queue) ? ((Queue)destination).getQueueName() : ((Topic)destination).getTopicName()));
+    }
+
+    /**
+     * Looks up the Destination Queue for the JMS Binding.
+     * <p>
+     * What happens in the look up will depend on the create mode specified for the JMS Binding:
+     * <ul>
+     * <li>always - the JMS queue is always created. It is an error if the queue already exists
+     * <li>ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists
+     * <li>never - the JMS queue is never created. It is an error if the queue does not exist
+     * </ul>
+     * See the SCA JMS Binding specification for more information.
+     * <p>
+     * 
+     * @return The Destination queue.
+     * @throws NamingException Failed to lookup JMS queue
+     * @throws JMSBindingException Failed to lookup JMS Queue. Probable cause is that the JMS queue's current existence/non-existence is not
+     *                 compatible with the create mode specified on the binding
+     */
+    private Destination lookupDestinationQueue() throws NamingException, JMSBindingException {
+
+        if (isCallbackService && (jmsBinding.getDestinationName() == null)) {
+            // if its a callback service returning null indicates to use a temporary queue
+            return null;
+        }
+
+        Destination destination = jmsResourceFactory.lookupDestination(jmsBinding.getDestinationName());
+
+        String qCreateMode = jmsBinding.getDestinationCreate();
+        if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) {
+            // In this mode, the queue must not already exist as we are creating it
+            if (destination != null) {
+                throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()
+                    + " already exists but has create mode of \""
+                    + qCreateMode
+                    + "\" while registering service "
+                    + serviceName
+                    + " listener");
+            }
+
+            // Create the queue
+            destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName());
+
+        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) {
+            // In this mode, the queue may nor may not exist. It will be created if it does not exist
+            if (destination == null) {
+                destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName());
+            }
+
+        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) {
+            // In this mode, the queue must have already been created.
+            if (destination == null) {
+                throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()
+                    + " not found but create mode of \""
+                    + qCreateMode
+                    + "\" while registering service "
+                    + serviceName
+                    + " listener");
+            }
+        }
+
+        // Make sure we ended up with a queue
+        if (destination == null) {
+            throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()
+                + " not found with create mode of \""
+                + qCreateMode
+                + "\" while registering service "
+                + serviceName
+                + " listener");
+        }
+
+        return destination;
+    }
+
+    public String getDestinationName() {
+        try {
+            if (destination instanceof Queue) {
+                return ((Queue)destination).getQueueName();
+            } else if (destination instanceof Topic) {
+                return ((Topic)destination).getTopicName();
+            } else {
+                return null;
+            }
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
index bb4b30d190..1976d687b6 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
@@ -1,55 +1,55 @@
-/*

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

-

-import javax.jms.MessageListener;

-import javax.naming.NamingException;

-

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

-import org.apache.tuscany.sca.binding.jms.provider.JMSBindingServiceBindingProvider;

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

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

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

-

-public class DefaultJMSServiceListenerFactory implements JMSServiceListenerFactory {

-

-    private WorkScheduler workScheduler;

-

-    public DefaultJMSServiceListenerFactory(WorkScheduler workScheduler) {

-        this.workScheduler = workScheduler;

-    }

-

-    public JMSServiceListener createJMSServiceListener(JMSServiceListenerDetails jmsSLD) {

-        try {

-

-            JMSResourceFactory rf = ((JMSBindingServiceBindingProvider)jmsSLD).getResourceFactory();

-            

-            RuntimeComponentService service = (RuntimeComponentService) jmsSLD.getEndpoint().getService();

-            MessageListener listener = new DefaultServiceInvoker(jmsSLD.getEndpoint(), jmsSLD.getTargetBinding(), jmsSLD.getMessageFactory(), rf);

-

-//            return new ASFListener(listener, service.getName(), service.isCallback(), jmsSLD.getJmsBinding(), workScheduler, rf);

-// TODO: 2.x migration, service.isCallback()             

-            return new DefaultJMSServiceListener(listener, service.getName(), false, jmsSLD.getJmsBinding(), workScheduler, rf);

-

-        } catch (NamingException e) {

-            throw new JMSBindingException(e);

-        }

-    }

-}

+/*
+ * 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.host;
+
+import javax.jms.MessageListener;
+import javax.naming.NamingException;
+
+import org.apache.tuscany.sca.binding.jms.JMSBindingException;
+import org.apache.tuscany.sca.binding.jms.provider.JMSBindingServiceBindingProvider;
+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.work.WorkScheduler;
+
+public class DefaultJMSServiceListenerFactory implements JMSServiceListenerFactory {
+
+    private WorkScheduler workScheduler;
+
+    public DefaultJMSServiceListenerFactory(WorkScheduler workScheduler) {
+        this.workScheduler = workScheduler;
+    }
+
+    public JMSServiceListener createJMSServiceListener(JMSServiceListenerDetails jmsSLD) {
+        try {
+
+            JMSResourceFactory rf = ((JMSBindingServiceBindingProvider)jmsSLD).getResourceFactory();
+            
+            RuntimeComponentService service = (RuntimeComponentService) jmsSLD.getEndpoint().getService();
+            MessageListener listener = new DefaultServiceInvoker(jmsSLD.getEndpoint(), jmsSLD.getTargetBinding(), jmsSLD.getMessageFactory(), rf);
+
+//            return new ASFListener(listener, service.getName(), service.isCallback(), jmsSLD.getJmsBinding(), workScheduler, rf);
+// TODO: 2.x migration, service.isCallback()             
+            return new DefaultJMSServiceListener(listener, service.getName(), false, jmsSLD.getJmsBinding(), workScheduler, rf);
+
+        } catch (NamingException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
index 0e1ee1bfd0..9f3062f065 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
@@ -1,106 +1,106 @@
-/*

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

-

-import java.lang.reflect.InvocationTargetException;

-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.assembly.Endpoint;

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

-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;

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

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

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

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-

-/**

- * TODO RRB experiement

- * Listener for the JMSBinding.

- * 

- * @version $Rev: 721811 $ $Date: 2008-11-30 13:46:51 +0000 (Sun, 30 Nov 2008) $

- */

-public class DefaultServiceInvoker implements MessageListener {

-

-    private static final Logger logger = Logger.getLogger(DefaultServiceInvoker.class.getName());

-

-    private RuntimeEndpoint endpoint;

-    private JMSBinding jmsBinding;

-    private Binding targetBinding;

-    private JMSResourceFactory jmsResourceFactory;

-    private RuntimeComponentService service;

-    private MessageFactory messageFactory;

-

-    public DefaultServiceInvoker(RuntimeEndpoint endpoint, Binding targetBinding, MessageFactory messageFactory, JMSResourceFactory rf) throws NamingException {

-        this.endpoint = endpoint;

-        this.jmsBinding = (JMSBinding) endpoint.getBinding();

-        this.jmsResourceFactory = rf;

-        this.service = (RuntimeComponentService) endpoint.getService();

-        this.targetBinding = targetBinding;

-        this.messageFactory = messageFactory;

-        

-    }

-

-    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

-        getEndpoint(targetBinding).invoke(tuscanyMsg);

-            

-    } 

-    

-    private RuntimeEndpoint getEndpoint(Binding targetBinding) {

-        for(Endpoint ep: service.getEndpoints()) {

-            if(ep.getBinding() == targetBinding) {

-                return (RuntimeEndpoint) ep;

-            }

-        }

-        return endpoint; 

-    }

-

-}

+/*
+ * 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.host;
+
+import java.lang.reflect.InvocationTargetException;
+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.assembly.Endpoint;
+import org.apache.tuscany.sca.binding.jms.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
+
+/**
+ * TODO RRB experiement
+ * Listener for the JMSBinding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultServiceInvoker implements MessageListener {
+
+    private static final Logger logger = Logger.getLogger(DefaultServiceInvoker.class.getName());
+
+    private RuntimeEndpoint endpoint;
+    private JMSBinding jmsBinding;
+    private Binding targetBinding;
+    private JMSResourceFactory jmsResourceFactory;
+    private RuntimeComponentService service;
+    private MessageFactory messageFactory;
+
+    public DefaultServiceInvoker(RuntimeEndpoint endpoint, Binding targetBinding, MessageFactory messageFactory, JMSResourceFactory rf) throws NamingException {
+        this.endpoint = endpoint;
+        this.jmsBinding = (JMSBinding) endpoint.getBinding();
+        this.jmsResourceFactory = rf;
+        this.service = (RuntimeComponentService) endpoint.getService();
+        this.targetBinding = targetBinding;
+        this.messageFactory = messageFactory;
+        
+    }
+
+    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
+        getEndpoint(targetBinding).invoke(tuscanyMsg);
+            
+    } 
+    
+    private RuntimeEndpoint getEndpoint(Binding targetBinding) {
+        for(Endpoint ep: service.getEndpoints()) {
+            if(ep.getBinding() == targetBinding) {
+                return (RuntimeEndpoint) ep;
+            }
+        }
+        return endpoint; 
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java
index e4bf31f7ee..a15a84b60e 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java
@@ -1,27 +1,27 @@
-/*

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

-

-

-public interface JMSHostExtensionPoint {

-

-    JMSServiceListenerFactory getJMSServiceListenerFactory();

-    

-}

+/*
+ * 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.host;
+
+
+public interface JMSHostExtensionPoint {
+
+    JMSServiceListenerFactory getJMSServiceListenerFactory();
+    
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java
index b6ccb5be9b..444d796b12 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java
@@ -1,29 +1,29 @@
-/*

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

-

-public interface JMSServiceListener {

-    

-    void start();

-    

-    void stop();

-    

-    String getDestinationName();

-}

+/*
+ * 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.host;
+
+public interface JMSServiceListener {
+    
+    void start();
+    
+    void stop();
+    
+    String getDestinationName();
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
index c183a720e2..451f3680d6 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
@@ -1,37 +1,37 @@
-/*

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

-

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

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

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

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-

-public interface JMSServiceListenerDetails {

-

-    JMSBinding getJmsBinding();

-

-    Binding getTargetBinding();

-    

-    RuntimeEndpoint getEndpoint();

-

-    MessageFactory getMessageFactory();

-

-}

+/*
+ * 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.host;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.binding.jms.JMSBinding;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
+
+public interface JMSServiceListenerDetails {
+
+    JMSBinding getJmsBinding();
+
+    Binding getTargetBinding();
+    
+    RuntimeEndpoint getEndpoint();
+
+    MessageFactory getMessageFactory();
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java
index 5f3f773985..9dc23f1d8d 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java
@@ -1,27 +1,27 @@
-/*

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

-

-

-public interface JMSServiceListenerFactory {

-    

-    JMSServiceListener createJMSServiceListener(JMSServiceListenerDetails jmsServiceBindingProvider);

-

-}

+/*
+ * 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.host;
+
+
+public interface JMSServiceListenerFactory {
+    
+    JMSServiceListener createJMSServiceListener(JMSServiceListenerDetails jmsServiceBindingProvider);
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
index 17542ace9d..32531fa6c3 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
@@ -1,30 +1,30 @@
-/*

- * 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 org.apache.tuscany.sca.binding.jms.JMSBinding;

-

-public class DefaultJMSResourceFactoryExtensionPoint implements JMSResourceFactoryExtensionPoint {

-

-    public JMSResourceFactory createJMSResourceFactory(JMSBinding binding) {

-        return new JMSResourceFactoryImpl(binding.getConnectionFactoryName(), binding.getResponseConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL());

-    }

-

-}

+/*
+ * 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 org.apache.tuscany.sca.binding.jms.JMSBinding;
+
+public class DefaultJMSResourceFactoryExtensionPoint implements JMSResourceFactoryExtensionPoint {
+
+    public JMSResourceFactory createJMSResourceFactory(JMSBinding binding) {
+        return new JMSResourceFactoryImpl(binding.getConnectionFactoryName(), binding.getResponseConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL());
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
index 2628bf50a1..b7622c942e 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 /**
  * Utility methods to load JMS message processors.
  * 
- * @version $Rev: $ $Date: $
+ * @version $Rev$ $Date$
  */
 public class JMSMessageProcessorUtil {
 
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 348764fe43..cd53857ed8 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
@@ -1,95 +1,95 @@
-/*

- * 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 javax.jms.Connection;

-import javax.jms.Destination;

-import javax.jms.JMSException;

-import javax.jms.Session;

-import javax.naming.NamingException;

-

-public interface JMSResourceFactory {

-

-    /*

-     * 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.binding.jms.JMSResourceFactory#getConnection()

-     */

-    public abstract Connection getConnection() throws NamingException, JMSException;

-

-    /*

-     * (non-Javadoc)

-     * 

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

-     */

-    public abstract Session createSession() throws JMSException, NamingException;

-

-    public abstract void closeSession(Session session) throws JMSException;

-

-    /*

-     * (non-Javadoc)

-     * 

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

-     */

-    public abstract void startConnection() throws JMSException, NamingException;

-

-    /*

-     * (non-Javadoc)

-     * 

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

-     */

-    public abstract void closeConnection() throws JMSException;

-

-    public abstract Destination lookupDestination(String destName) throws NamingException;

-

-    /**

-     * You can create a destination in ActiveMQ (and have it appear in JNDI) by putting "dynamicQueues/" in front of the queue name being looked up

-     */

-    public abstract Destination createDestination(String jndiName) throws NamingException;

-

-    /*

-     * 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.binding.jms.JMSResourceFactory#getConnection()

-     */

-    public abstract Connection getResponseConnection() throws NamingException, JMSException;

-

-    /*

-     * (non-Javadoc)

-     * 

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

-     */

-    public abstract Session createResponseSession() throws JMSException, NamingException;

-

-    public abstract void closeResponseSession(Session session) throws JMSException;

-    

-    public abstract void closeResponseConnection() throws JMSException;

-

-    /*

-     * Indicates whether connections obtained using getConnection() or getResponseConnection()

-     * must be closed after each use.  This is necessary in environments where connections are

-     * shared with other users, or where connections cannot be held across transaction boundaries.

-     */

-    public abstract boolean isConnectionClosedAfterUse();

-}

+/*
+ * 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 javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Session;
+import javax.naming.NamingException;
+
+public interface JMSResourceFactory {
+
+    /*
+     * 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.binding.jms.JMSResourceFactory#getConnection()
+     */
+    public abstract Connection getConnection() throws NamingException, JMSException;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession()
+     */
+    public abstract Session createSession() throws JMSException, NamingException;
+
+    public abstract void closeSession(Session session) throws JMSException;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#startConnection()
+     */
+    public abstract void startConnection() throws JMSException, NamingException;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#closeConnection()
+     */
+    public abstract void closeConnection() throws JMSException;
+
+    public abstract Destination lookupDestination(String destName) throws NamingException;
+
+    /**
+     * You can create a destination in ActiveMQ (and have it appear in JNDI) by putting "dynamicQueues/" in front of the queue name being looked up
+     */
+    public abstract Destination createDestination(String jndiName) throws NamingException;
+
+    /*
+     * 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.binding.jms.JMSResourceFactory#getConnection()
+     */
+    public abstract Connection getResponseConnection() throws NamingException, JMSException;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession()
+     */
+    public abstract Session createResponseSession() throws JMSException, NamingException;
+
+    public abstract void closeResponseSession(Session session) throws JMSException;
+    
+    public abstract void closeResponseConnection() throws JMSException;
+
+    /*
+     * Indicates whether connections obtained using getConnection() or getResponseConnection()
+     * must be closed after each use.  This is necessary in environments where connections are
+     * shared with other users, or where connections cannot be held across transaction boundaries.
+     */
+    public abstract boolean isConnectionClosedAfterUse();
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
index 4fc20c0cb3..afd2508043 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
@@ -1,28 +1,28 @@
-/*

- * 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 org.apache.tuscany.sca.binding.jms.JMSBinding;

-

-public interface JMSResourceFactoryExtensionPoint {

-    

-    JMSResourceFactory createJMSResourceFactory(JMSBinding binding);

-

-}

+/*
+ * 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 org.apache.tuscany.sca.binding.jms.JMSBinding;
+
+public interface JMSResourceFactoryExtensionPoint {
+    
+    JMSResourceFactory createJMSResourceFactory(JMSBinding binding);
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
index 625d5b4817..5b59389a18 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
@@ -1,229 +1,229 @@
-/*

- * 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;

-

-import java.util.ArrayList;

-import java.util.List;

-

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

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;

-import org.junit.Test;

-

-/**

- * This unit test is used to ensure that a JMS Message delivered to a Component will select the correct operation based

- * on the details in section 1.5 of the JMS Binding specification.

- *

- * @version $Rev$ $Date$

- */

-public class OperationSelectionTestCaseFIXME {

-    /**

-     * This test attempts to invoke a Service with a Single method where scaOperationName is not specified in the JMS

-     * Message

-     * <p>

-     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithOnlyOneOperationScaOperationNameNotSpecified() throws Exception {

-        // Create the operation we should match

-        final Operation expectedOperation = newOperation("myOperation");

-

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        operations.add(expectedOperation);

-

-        // The name of the Operation in the JMS Message - not specified

-        final String scaOperationName = null;

-

-        // Do the test

-        doTestJMSBinding(expectedOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message matches the

-     * method name on the Service

-     * <p>

-     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithOnlyOneOperationScaOperationNameMatches() throws Exception {

-        // Create the operation we should match

-        final Operation expectedOperation = newOperation("myOperation");

-

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        operations.add(expectedOperation);

-

-        // The name of the Operation in the JMS Message - matches operation name

-        final String scaOperationName = expectedOperation.getName();

-

-        // Do the test

-        doTestJMSBinding(expectedOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message is

-     * different the method name on the Service

-     * <p>

-     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithOnlyOneOperationScaOperationNameDifferent() throws Exception {

-        // Create the operation we should match

-        final Operation expectedOperation = newOperation("myOperation");

-

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        operations.add(expectedOperation);

-

-        // The name of the Operation in the JMS Message - different to operation name

-        final String scaOperationName = "Does Not Match Opeation Name";

-

-        // Do the test

-        doTestJMSBinding(expectedOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS

-     * Message matches an operation name

-     * <p>

-     * Expected behaviour is that the named method will be invoked.

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithMultipleOperationsScaOperationNameSpecified() throws Exception {

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        for (int i = 0; i < 5; i++) {

-            operations.add(newOperation("operation" + i));

-        }

-

-        // Now try and invoke each operation

-        for (Operation expectedOperation : operations) {

-            // The name of the Operation in the JMS Message

-            final String scaOperationName = expectedOperation.getName();

-

-            // Do the test

-            doTestJMSBinding(expectedOperation, operations, scaOperationName);

-        }

-    }

-

-    /**

-     * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS

-     * Message is not set so we invoke the onMessage() method

-     * <p>

-     * Expected behaviour is that the onMessage() method should be used instead

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithMultipleOperationsScaOperationNotSpecified() throws Exception {

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        for (int i = 0; i < 5; i++) {

-            operations.add(newOperation("operation" + i));

-        }

-

-        // Add the onMessage operation to the Service Contract

-        final Operation onMessageOperation = newOperation("onMessage");

-        operations.add(onMessageOperation);

-

-        // The name of the Operation in the JMS Message is not set so it will attempt

-        // to invoke the onMessage() method

-        final String scaOperationName = null;

-

-        // Do the test

-        doTestJMSBinding(onMessageOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This is the test method that will attempt to unit test invoking a Service with the specified operations using a

-     * JMS Message with the specified scaOperationName to ensure that it invokes the expectedOperation

-     * 

-     * @param expectedOperation The Operation we are expecting to be invoked over JMS

-     * @param operations The list of Operations supported by the Service

-     * @param scaOperationName The value to set scaOperationName in the JMS Message

-     * @throws Exception Failed

-     */

-    private void doTestJMSBinding(Operation expectedOperation, List<Operation> operations, String scaOperationName)

-        throws Exception {

-        // Create the test JMS Binding

-        final JMSBinding jmsBinding = new JMSBinding();

-        JMSResourceFactory jmsResourceFactory = null;

-

-        // Extra information for the method we are invoking

-        final String operationParams = "Hello";

-        final Object operationReturnValue = "Operation Success";

-

-        // Mock up the Service. Basically, it is going to call:

-        // List<Operation> opList = service.getInterfaceContract().getInterface().getOperations();

-//        final InterfaceContract ifaceContract = EasyMock.createStrictMock(InterfaceContract.class);

-//        final RuntimeComponentService service = EasyMock.createStrictMock(RuntimeComponentService.class);

-//        final Interface iface = EasyMock.createStrictMock(Interface.class);

-//        EasyMock.expect(iface.getOperations()).andReturn(operations);

-//        EasyMock.expect(ifaceContract.getInterface()).andReturn(iface);

-//        EasyMock.expect(service.getInterfaceContract()).andReturn(ifaceContract);

-//

-//        // Mock up getting and invoking the RuntimeWire. It is going to call:

-//        // service.getRuntimeWire(jmsBinding).invoke(operation, (Object[])requestPayload);

-//        final RuntimeWire runtimeWire = EasyMock.createStrictMock(RuntimeWire.class);

-//        EasyMock.expect(service.getRuntimeWire(jmsBinding)).andReturn(runtimeWire);

-//        EasyMock.expect(runtimeWire.invoke(expectedOperation, new Object[] {operationParams}))

-//            .andReturn(operationReturnValue);

-//

-//        // Create the JMS Binding Listener

-//      //  final DefaultJMSBindingListener bindingListener = new DefaultJMSBindingListener(jmsBinding, jmsResourceFactory, service, null);

-//

-//        // Simulate a message

-//        final TextMessage requestJMSMsg = EasyMock.createStrictMock(TextMessage.class);

-//        EasyMock.expect(requestJMSMsg.getStringProperty("scaOperationName")).andReturn(scaOperationName);

-//        EasyMock.expect(requestJMSMsg.getText()).andReturn(operationParams);

-//        EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(null);

-//

-//        // Lets put all the mocks into replay mode

-//        // EasyMock.replay(iface);

-//        EasyMock.replay(ifaceContract);

-//        EasyMock.replay(service);

-//        EasyMock.replay(requestJMSMsg);

-//        EasyMock.replay(runtimeWire);

-

-        // Do the test

-     //   bindingListener.onMessage(requestJMSMsg);

-

-        // Verify our Mock objects

-        // EasyMock.verify(iface);

-        // EasyMock.verify(ifaceContract);

-        // EasyMock.verify(service);

-        // EasyMock.verify(requestJMSMsg);

-        // EasyMock.verify(runtimeWire);

-    }

-

-    private static Operation newOperation(String name) {

-        Operation operation = new OperationImpl();

-        operation.setName(name);

-        return operation;

-    }

-}

+/*
+ * 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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
+import org.junit.Test;
+
+/**
+ * This unit test is used to ensure that a JMS Message delivered to a Component will select the correct operation based
+ * on the details in section 1.5 of the JMS Binding specification.
+ *
+ * @version $Rev$ $Date$
+ */
+public class OperationSelectionTestCaseFIXME {
+    /**
+     * This test attempts to invoke a Service with a Single method where scaOperationName is not specified in the JMS
+     * Message
+     * <p>
+     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored
+     * 
+     * @throws Exception Failed
+     */
+    @Test
+    public void testServiceWithOnlyOneOperationScaOperationNameNotSpecified() throws Exception {
+        // Create the operation we should match
+        final Operation expectedOperation = newOperation("myOperation");
+
+        // Create the list of operations for the Service
+        final List<Operation> operations = new ArrayList<Operation>();
+        operations.add(expectedOperation);
+
+        // The name of the Operation in the JMS Message - not specified
+        final String scaOperationName = null;
+
+        // Do the test
+        doTestJMSBinding(expectedOperation, operations, scaOperationName);
+    }
+
+    /**
+     * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message matches the
+     * method name on the Service
+     * <p>
+     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored
+     * 
+     * @throws Exception Failed
+     */
+    @Test
+    public void testServiceWithOnlyOneOperationScaOperationNameMatches() throws Exception {
+        // Create the operation we should match
+        final Operation expectedOperation = newOperation("myOperation");
+
+        // Create the list of operations for the Service
+        final List<Operation> operations = new ArrayList<Operation>();
+        operations.add(expectedOperation);
+
+        // The name of the Operation in the JMS Message - matches operation name
+        final String scaOperationName = expectedOperation.getName();
+
+        // Do the test
+        doTestJMSBinding(expectedOperation, operations, scaOperationName);
+    }
+
+    /**
+     * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message is
+     * different the method name on the Service
+     * <p>
+     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored
+     * 
+     * @throws Exception Failed
+     */
+    @Test
+    public void testServiceWithOnlyOneOperationScaOperationNameDifferent() throws Exception {
+        // Create the operation we should match
+        final Operation expectedOperation = newOperation("myOperation");
+
+        // Create the list of operations for the Service
+        final List<Operation> operations = new ArrayList<Operation>();
+        operations.add(expectedOperation);
+
+        // The name of the Operation in the JMS Message - different to operation name
+        final String scaOperationName = "Does Not Match Opeation Name";
+
+        // Do the test
+        doTestJMSBinding(expectedOperation, operations, scaOperationName);
+    }
+
+    /**
+     * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS
+     * Message matches an operation name
+     * <p>
+     * Expected behaviour is that the named method will be invoked.
+     * 
+     * @throws Exception Failed
+     */
+    @Test
+    public void testServiceWithMultipleOperationsScaOperationNameSpecified() throws Exception {
+        // Create the list of operations for the Service
+        final List<Operation> operations = new ArrayList<Operation>();
+        for (int i = 0; i < 5; i++) {
+            operations.add(newOperation("operation" + i));
+        }
+
+        // Now try and invoke each operation
+        for (Operation expectedOperation : operations) {
+            // The name of the Operation in the JMS Message
+            final String scaOperationName = expectedOperation.getName();
+
+            // Do the test
+            doTestJMSBinding(expectedOperation, operations, scaOperationName);
+        }
+    }
+
+    /**
+     * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS
+     * Message is not set so we invoke the onMessage() method
+     * <p>
+     * Expected behaviour is that the onMessage() method should be used instead
+     * 
+     * @throws Exception Failed
+     */
+    @Test
+    public void testServiceWithMultipleOperationsScaOperationNotSpecified() throws Exception {
+        // Create the list of operations for the Service
+        final List<Operation> operations = new ArrayList<Operation>();
+        for (int i = 0; i < 5; i++) {
+            operations.add(newOperation("operation" + i));
+        }
+
+        // Add the onMessage operation to the Service Contract
+        final Operation onMessageOperation = newOperation("onMessage");
+        operations.add(onMessageOperation);
+
+        // The name of the Operation in the JMS Message is not set so it will attempt
+        // to invoke the onMessage() method
+        final String scaOperationName = null;
+
+        // Do the test
+        doTestJMSBinding(onMessageOperation, operations, scaOperationName);
+    }
+
+    /**
+     * This is the test method that will attempt to unit test invoking a Service with the specified operations using a
+     * JMS Message with the specified scaOperationName to ensure that it invokes the expectedOperation
+     * 
+     * @param expectedOperation The Operation we are expecting to be invoked over JMS
+     * @param operations The list of Operations supported by the Service
+     * @param scaOperationName The value to set scaOperationName in the JMS Message
+     * @throws Exception Failed
+     */
+    private void doTestJMSBinding(Operation expectedOperation, List<Operation> operations, String scaOperationName)
+        throws Exception {
+        // Create the test JMS Binding
+        final JMSBinding jmsBinding = new JMSBinding();
+        JMSResourceFactory jmsResourceFactory = null;
+
+        // Extra information for the method we are invoking
+        final String operationParams = "Hello";
+        final Object operationReturnValue = "Operation Success";
+
+        // Mock up the Service. Basically, it is going to call:
+        // List<Operation> opList = service.getInterfaceContract().getInterface().getOperations();
+//        final InterfaceContract ifaceContract = EasyMock.createStrictMock(InterfaceContract.class);
+//        final RuntimeComponentService service = EasyMock.createStrictMock(RuntimeComponentService.class);
+//        final Interface iface = EasyMock.createStrictMock(Interface.class);
+//        EasyMock.expect(iface.getOperations()).andReturn(operations);
+//        EasyMock.expect(ifaceContract.getInterface()).andReturn(iface);
+//        EasyMock.expect(service.getInterfaceContract()).andReturn(ifaceContract);
+//
+//        // Mock up getting and invoking the RuntimeWire. It is going to call:
+//        // service.getRuntimeWire(jmsBinding).invoke(operation, (Object[])requestPayload);
+//        final RuntimeWire runtimeWire = EasyMock.createStrictMock(RuntimeWire.class);
+//        EasyMock.expect(service.getRuntimeWire(jmsBinding)).andReturn(runtimeWire);
+//        EasyMock.expect(runtimeWire.invoke(expectedOperation, new Object[] {operationParams}))
+//            .andReturn(operationReturnValue);
+//
+//        // Create the JMS Binding Listener
+//      //  final DefaultJMSBindingListener bindingListener = new DefaultJMSBindingListener(jmsBinding, jmsResourceFactory, service, null);
+//
+//        // Simulate a message
+//        final TextMessage requestJMSMsg = EasyMock.createStrictMock(TextMessage.class);
+//        EasyMock.expect(requestJMSMsg.getStringProperty("scaOperationName")).andReturn(scaOperationName);
+//        EasyMock.expect(requestJMSMsg.getText()).andReturn(operationParams);
+//        EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(null);
+//
+//        // Lets put all the mocks into replay mode
+//        // EasyMock.replay(iface);
+//        EasyMock.replay(ifaceContract);
+//        EasyMock.replay(service);
+//        EasyMock.replay(requestJMSMsg);
+//        EasyMock.replay(runtimeWire);
+
+        // Do the test
+     //   bindingListener.onMessage(requestJMSMsg);
+
+        // Verify our Mock objects
+        // EasyMock.verify(iface);
+        // EasyMock.verify(ifaceContract);
+        // EasyMock.verify(service);
+        // EasyMock.verify(requestJMSMsg);
+        // EasyMock.verify(runtimeWire);
+    }
+
+    private static Operation newOperation(String name) {
+        Operation operation = new OperationImpl();
+        operation.setName(name);
+        return operation;
+    }
+}