Pulled a recent revision of trunk into the sca-android branch, to apply the android patches from JIRA TUSCANY-2440 to it.

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

32 files changed, 4549 insertions, 0 deletions

diff --git a/branches/sca-android/modules/binding-jms-runtime/LICENSE b/branches/sca-android/modules/binding-jms-runtime/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/LICENSE
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+
diff --git a/branches/sca-android/modules/binding-jms-runtime/NOTICE b/branches/sca-android/modules/binding-jms-runtime/NOTICE
new file mode 100644
index 0000000000..fdfa0e9faa
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/branches/sca-android/modules/binding-jms-runtime/pom.xml b/branches/sca-android/modules/binding-jms-runtime/pom.xml
new file mode 100644
index 0000000000..62eb3de60d
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/pom.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-binding-jms-runtime</artifactId>
+    <name>Apache Tuscany SCA JMS Binding Runtime</name>
+
+    <dependencies>
+            
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-interface-wsdl</artifactId>
+			<version>1.4-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-axiom</artifactId>
+			<version>1.4-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-ws-wsdlgen</artifactId>
+			<version>1.4-SNAPSHOT</version>
+		</dependency>
+
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>         
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${tuscany.version}</Bundle-Version>
+                        <Bundle-SymbolicName>org.apache.tuscany.sca.binding.jms.runtime</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.binding.jms.provider*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
new file mode 100644
index 0000000000..2fcb07a07f
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
@@ -0,0 +1,117 @@
+/*
+ * 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.JMSException;
+import javax.jms.Message;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
+
+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.osoa.sca.ServiceRuntimeException;
+
+/**
+ * Base MessageProcessor for the JMSBinding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public abstract class AbstractMessageProcessor implements JMSMessageProcessor {
+
+    protected String operationPropertyName;
+    protected boolean xmlFormat = true;
+
+    public AbstractMessageProcessor(JMSBinding jmsBinding) {
+        this.operationPropertyName = jmsBinding.getOperationSelectorPropertyName();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#getOperationName(javax.jms.Message)
+     */
+    public String getOperationName(Message message) {
+        try {
+
+            return message.getStringProperty(operationPropertyName);
+
+        } catch (JMSException e) {
+            throw new JMSBindingException("Exception retreiving operation name from message", e);
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#setOperationName(javax.jms.Message, java.lang.String)
+     */
+    public void setOperationName(String operationName, Message message) {
+        try {
+
+            message.setStringProperty(operationPropertyName, operationName);
+
+        } catch (JMSException e) {
+            throw new JMSBindingException("Exception setting the operation name on message", e);
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#extractPayload(javax.jms.Session, java.lang.Object)
+     */
+    public Message insertPayloadIntoJMSMessage(Session session, Object o) {
+        return createJMSMessage(session, o);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#extractPayload(javax.jms.Message)
+     */
+    public Object extractPayloadFromJMSMessage(Message msg) {
+        try {
+            if (msg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) {
+                throw new ServiceRuntimeException("remote service exception, see nested exception", (Throwable)((ObjectMessage)msg).getObject());
+            }
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+        return extractPayload(msg);
+    }
+
+    public Message createFaultMessage(Session session, Throwable o) {
+        try {
+
+            ObjectMessage message = session.createObjectMessage();
+            message.setObject(o);
+            message.setBooleanProperty(JMSBindingConstants.FAULT_PROPERTY, true);
+            return message;
+
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+    protected abstract Object[] extractPayload(Message msg);
+
+    protected abstract Message createJMSMessage(Session session, Object o);
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
new file mode 100644
index 0000000000..a14e2bd018
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
@@ -0,0 +1,407 @@
+/*
+ * 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.Map;
+
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+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.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.runtime.ReferenceParameters;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.osoa.sca.ServiceRuntimeException;
+
+/**
+ * Invoker for the JMS binding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
+
+    protected Operation operation;
+    protected String operationName;
+
+    protected JMSBinding jmsBinding;
+    protected JMSResourceFactory jmsResourceFactory;
+    protected JMSMessageProcessor requestMessageProcessor;
+    protected JMSMessageProcessor responseMessageProcessor;
+    protected Destination bindingRequestDest;
+    protected Destination bindingReplyDest;
+    protected RuntimeComponentReference reference;
+
+    public JMSBindingInvoker(JMSBinding jmsBinding, Operation operation, JMSResourceFactory jmsResourceFactory, RuntimeComponentReference reference) {
+
+        this.operation = operation;
+        operationName = operation.getName();
+
+        this.jmsBinding = jmsBinding;
+        this.jmsResourceFactory = jmsResourceFactory;
+        this.reference = reference;
+        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
+        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
+
+        try {
+
+            bindingRequestDest = lookupDestination();
+            bindingReplyDest = lookupResponseDestination();
+
+        } catch (NamingException e) {
+            throw new JMSBindingException(e);
+        }
+
+    }
+
+    /**
+     * Looks up the Destination Queue for the JMS Binding
+     * 
+     * @return The Destination Queue
+     * @throws NamingException Failed to lookup Destination Queue
+     * @throws JMSBindingException Failed to lookup Destination Queue
+     * @see #lookupDestinationQueue(boolean)
+     */
+    protected Destination lookupDestination() throws NamingException, JMSBindingException {
+        return lookupDestinationQueue(false);
+    }
+
+    /**
+     * Looks up the Destination Response Queue for the JMS Binding
+     * 
+     * @return The Destination Response Queue
+     * @throws NamingException Failed to lookup Destination Response Queue
+     * @throws JMSBindingException Failed to lookup Destination Response Queue
+     * @see #lookupDestinationQueue(boolean)
+     */
+    protected Destination lookupResponseDestination() throws NamingException, JMSBindingException {
+        return lookupDestinationQueue(true);
+    }
+
+    /**
+     * 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>
+     * 
+     * @param isReponseQueue <code>true</code> if we are creating a response queue. 
+     *                       <code>false</code> if we are creating a request queue
+     * @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
+     */
+    protected Destination lookupDestinationQueue(boolean isReponseQueue) throws NamingException, JMSBindingException {
+        String queueName;
+        String queueType;
+        String qCreateMode;
+
+        if (isReponseQueue) {
+            queueName = jmsBinding.getResponseDestinationName();
+            queueType = "JMS Response Destination ";
+            qCreateMode = jmsBinding.getResponseDestinationCreate();
+            if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) {
+                return null;
+            }
+        } else {
+            queueName = jmsBinding.getDestinationName();
+            queueType = "JMS Destination ";
+            qCreateMode = jmsBinding.getDestinationCreate();
+        }
+
+        Destination dest = jmsResourceFactory.lookupDestination(queueName);
+
+        if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) {
+            // In this mode, the queue must not already exist as we are creating it
+            if (dest != null) {
+                throw new JMSBindingException(queueType + queueName
+                    + " already exists but has create mode of \""
+                    + qCreateMode
+                    + "\" while registering binding "
+                    + jmsBinding.getName()
+                    + " invoker");
+            }
+            // Create the queue
+            dest = jmsResourceFactory.createDestination(queueName);
+
+        } 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 (dest == null) {
+                dest = jmsResourceFactory.createDestination(queueName);
+            }
+
+        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) {
+            // In this mode, the queue must have already been created.
+            if (dest == null) {
+                throw new JMSBindingException(queueType + queueName
+                    + " not found but create mode of \""
+                    + qCreateMode
+                    + "\" while registering binding "
+                    + jmsBinding.getName()
+                    + " invoker");
+            }
+        }
+
+        // Make sure we ended up with a queue
+        if (dest == null) {
+            throw new JMSBindingException(queueType + queueName
+                + " not found with create mode of \""
+                + qCreateMode
+                + "\" while registering binding "
+                + jmsBinding.getName()
+                + " invoker");
+        }
+
+        return dest;
+    }
+
+    public org.apache.tuscany.sca.invocation.Message invoke(org.apache.tuscany.sca.invocation.Message tuscanyMsg) {
+        try {
+
+            Object resp = invokeTarget(tuscanyMsg);
+            tuscanyMsg.setBody(resp);
+
+        } catch (InvocationTargetException e) {
+            tuscanyMsg.setFaultBody(e.getCause());
+        } catch (ServiceRuntimeException e) {
+            if (e.getCause() instanceof InvocationTargetException) {
+                if ((e.getCause().getCause() instanceof RuntimeException)) {
+                    tuscanyMsg.setFaultBody(e.getCause());
+                } else {
+                    tuscanyMsg.setFaultBody(e.getCause().getCause());
+                }
+            } else {
+                tuscanyMsg.setFaultBody(e);
+            }
+        } catch (Throwable e) {
+            tuscanyMsg.setFaultBody(e);
+        }
+        return tuscanyMsg;
+    }
+
+    protected Object invokeTarget(org.apache.tuscany.sca.invocation.Message tuscanyMsg) throws InvocationTargetException {
+        try {
+            Session session = jmsResourceFactory.createSession();
+            try {
+
+                Destination replyToDest = getReplyToDestination(session);
+
+                Message requestMsg = sendRequest(tuscanyMsg, session, replyToDest);
+
+                if (replyToDest == null) {
+                    return null;
+                } else {
+                    Message replyMsg = receiveReply(session, replyToDest, requestMsg.getJMSMessageID());
+                    Object[] response = (Object[])responseMessageProcessor.extractPayloadFromJMSMessage(replyMsg);
+                    return (response != null && response.length > 0) ? response[0] : null;
+                }
+
+            } finally {
+                session.close();
+            }
+        } catch (JMSException e) {
+            throw new InvocationTargetException(e);
+        } catch (NamingException e) {
+            throw new InvocationTargetException(e);
+        }
+    }
+
+    protected Destination getReplyToDestination(Session session) throws JMSException, JMSBindingException, NamingException {
+        Destination replyToDest;
+        if (operation.isNonBlocking()) {
+            replyToDest = null;
+        } else {
+            if (bindingReplyDest != null) {
+                replyToDest = bindingReplyDest;
+            } else {
+                replyToDest = session.createTemporaryQueue();
+            }
+        }
+        return replyToDest;
+    }
+
+    protected Message sendRequest(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Session session, Destination replyToDest) throws JMSException, JMSBindingException,
+        NamingException {
+
+        Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, tuscanyMsg.getBody());
+
+        setHeaders(tuscanyMsg, requestMsg);
+
+        requestMsg.setJMSReplyTo(replyToDest);
+
+        Destination requestDest = getRequestDestination(tuscanyMsg, session);
+
+        MessageProducer producer = session.createProducer(requestDest);
+
+        if (jmsBinding.getOperationJMSTimeToLive(operationName) != null) {
+            producer.setTimeToLive(jmsBinding.getOperationJMSTimeToLive(operationName));
+        }
+
+        try {
+            producer.send(requestMsg);
+        } finally {
+            producer.close();
+        }
+        return requestMsg;
+    }
+
+    protected Destination getRequestDestination(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Session session) throws JMSBindingException, NamingException, JMSException {
+        Destination requestDestination;
+        if (reference.isCallback()) {
+            String toURI = tuscanyMsg.getTo().getURI();
+            if (toURI != null && toURI.startsWith("jms:")) {
+                // the msg to uri contains the callback destination name 
+                // this is an jms physical name not a jndi name so need to use session.createQueue
+                requestDestination = session.createQueue(toURI.substring(4));
+            } else {
+                requestDestination = lookupDestination();
+            }
+        } else {
+            requestDestination = bindingRequestDest;
+        }
+
+        return requestDestination;
+    }
+
+    protected void setHeaders(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Message jmsMsg) throws JMSException {
+
+        requestMessageProcessor.setOperationName(jmsBinding.getNativeOperationName(operationName), jmsMsg);
+
+        if (jmsBinding.getOperationJMSDeliveryMode(operationName) != null) {
+            if (jmsBinding.getOperationJMSDeliveryMode(operationName)) {
+                jmsMsg.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
+            } else {
+                jmsMsg.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
+            }
+        }
+
+        if (jmsBinding.getOperationJMSCorrelationId(operationName) != null) {
+            jmsMsg.setJMSCorrelationID(jmsBinding.getOperationJMSCorrelationId(operationName));
+        }
+
+        if (jmsBinding.getOperationJMSPriority(operationName) != null) {
+            jmsMsg.setJMSPriority(jmsBinding.getOperationJMSPriority(operationName));
+        }
+
+        if (jmsBinding.getOperationJMSType(operationName) != null) {
+            jmsMsg.setJMSType(jmsBinding.getOperationJMSType(operationName));
+        }
+
+        ReferenceParameters parameters = tuscanyMsg.getFrom().getReferenceParameters();
+
+        Object conversationID = parameters.getConversationID();
+        if (conversationID != null) {
+            jmsMsg.setStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY, conversationID.toString());
+        }
+
+        if (hasCallback()) {
+
+            if (parameters.getCallbackID() != null) {
+                jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY, parameters.getCallbackID().toString());
+            }
+
+            String callbackDestName = getCallbackDestinationName(reference);
+            if (callbackDestName != null) {
+                jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY, callbackDestName);
+            }
+        }
+        
+        for (String propName : jmsBinding.getPropertyNames()) {
+            Object value = jmsBinding.getProperty(propName);
+            jmsMsg.setObjectProperty(propName, value);
+        }
+
+        Map<String, Object> operationProperties = jmsBinding.getOperationProperties(operationName);
+        if (operationProperties != null) {
+            for (String propName : operationProperties.keySet()) {
+                Object value = operationProperties.get(propName);
+                jmsMsg.setObjectProperty(propName, value);
+            }
+        }
+    }
+
+    protected boolean hasCallback() {
+        if (operation.getInterface() instanceof JavaInterface) {
+            JavaInterface jiface = (JavaInterface)operation.getInterface();
+            if (jiface.getCallbackClass() != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected Message receiveReply(Session session, Destination replyToDest, String requestMsgId) throws JMSException, NamingException {
+        String msgSelector = "JMSCorrelationID = '" + requestMsgId + "'";
+        MessageConsumer consumer = session.createConsumer(replyToDest, msgSelector);
+      
+        long receiveWait;
+        if (jmsBinding.getOperationJMSTimeToLive(operationName) != null) {
+            receiveWait = jmsBinding.getOperationJMSTimeToLive(operationName) * 2;        
+        } else {
+            receiveWait = JMSBindingConstants.DEFAULT_TIME_TO_LIVE;
+        }
+        
+        Message replyMsg;
+        try {
+            jmsResourceFactory.startConnection();
+            replyMsg = consumer.receive(receiveWait);
+        } finally {
+            consumer.close();
+        }
+        if (replyMsg == null) {
+            throw new JMSBindingException("No reply message received on " + replyToDest + " for message id " + requestMsgId);
+        }
+        return replyMsg;
+    }
+
+    protected String getCallbackDestinationName(RuntimeComponentReference reference) {
+        RuntimeComponentService s = (RuntimeComponentService)reference.getCallbackService();
+        JMSBinding b = s.getBinding(JMSBinding.class);
+        if (b != null) {
+            JMSBindingServiceBindingProvider bp = (JMSBindingServiceBindingProvider)s.getBindingProvider(b);
+            return bp.getDestinationName();
+        }
+        return null;
+    }
+
+    public boolean allowsPassByReference() {
+        // JMS always pass by value
+        return true;
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
new file mode 100644
index 0000000000..1990e553e0
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
@@ -0,0 +1,232 @@
+/*
+ * 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.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.naming.NamingException;
+
+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.core.assembly.EndpointReferenceImpl;
+import org.apache.tuscany.sca.core.invocation.MessageImpl;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.runtime.EndpointReference;
+import org.apache.tuscany.sca.runtime.ReferenceParameters;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+/**
+ * Listener for the JMSBinding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class JMSBindingListener implements MessageListener {
+
+    private static final Logger logger = Logger.getLogger(JMSBindingListener.class.getName());
+
+    private static final String ON_MESSAGE_METHOD_NAME = "onMessage";
+    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;
+
+    public JMSBindingListener(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeComponentService service, Binding targetBinding) throws NamingException {
+        this.jmsBinding = jmsBinding;
+        this.jmsResourceFactory = jmsResourceFactory;
+        this.service = service;
+        this.targetBinding = targetBinding;
+        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 {
+            Object responsePayload = invokeService(requestJMSMsg);
+            sendReply(requestJMSMsg, responsePayload, false);
+        } catch (Throwable e) {
+            logger.log(Level.SEVERE, "Exception invoking service '" + service.getName(), e);
+            sendReply(requestJMSMsg, e, true);
+        }
+    }
+
+    /**
+     * Turn the JMS message back into a Tuscany message and invoke the target component
+     * 
+     * @param requestJMSMsg
+     * @return
+     * @throws JMSException
+     * @throws InvocationTargetException
+     */
+    protected Object invokeService(Message requestJMSMsg) throws JMSException, InvocationTargetException {
+
+        String operationName = requestMessageProcessor.getOperationName(requestJMSMsg);
+        Operation operation = getTargetOperation(operationName);
+
+        MessageImpl tuscanyMsg = new MessageImpl();
+        tuscanyMsg.setOperation(operation);
+        if ("onMessage".equals(operation.getName())) {
+            tuscanyMsg.setBody(new Object[]{requestJMSMsg});
+        } else {
+            Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(requestJMSMsg);
+            tuscanyMsg.setBody(requestPayload);
+        }
+
+        setHeaderProperties(requestJMSMsg, tuscanyMsg, operation);
+
+        return service.getRuntimeWire(targetBinding).invoke(operation, tuscanyMsg);
+    }
+
+    protected Operation getTargetOperation(String operationName) {
+        Operation operation = null;
+
+        if (serviceOperations.size() == 1) {
+
+            // SCA JMS Binding Specification - Rule 1.5.1 line 203
+            operation = serviceOperations.get(0);
+
+        } else if (operationName != null) {
+
+            // SCA JMS Binding Specification - Rule 1.5.1 line 205
+            for (Operation op : serviceOperations) {
+                if (op.getName().equals(operationName)) {
+                    operation = op;
+                    break;
+                }
+            }
+
+        } else {
+
+            // SCA JMS Binding Specification - Rule 1.5.1 line 207
+            for (Operation op : serviceOperations) {
+                if (op.getName().equals(ON_MESSAGE_METHOD_NAME)) {
+                    operation = op;
+                    break;
+                }
+            }
+        }
+
+        if (operation == null) {
+            throw new JMSBindingException("Can't find operation " + (operationName != null ? operationName : ON_MESSAGE_METHOD_NAME));
+        }
+
+        return operation;
+    }
+
+    protected void setHeaderProperties(Message requestJMSMsg, MessageImpl tuscanyMsg, Operation operation) throws JMSException {
+
+        EndpointReference from = new EndpointReferenceImpl(null);
+        tuscanyMsg.setFrom(from);
+        from.setCallbackEndpoint(new EndpointReferenceImpl("/")); // TODO: whats this for?
+        ReferenceParameters parameters = from.getReferenceParameters();
+
+        String conversationID = requestJMSMsg.getStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY);
+        if (conversationID != null) {
+            parameters.setConversationID(conversationID);
+        }
+
+        if (service.getInterfaceContract().getCallbackInterface() != null) {
+
+            String callbackdestName = requestJMSMsg.getStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY);
+            if (callbackdestName == null && operation.isNonBlocking()) {
+                // if the request has a replyTo but this service operation is oneway but the service uses callbacks
+                // then use the replyTo as the callback destination
+                Destination replyTo = requestJMSMsg.getJMSReplyTo();
+                if (replyTo != null) {
+                    callbackdestName = (replyTo instanceof Queue) ? ((Queue)replyTo).getQueueName() : ((Topic)replyTo).getTopicName();
+                }
+            }
+
+            if (callbackdestName != null) {
+                // append "jms:" to make it an absolute uri so the invoker can determine it came in on the request
+                // as otherwise the invoker should use the uri from the service callback binding
+                parameters.setCallbackReference(new EndpointReferenceImpl("jms:" + callbackdestName));
+            }
+
+            String callbackID = requestJMSMsg.getStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY);
+            if (callbackID != null) {
+                parameters.setCallbackID(callbackID);
+            }
+        }
+    }
+
+    protected void sendReply(Message requestJMSMsg, Object responsePayload, boolean isFault) {
+        try {
+
+            if (requestJMSMsg.getJMSReplyTo() == null) {
+                // assume no reply is expected
+                if (responsePayload != null) {
+                    logger.log(Level.FINE, "JMS service '" + service.getName() + "' dropped response as request has no replyTo");
+                }
+                return;
+            }
+
+            Session session = jmsResourceFactory.createSession();
+            Message replyJMSMsg;
+            if (isFault) {
+                replyJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)responsePayload);
+            } else {
+                replyJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, responsePayload);
+            }
+
+            replyJMSMsg.setJMSDeliveryMode(requestJMSMsg.getJMSDeliveryMode());
+            replyJMSMsg.setJMSPriority(requestJMSMsg.getJMSPriority());
+
+            if (correlationScheme == null || JMSBindingConstants.CORRELATE_MSG_ID.equalsIgnoreCase(correlationScheme)) {
+                replyJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSMessageID());
+            } else if (JMSBindingConstants.CORRELATE_CORRELATION_ID.equalsIgnoreCase(correlationScheme)) {
+                replyJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSCorrelationID());
+            }
+
+            Destination destination = requestJMSMsg.getJMSReplyTo();
+            MessageProducer producer = session.createProducer(destination);
+
+            producer.send(replyJMSMsg);
+
+            producer.close();
+            session.close();
+
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        } catch (NamingException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
new file mode 100644
index 0000000000..e0cd756849
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
@@ -0,0 +1,60 @@
+/*
+ * 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.impl.JMSBinding;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.provider.BindingProviderFactory;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.work.WorkScheduler;
+
+/**
+ * A factory from creating the JMS binding provider.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class JMSBindingProviderFactory implements BindingProviderFactory<JMSBinding> {
+
+    private WorkScheduler workScheduler;
+    private ExtensionPointRegistry extensionPoints;
+
+    public JMSBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+        this.extensionPoints = extensionPoints;
+        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+        workScheduler = utilities.getUtility(WorkScheduler.class);
+    }
+
+    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, JMSBinding binding) {
+        return new JMSBindingReferenceBindingProvider(component, reference, binding, extensionPoints);
+    }
+
+    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, JMSBinding binding) {
+        return new JMSBindingServiceBindingProvider(component, service, binding, binding, workScheduler, extensionPoints);
+    }
+
+    public Class<JMSBinding> getModelType() {
+        return JMSBinding.class;
+    }
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
new file mode 100644
index 0000000000..4266a6c7c8
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
@@ -0,0 +1,133 @@
+/*
+ * 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.util.ArrayList;
+import java.util.List;
+
+import javax.jms.JMSException;
+
+import org.apache.axiom.om.OMElement;
+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.ws.WebServiceBinding;
+import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
+import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+
+/**
+ * Implementation of the JMS reference binding provider.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class JMSBindingReferenceBindingProvider implements ReferenceBindingProvider {
+
+    private RuntimeComponentReference reference;
+    private JMSBinding jmsBinding;
+    private List<JMSBindingInvoker> jmsBindingInvokers = new ArrayList<JMSBindingInvoker>();
+    private JMSResourceFactory jmsResourceFactory;
+    private RuntimeComponent component;
+    private InterfaceContract wsdlInterfaceContract; 
+    private ExtensionPointRegistry extensions;
+
+    public JMSBindingReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, JMSBinding binding,  ExtensionPointRegistry extensions) {
+        this.reference = reference;
+        this.jmsBinding = binding;
+        this.extensions = extensions;
+        jmsResourceFactory = new JMSResourceFactory(binding.getConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL());
+
+        if (XMLTextMessageProcessor.class.isAssignableFrom(JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding).getClass())) {
+            setXMLDataBinding(reference);
+        }
+
+    }
+    
+    protected void setXMLDataBinding(RuntimeComponentReference reference) {
+        
+        WebServiceBindingFactory wsFactory = extensions.getExtensionPoint(WebServiceBindingFactory.class);
+        WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
+        BindingWSDLGenerator.generateWSDL(component, reference, wsBinding, extensions, null);
+        wsdlInterfaceContract = wsBinding.getBindingInterfaceContract();
+        wsdlInterfaceContract.getInterface().resetDataBinding(OMElement.class.getName());
+        
+        // TODO: TUSCANY-xxx, section 5.2 "Default Data Binding" in the JMS binding spec  
+        
+//        try {
+//            InterfaceContract ic = (InterfaceContract)reference.getInterfaceContract().clone();
+//
+//            Interface ii = (Interface)ic.getInterface().clone();
+//            ii.resetDataBinding("org.apache.axiom.om.OMElement");
+//            ic.setInterface(ii);
+//            reference.setInterfaceContract(ic);
+//
+//        } catch (CloneNotSupportedException e) {
+//            throw new RuntimeException(e);
+//        }
+    }
+
+    public Invoker createInvoker(Operation operation) {
+
+        if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) {
+            if (!reference.isCallback()) {
+                throw new JMSBindingException("No destination specified for reference " + reference.getName());
+            }
+        }
+
+        JMSBindingInvoker invoker = new JMSBindingInvoker(jmsBinding, operation, jmsResourceFactory, reference);
+        jmsBindingInvokers.add(invoker);
+        return invoker;
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return true;
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        if (wsdlInterfaceContract != null) {
+            return wsdlInterfaceContract;
+        } else {
+            if (reference.getInterfaceContract() == null) {
+                return reference.getReference().getInterfaceContract();
+            } else {
+                return reference.getInterfaceContract();
+            }
+        }
+    }
+
+    public void start() {
+
+    }
+
+    public void stop() {
+        try {
+            jmsResourceFactory.closeConnection();
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
new file mode 100644
index 0000000000..7db640b7d1
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
@@ -0,0 +1,307 @@
+/*
+ * 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.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.Queue;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.naming.NamingException;
+
+import org.apache.axiom.om.OMElement;
+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.ws.WebServiceBinding;
+import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
+import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.work.WorkScheduler;
+
+/**
+ * Implementation of the JMS service binding provider.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class JMSBindingServiceBindingProvider implements ServiceBindingProvider {
+    private static final Logger logger = Logger.getLogger(JMSBindingServiceBindingProvider.class.getName());
+
+    private RuntimeComponentService service;
+    private Binding targetBinding;
+    private JMSBinding jmsBinding;
+    private JMSResourceFactory jmsResourceFactory;
+    private MessageConsumer consumer;
+    private WorkScheduler workScheduler;
+    private boolean running;
+
+    private Destination destination;
+
+    private ExtensionPointRegistry extensionPoints;
+
+    private RuntimeComponent component;
+    private InterfaceContract wsdlInterfaceContract;
+
+    public JMSBindingServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, Binding targetBinding, JMSBinding binding, WorkScheduler workScheduler, ExtensionPointRegistry extensionPoints) {
+        this.component = component;
+        this.service = service;
+        this.jmsBinding = binding;
+        this.workScheduler = workScheduler;
+        this.targetBinding = targetBinding;
+        this.extensionPoints = extensionPoints;
+
+        jmsResourceFactory = new JMSResourceFactory(binding.getConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL());
+
+        if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) {
+            if (!service.isCallback()) {
+                // use the SCA service name as the default destination name
+                jmsBinding.setDestinationName(service.getName());
+            }
+        }
+
+        if (XMLTextMessageProcessor.class.isAssignableFrom(JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding).getClass())) {
+            if (!isOnMessage()) {
+                setXMLDataBinding(service);
+            }
+        }
+
+    }
+    
+    protected boolean isOnMessage() {
+        InterfaceContract ic = getBindingInterfaceContract();
+        if (ic.getInterface().getOperations().size() != 1) {
+            return false;
+        }
+        return "onMessage".equals(ic.getInterface().getOperations().get(0).getName());
+    }
+
+    protected void setXMLDataBinding(RuntimeComponentService service) {
+        if (service.getInterfaceContract() != null) {
+            WebServiceBindingFactory wsFactory = extensionPoints.getExtensionPoint(WebServiceBindingFactory.class);
+            WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
+            BindingWSDLGenerator.generateWSDL(component, service, wsBinding, extensionPoints, null);
+            wsdlInterfaceContract = wsBinding.getBindingInterfaceContract();
+            wsdlInterfaceContract.getInterface().resetDataBinding(OMElement.class.getName());
+            
+            // TODO: TUSCANY-xxx, section 5.2 "Default Data Binding" in the JMS binding spec  
+
+//            try {
+//                InterfaceContract ic = (InterfaceContract)service.getInterfaceContract().clone();
+//                Interface ii = ic.getInterface();
+//                if (ii.getOperations().size() == 1 && "onMessage".equals(ii.getOperations().get(0).getName())) {
+//                    return;
+//                }
+//                ii = (Interface)ii.clone();
+//                ii.resetDataBinding("org.apache.axiom.om.OMElement");
+//                ic.setInterface(ii);
+//                service.setInterfaceContract(ic);
+//
+//            } catch (CloneNotSupportedException e) {
+//                throw new RuntimeException(e);
+//            }
+        }
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        if (wsdlInterfaceContract != null) {
+            return wsdlInterfaceContract;
+        } else {
+            return service.getInterfaceContract();
+        }
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return true;
+    }
+
+    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();
+        } 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 (!"Transport disposed.".equals(e.getMessage())) {
+                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);
+        }
+
+        final JMSBindingListener listener = new JMSBindingListener(jmsBinding, jmsResourceFactory, service, targetBinding);
+        try {
+
+            consumer.setMessageListener(listener);
+            jmsResourceFactory.startConnection();
+
+        } catch (javax.jms.IllegalStateException 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 " + (service.isCallback() ? "callback service" : "service")
+            + " '"
+            + service.getName()
+            + "' 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 (service.isCallback() && JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(jmsBinding.getDestinationName())) {
+            // 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 "
+                    + service.getName()
+                    + " 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 "
+                    + service.getName()
+                    + " 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 "
+                + service.getName()
+                + " 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/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
new file mode 100644
index 0000000000..821b9d7873
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
@@ -0,0 +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.provider;
+
+import javax.jms.Message;
+import javax.jms.Session;
+
+/**
+ * Interface for a component that does operation selection and message payload processing
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface JMSMessageProcessor {
+
+    /**
+     * Get the operation name from a JMS Message
+     */
+    String getOperationName(Message message);
+
+    /**
+     * Set the operation name on a JMS Message
+     */
+    void setOperationName(String operationName, Message message);
+
+    /**
+     * Extracts the payload from a JMS Message
+     */
+    Object extractPayloadFromJMSMessage(Message msg);
+
+    /**
+     * Create a JMS Message containing the payload
+     */
+    Message insertPayloadIntoJMSMessage(Session session, Object payload);
+
+    /**
+     * Create a JMS Message for reporting an exception
+     */
+    Message createFaultMessage(Session session, Throwable responsePayload);
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
new file mode 100644
index 0000000000..699b1cb176
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
@@ -0,0 +1,75 @@
+/*
+ * 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.Constructor;
+
+import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
+
+/**
+ * Utility methods to load JMS message processors.
+ * 
+ * @version $Rev: $ $Date: $
+ */
+public class JMSMessageProcessorUtil {
+
+    /**
+     * Used to create instances of the JMSResourceFactory and RequestMessageProcessor and ResponseMessageProcessor from 
+     * string based class name provided in the configuration
+     * 
+     * @param cl ClassLoader
+     * @param className the string based class name to load and instantiate
+     * @return the new object
+     */
+    private static Object instantiate(ClassLoader cl, String className, JMSBinding binding) {
+        Object instance;
+        if (cl == null) {
+            cl = binding.getClass().getClassLoader();
+        }
+
+        try {
+            Class<?> clazz;
+
+            try {
+                clazz = cl.loadClass(className);
+            } catch (ClassNotFoundException e) {
+                clazz = binding.getClass().getClassLoader().loadClass(className);
+            }
+
+            Constructor<?> constructor = clazz.getDeclaredConstructor(new Class[] {JMSBinding.class});
+            instance = constructor.newInstance(binding);
+
+        } catch (Throwable e) {
+            throw new JMSBindingException("Exception instantiating OperationAndDataBinding class", e);
+        }
+
+        return instance;
+    }
+
+    public static JMSMessageProcessor getRequestMessageProcessor(JMSBinding binding) {
+        return (JMSMessageProcessor)instantiate(null, binding.getRequestMessageProcessorName(), binding);
+    }
+
+    public static JMSMessageProcessor getResponseMessageProcessor(JMSBinding binding) {
+        return (JMSMessageProcessor)instantiate(null, binding.getResponseMessageProcessorName(), binding);
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
new file mode 100644
index 0000000000..a1308d98cf
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
@@ -0,0 +1,220 @@
+/*
+ * 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.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$ $Date$
+ */
+public class JMSResourceFactory {
+
+    private String initialContextFactoryName;
+    private String connectionFactoryName = "ConnectionFactory";
+    private String jndiURL;
+
+    private Connection connection;
+    private Context context;
+    private boolean isConnectionStarted;
+
+    public JMSResourceFactory(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.binding.jms.JMSResourceFactory#getConnection()
+     */
+    public Connection getConnection() throws NamingException, JMSException {
+        if (connection == null) {
+            createConnection();
+        }
+        return connection;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession()
+     */
+    public Session createSession() throws JMSException, NamingException {
+        return getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#startConnection()
+     */
+    public void startConnection() throws JMSException, NamingException {
+        if (!isConnectionStarted) {
+            getConnection().start();
+            isConnectionStarted = true;
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.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;
+                }
+            }
+        }
+    }
+
+    private void createConnection() throws NamingException, JMSException {
+        ConnectionFactory connectionFactory = (ConnectionFactory)jndiLookUp(connectionFactoryName);
+        if (connectionFactory == null) {
+            throw new JMSBindingException("connection factory not found: " + connectionFactoryName);
+        }
+        connection = connectionFactory.createConnection();
+    }
+
+    private 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
+     */
+    private 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");
+            }
+        }
+    }
+
+    public Destination lookupDestination(String destName) throws NamingException {
+        if (JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(destName)) {
+            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;
+    }
+
+    /**
+     * 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 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 (NamingException ex) {
+            // ignore
+        }
+        if (o == null) {
+            try {
+                o = getInitialContext().lookup(name);
+            } catch (NamingException ex) {
+                // ignore
+            }
+        }
+        return o;
+    }
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
new file mode 100644
index 0000000000..e9ae3cecaa
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
@@ -0,0 +1,75 @@
+/*
+ * 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.io.Serializable;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
+
+import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
+
+/**
+ * MessageProcessor for sending/receiving Serializable objects with the JMSBinding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ObjectMessageProcessor extends AbstractMessageProcessor {
+
+    public ObjectMessageProcessor(JMSBinding jmsBinding) {
+        super(jmsBinding);
+    }
+
+    @Override
+    protected Object[] extractPayload(Message msg) {
+        try {
+
+            Object o = ((ObjectMessage)msg).getObject();
+            if (o != null && o.getClass().isArray()) {
+                return (Object[])o;
+            } else {
+                return new Object[] { o};
+            }
+
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+    @Override
+    protected Message createJMSMessage(Session session, Object o) {
+        try {
+
+            if (!(o instanceof Serializable)) {
+                throw new IllegalStateException("JMS ObjectMessage payload not Serializable: " + o);
+            }
+
+            ObjectMessage message = session.createObjectMessage();
+            message.setObject((Serializable)o);
+            return message;
+
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
new file mode 100644
index 0000000000..d8490c6223
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
@@ -0,0 +1,68 @@
+/*
+ * 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.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
+
+/**
+ * MessageProcessor for sending/receiving javax.jms.TextMessage with the JMSBinding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class TextMessageProcessor extends AbstractMessageProcessor {
+
+    public TextMessageProcessor(JMSBinding jmsBinding) {
+        super(jmsBinding);
+    }
+
+    @Override
+    protected Object[] extractPayload(Message msg) {
+        try {
+
+            if (!(msg instanceof TextMessage)) {
+                throw new IllegalStateException("expecting JMS TextMessage: " + msg);
+            }
+
+            return new Object[] {((TextMessage)msg).getText()};
+
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+    @Override
+    protected Message createJMSMessage(Session session, Object o) {
+        try {
+
+            TextMessage message = session.createTextMessage();
+            message.setText(String.valueOf(o));
+            return message;
+
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
new file mode 100644
index 0000000000..88dd41cc57
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
@@ -0,0 +1,90 @@
+/*
+ * 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.io.StringReader;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
+
+/**
+ * MessageProcessor for sending/receiving XML javax.jms.TextMessage with the JMSBinding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class XMLTextMessageProcessor extends AbstractMessageProcessor {
+
+    public XMLTextMessageProcessor(JMSBinding jmsBinding) {
+        super(jmsBinding);
+    }
+
+    @Override
+    protected Object[] extractPayload(Message msg) {
+        try {
+
+            String xml = ((TextMessage)msg).getText();
+            Object[] os;
+            if (xml != null) {
+                XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
+                StAXOMBuilder builder = new StAXOMBuilder(reader);
+                os = new Object[] {builder.getDocumentElement()};
+            } else {
+                os = new Object[] {};
+            }
+            return os;
+
+        } catch (XMLStreamException e) {
+            throw new JMSBindingException(e);
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+    @Override
+    protected Message createJMSMessage(Session session, Object o) {
+        try {
+
+            TextMessage message = session.createTextMessage();
+
+            if (o instanceof OMElement) {
+                message.setText(o.toString());
+            } else if ((o instanceof Object[]) && ((Object[])o)[0] instanceof OMElement) {
+                message.setText(((Object[])o)[0].toString());
+            } else if (o != null) {
+                throw new IllegalStateException("expecting OMElement payload: " + o);
+            }
+
+            return message;
+
+        } catch (JMSException e) {
+            throw new JMSBindingException(e);
+        }
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-android/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
new file mode 100644
index 0000000000..dec0991984
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
@@ -0,0 +1,19 @@
+# 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. 

+

+# Implementation class for the binding extension

+org.apache.tuscany.sca.binding.jms.provider.JMSBindingProviderFactory;model=org.apache.tuscany.sca.binding.jms.impl.JMSBinding

diff --git a/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..fb80362457
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
@@ -0,0 +1,43 @@
+/*
+ * 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 org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ *
+ * @version $Rev$ $Date$
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldClientImpl implements HelloWorldService {
+
+    private HelloWorldService serviceA;
+
+    @Reference
+    public void setServiceA(HelloWorldService service) {
+        this.serviceA = service;
+    }
+
+    public String sayHello(String name) {
+        return serviceA.sayHello(name);
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
new file mode 100644
index 0000000000..515da3144a
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
@@ -0,0 +1,31 @@
+/*
+ * 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 org.osoa.sca.annotations.Remotable;
+
+/**
+ * Interface for the HelloWorld Service.
+ *
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface HelloWorldService {
+    String sayHello(String name);
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..a8808c1bd1
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+/**
+ * Implementation of the HelloWorldService.
+ *
+ * @version $Rev$ $Date$
+ */
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    public String sayHello(String name) {
+        return "jmsHello " + name;
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
new file mode 100644
index 0000000000..03cc0bf1c4
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
@@ -0,0 +1,238 @@
+/*

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

+

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

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

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

+import org.apache.tuscany.sca.interfacedef.Interface;

+import org.apache.tuscany.sca.interfacedef.InterfaceContract;

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

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

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

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

+import org.easymock.EasyMock;

+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 JMSBindingListener bindingListener = new JMSBindingListener(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;

+    }

+}

diff --git a/branches/sca-android/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/branches/sca-android/modules/binding-jms-runtime/src/test/resources/simple/client.composite
new file mode 100644
index 0000000000..dcea428493
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/test/resources/simple/client.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * 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.    

+ -->

+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

+           name="RPCComposite">

+

+    <component name="HelloWorldClient">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

+        <reference name="serviceA" />

+    </component>

+

+    <reference name="serviceA" promote="HelloWorldClient/serviceA">

+        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

+        <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

+            <destination name="DestQueueA"/>

+            <response>

+               <destination name="RespQueueA"/>

+            </response>

+        </binding.jms>  

+    </reference>

+

+</composite>

diff --git a/branches/sca-android/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/branches/sca-android/modules/binding-jms-runtime/src/test/resources/simple/service.composite
new file mode 100644
index 0000000000..44b7b29610
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/src/test/resources/simple/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * 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.    

+ -->

+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

+           name="RPCComposite">

+

+    <component name="HelloWorldService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

+        <service name="HelloWorldService">

+            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

+               <destination name="DestQueueA" create="always"/>

+               <response>

+                  <destination name="RespQueueA" create="always"/>

+               </response>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/branches/sca-android/modules/binding-jms/LICENSE b/branches/sca-android/modules/binding-jms/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/LICENSE
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+
diff --git a/branches/sca-android/modules/binding-jms/NOTICE b/branches/sca-android/modules/binding-jms/NOTICE
new file mode 100644
index 0000000000..fdfa0e9faa
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/branches/sca-android/modules/binding-jms/pom.xml b/branches/sca-android/modules/binding-jms/pom.xml
new file mode 100644
index 0000000000..21535235fb
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-binding-jms</artifactId>
+    <name>Apache Tuscany SCA JMS Binding Model</name>
+
+    <dependencies>
+            
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${tuscany.version}</Bundle-Version>
+                        <Bundle-SymbolicName>org.apache.tuscany.sca.binding.jms</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.binding.jms*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
new file mode 100644
index 0000000000..bd493bb658
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
@@ -0,0 +1,572 @@
+/*
+ * 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.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.tuscany.sca.assembly.Binding;
+
+/**
+ * Models a binding to a JMS resource.
+ *
+ * @version $Rev$ $Date$
+ */
+
+public class JMSBinding implements Binding {
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+
+    // properties required to implement the Tuscany binding extension SPI
+    private String uri = null;
+    private String name = null;
+    private boolean unresolved = false;
+    private List<Object> extensions = new ArrayList<Object>();
+
+    // Properties required to describe the JMS binding model
+
+    private String correlationScheme = JMSBindingConstants.CORRELATE_MSG_ID;
+    private String initialContextFactoryName;
+    private String jndiURL;
+
+    private String destinationName = JMSBindingConstants.DEFAULT_DESTINATION_NAME;
+    private String destinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE;
+    private String destinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
+
+    private String connectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
+    private String connectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
+
+    private String activationSpecName = null;
+    private String activationSpecCreate = null;
+
+    private String responseActivationSpecName = null;
+    private String responseActivationSpecCreate = null;
+
+    private String responseDestinationName = JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME;
+    private String responseDestinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE;
+    private String responseDestinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
+
+    private String responseConnectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
+    private String responseConnectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
+
+    // Provides the name of the factory that interfaces to the JMS API for us.
+    private String jmsResourceFactoryName = JMSBindingConstants.DEFAULT_RF_CLASSNAME;
+
+    // Message processors used to deal with the request and response messages
+    public String requestMessageProcessorName = JMSBindingConstants.DEFAULT_MP_CLASSNAME;
+    public String responseMessageProcessorName = JMSBindingConstants.DEFAULT_MP_CLASSNAME;
+
+    // The JMS message property used to hold the name of the operation being called
+    private String operationSelectorPropertyName = JMSBindingConstants.DEFAULT_OPERATION_PROP_NAME;
+
+    // If the operation selector is derived automatically from the service interface it's stored here
+    private String operationSelectorName = null;
+
+    private String replyTo;
+    private String jmsType;
+    private String jmsCorrelationId;
+    private Boolean deliveryModePersistent;
+    private Long timeToLive;
+    private Integer jmsPriority;
+
+    private Map<String, Object> properties = new HashMap<String, Object>();
+    private Map<String, Map<String, Object>> operationProperties = new HashMap<String, Map<String,Object>>();
+    private Map<String, String> nativeOperationNames = new HashMap<String, String>();
+    private Map<String, String> operationJMSTypes = new HashMap<String, String>();
+    private Map<String, String> operationJMSCorrelationIds = new HashMap<String, String>();
+    private Map<String, Boolean> operationJMSDeliveryModes = new HashMap<String, Boolean>();
+    private Map<String, Long> operationJMSTimeToLives = new HashMap<String, Long>();
+    private Map<String, Integer> operationJMSPriorities = new HashMap<String, Integer>();
+    private String jmsSelector;
+    private String requestConnectionName;
+    private String responseConnectionName;
+    private JMSBinding requestConnectionBinding;
+    private JMSBinding responseConnectionBinding;
+    
+    public JMSBinding() {
+        super();
+    }
+
+    /**
+     * Returns the binding URI.
+     * 
+     * @return the binding URI
+     */
+    public String getURI() {
+        return this.uri;
+    }
+
+    /**
+     * Sets the binding URI.
+     * 
+     * @param uri the binding URI
+     */
+    public void setURI(String uri) {
+        this.uri = uri;
+    }
+
+    /**
+     * Returns the binding name.
+     * 
+     * @return the binding name
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Sets the binding name.
+     * 
+     * @param name the binding name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isUnresolved() {
+        return this.unresolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unresolved = unresolved;
+    }
+
+    public List<Object> getExtensions() {
+        return extensions;
+    }
+
+    // Methods for getting/setting JMS binding model information
+    // as derived from the XML of the binding.jms element
+
+    public void setCorrelationScheme(String correlationScheme) {
+        this.correlationScheme = correlationScheme;
+    }
+
+    public String getCorrelationScheme() {
+        return correlationScheme;
+    }
+
+    public String getInitialContextFactoryName() {
+        return initialContextFactoryName;
+    }
+
+    public void setInitialContextFactoryName(String initialContextFactoryName) {
+        this.initialContextFactoryName = initialContextFactoryName;
+    }
+
+    public String getJndiURL() {
+        return this.jndiURL;
+    }
+
+    public void setJndiURL(String jndiURL) {
+        this.jndiURL = jndiURL;
+    }
+
+    public String getDestinationName() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getDestinationName() != null) {
+            return requestConnectionBinding.getDestinationName();
+        } else {
+            return destinationName;
+        }
+    }
+
+    public void setDestinationName(String destinationName) {
+        this.destinationName = destinationName;
+    }
+
+    public String getDestinationType() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getDestinationType() != null) {
+            return requestConnectionBinding.getDestinationType();
+        } else {
+            return destinationType;
+        }
+    }
+
+    public void setDestinationType(String destinationType) {
+        this.destinationType = destinationType;
+    }
+
+    public String getDestinationCreate() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getDestinationCreate() != null) {
+            return requestConnectionBinding.getDestinationCreate();
+        } else {
+            return this.destinationCreate;
+        }
+    }
+
+    public void setDestinationCreate(String create) {
+        this.destinationCreate = create;
+    }
+
+    public String getConnectionFactoryName() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getConnectionFactoryName() != null) {
+            return requestConnectionBinding.getConnectionFactoryName();
+        } else {
+            return connectionFactoryName;
+        }
+    }
+
+    public void setConnectionFactoryName(String connectionFactoryName) {
+        this.connectionFactoryName = connectionFactoryName;
+    }
+
+    public String getConnectionFactoryCreate() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getConnectionFactoryCreate() != null) {
+            return requestConnectionBinding.getConnectionFactoryCreate();
+        } else {
+            return this.connectionFactoryCreate;
+        }
+    }
+
+    public void setConnectionFactoryCreate(String create) {
+        this.connectionFactoryCreate = create;
+    }
+
+    public String getActivationSpecName() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getActivationSpecName() != null) {
+            return requestConnectionBinding.getActivationSpecName();
+        } else {
+            return activationSpecName;
+        }
+    }
+
+    public void setActivationSpecName(String activationSpecName) {
+        this.activationSpecName = activationSpecName;
+    }
+
+    public String getActivationSpecCreate() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getActivationSpecCreate() != null) {
+            return requestConnectionBinding.getActivationSpecCreate();
+        } else {
+            return this.activationSpecCreate;
+        }
+    }
+
+    public void setActivationSpecCreate(String create) {
+        this.activationSpecCreate = create;
+    }
+
+    public String getResponseDestinationName() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getResponseDestinationName() != null) {
+            return requestConnectionBinding.getResponseDestinationName();
+        } else {
+            return this.responseDestinationName;
+        }
+    }
+
+    public void setResponseDestinationName(String name) {
+        this.responseDestinationName = name;
+    }
+
+    public String getResponseDestinationType() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getResponseDestinationType() != null) {
+            return requestConnectionBinding.getResponseDestinationType();
+        } else {
+            return this.responseDestinationType;
+        }
+    }
+
+    public void setResponseDestinationType(String type) {
+        this.responseDestinationType = type;
+    }
+
+    public String getResponseDestinationCreate() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getResponseDestinationCreate() != null) {
+            return requestConnectionBinding.getResponseDestinationCreate();
+        } else {
+            return this.responseDestinationCreate;
+        }
+    }
+
+    public void setResponseDestinationCreate(String create) {
+        this.responseDestinationCreate = create;
+    }
+
+    public String getResponseConnectionFactoryName() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getResponseConnectionFactoryName() != null) {
+            return requestConnectionBinding.getResponseConnectionFactoryName();
+        } else {
+            return responseConnectionFactoryName;
+        }
+    }
+
+    public void setResponseConnectionFactoryName(String connectionFactoryName) {
+        this.responseConnectionFactoryName = connectionFactoryName;
+    }
+
+    public String getResponseConnectionFactoryCreate() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getResponseConnectionFactoryCreate() != null) {
+            return requestConnectionBinding.getResponseConnectionFactoryCreate();
+        } else {
+            return this.responseConnectionFactoryCreate;
+        }
+    }
+
+    public void setResponseConnectionFactoryCreate(String create) {
+        this.responseConnectionFactoryCreate = create;
+    }
+
+    public String getResponseActivationSpecName() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getResponseActivationSpecName() != null) {
+            return requestConnectionBinding.getResponseActivationSpecName();
+        } else {
+            return responseActivationSpecName;
+        }
+    }
+
+    public void setResponseActivationSpecName(String activationSpecName) {
+        this.responseActivationSpecName = activationSpecName;
+    }
+
+    public String getResponseActivationSpecCreate() {
+        if (requestConnectionBinding != null && requestConnectionBinding.getResponseActivationSpecCreate() != null) {
+            return requestConnectionBinding.getResponseActivationSpecCreate();
+        } else {
+            return this.responseActivationSpecCreate;
+        }
+    }
+
+    public void setResponseActivationSpecCreate(String create) {
+        this.responseActivationSpecCreate = create;
+    }
+
+    public String getJmsResourceFactoryName() {
+        return jmsResourceFactoryName;
+    }
+
+    public void setJmsResourceFactoryName(String jmsResourceFactoryName) {
+        this.jmsResourceFactoryName = jmsResourceFactoryName;
+    }
+
+    public void setRequestMessageProcessorName(String name) {
+        this.requestMessageProcessorName = name;
+    }
+
+    public String getRequestMessageProcessorName() {
+        return requestMessageProcessorName;
+    }
+
+    public void setResponseMessageProcessorName(String name) {
+        this.responseMessageProcessorName = name;
+    }
+
+    public String getResponseMessageProcessorName() {
+        return responseMessageProcessorName;
+    }
+
+    public String getOperationSelectorPropertyName() {
+        return operationSelectorPropertyName;
+    }
+
+    public void setOperationSelectorPropertyName(String operationSelectorPropertyName) {
+        this.operationSelectorPropertyName = operationSelectorPropertyName;
+    }
+
+    public String getOperationSelectorName() {
+        return operationSelectorName;
+    }
+
+    public void setOperationSelectorName(String operationSelectorName) {
+        this.operationSelectorName = operationSelectorName;
+    }
+
+    public String getReplyTo() {
+        return replyTo;
+    }
+
+    public void setReplyTo(String replyTo) {
+        this.replyTo = replyTo;
+    }
+
+    public String getJMSType() {
+        return jmsType;
+    }
+    public void setJMSType(String jmsType) {
+        this.jmsType = jmsType;
+    }
+
+    public String getJMSCorrelationId() {
+        return jmsCorrelationId;
+    }
+    
+    public void setJMSCorrelationId(String jmsCorrelationId) {
+        this.jmsCorrelationId = jmsCorrelationId;
+    }
+
+    public Boolean isdeliveryModePersistent() {
+        return deliveryModePersistent;
+    }
+    public void setJMSDeliveryMode(boolean persistent) {
+        this.deliveryModePersistent = Boolean.valueOf(persistent);
+    }
+
+    public Integer getJMSPriority() {
+        return jmsPriority;
+    }
+
+    public void setJMSPriority(int jmsPriority) {
+        this.jmsPriority = Integer.valueOf(jmsPriority);
+    }
+
+    public Long getJMSTimeToLive() {
+        return timeToLive.longValue();
+    }
+
+    public void setJMSTimeToLive(long timeToLive) {
+        this.timeToLive = Long.valueOf(timeToLive);
+    }
+
+    public Set<String> getPropertyNames() {
+        return properties.keySet();
+    }
+
+    public Object getProperty(String name) {
+        return properties.get(name);
+    }
+
+    public void setProperty(String name, Object value) {
+        properties.put(name, value);
+    }
+
+    public Map<String, Object> getOperationProperties(String opName) {
+        return operationProperties.get(opName);
+    }
+
+    public void setOperationProperty(String opName, String propName, Object value) {
+        Map<String, Object> props = operationProperties.get(opName);
+        if (props == null) {
+            props = new HashMap<String, Object>();
+            operationProperties.put(opName, props);
+        }
+        props.put(propName, value);
+    }
+
+    public boolean hasNativeOperationName(String opName) {
+        return nativeOperationNames.containsKey(opName);
+    }
+
+    public String getNativeOperationName(String opName) {
+        if (nativeOperationNames.containsKey(opName)) {
+            return nativeOperationNames.get(opName);
+        } else {
+            return opName;
+        }
+    }
+
+    public void setNativeOperationName(String opName, String nativeOpName) {
+        this.nativeOperationNames .put(opName, nativeOpName);
+    }
+
+    public String getOperationJMSType(String opName) {
+        if (operationJMSTypes.containsKey(opName)) {
+            return operationJMSTypes.get(opName);
+        } else {
+            return jmsType;
+        }
+    }
+    public void setOperationJMSType(String opName, String jmsType) {
+        this.operationJMSTypes.put(opName, jmsType);
+    }
+
+    public String getOperationJMSCorrelationId(String opName) {
+        if (operationJMSCorrelationIds.containsKey(opName)) {
+            return operationJMSCorrelationIds.get(opName);
+        } else {
+            return jmsCorrelationId;
+        }
+    }
+    public void setOperationJMSCorrelationId(String opName, String jmsCorrelationId) {
+        operationJMSCorrelationIds.put(opName, jmsCorrelationId);
+    }
+
+    public Boolean getOperationJMSDeliveryMode(String opName) {
+        if (operationJMSDeliveryModes.containsKey(opName)) {
+            return operationJMSDeliveryModes.get(opName);
+        } else {
+            return deliveryModePersistent;
+        }
+    }
+    public void setOperationJMSDeliveryMode(String opName, boolean b) {
+        operationJMSDeliveryModes.put(opName, b);
+    }
+
+    public Long getOperationJMSTimeToLive(String opName) {
+        if (operationJMSTimeToLives.containsKey(opName)) {
+            return operationJMSTimeToLives.get(opName);
+        } else {
+            return timeToLive;
+        }
+    }
+    public void setOperationJMSTimeToLive(String opName, Long ttl) {
+        operationJMSTimeToLives.put(opName, ttl);
+    }
+
+    public Integer getOperationJMSPriority(String opName) {
+        if (operationJMSPriorities.containsKey(opName)) {
+            return operationJMSPriorities.get(opName);
+        } else {
+            return jmsPriority;
+        }
+    }
+    public void setOperationJMSPriority(String opName, int p) {
+        operationJMSPriorities.put(opName, p);
+    }
+
+    public String getJMSSelector() {
+        return jmsSelector;
+    }
+    public void setJMSSelector(String jmsSelector) {
+        this.jmsSelector = jmsSelector;
+    }
+
+    public String getRequestConnectionName() {
+        return requestConnectionName;
+    }
+
+    public void setRequestConnectionName(String requestConnectionName) {
+        this.requestConnectionName = requestConnectionName;
+    }
+
+    public void setResponseConnectionName(String responseConnectionName) {
+        this.responseConnectionName = responseConnectionName;
+    }
+    public String getResponseConnectionName() {
+        return responseConnectionName;
+    }
+
+    public void setRequestConnectionBinding(JMSBinding binding) {
+        this.requestConnectionBinding = binding;
+    }
+    public JMSBinding getRequestConnectionBinding() {
+        return requestConnectionBinding;
+    }
+
+    public void setResponseConnectionBinding(JMSBinding binding) {
+        this.responseConnectionBinding = binding;
+    }
+    public JMSBinding getResponseConnectionBinding() {
+        return responseConnectionBinding;
+    }
+}
diff --git a/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
new file mode 100644
index 0000000000..7317c2118d
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
@@ -0,0 +1,72 @@
+/*
+ * 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.impl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.xml.Constants;
+
+/**
+ * Constants for the JMS binding.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface JMSBindingConstants {
+
+    // Constants used when describing the JMS binding
+    // model and for setting up defaults
+    String BINDING_JMS = "binding.jms";
+    QName BINDING_JMS_QNAME = new QName(Constants.SCA10_NS, BINDING_JMS);
+    String CORRELATE_MSG_ID = "requestmsgidtocorrelid";
+    String CORRELATE_CORRELATION_ID = "requestcorrelidtocorrelid";
+    String CORRELATE_NONE = "none";
+    List<String> VALID_CORRELATION_SCHEMES =
+        Arrays.asList(new String[] {CORRELATE_MSG_ID, CORRELATE_CORRELATION_ID, CORRELATE_NONE});
+    String DESTINATION_TYPE_QUEUE = "queue"; // 0
+    String DESTINATION_TYPE_TOPIC = "topic"; // 1
+    List<String> VALID_DESTINATION_TYPES =
+        Arrays.asList(new String[] {DESTINATION_TYPE_QUEUE, DESTINATION_TYPE_TOPIC});
+    String CREATE_ALWAYS = "always";
+    String CREATE_NEVER = "never";
+    String CREATE_IF_NOT_EXIST = "ifnotexist";
+    String DEFAULT_DESTINATION_NAME = "NODESTINATION";
+    String DEFAULT_RESPONSE_DESTINATION_NAME = "NORESPONSEDESTINATION";
+    String DEFAULT_CONNECTION_FACTORY_NAME = "ConnectionFactory";
+    String DEFAULT_CONTEXT_FACTORY_NAME = "org.apache.activemq.jndi.ActiveMQInitialContextFactory";
+    String DEFAULT_JNDI_URL = "tcp://localhost:61616";
+    int DEFAULT_TIME_TO_LIVE = 20000; // in milliseconds
+    int DEFAULT_PRIORITY = 1;
+    int NON_PERSISTENT = 1; // Maps to javax.jms.DeliveryMode
+    String DEFAULT_RF_CLASSNAME = "org.apache.tuscany.sca.host.jms.activemq.JMSResourceFactoryImpl";
+    String XML_MP_CLASSNAME = "org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor";
+    String TEXT_MP_CLASSNAME = "org.apache.tuscany.sca.binding.jms.provider.TextMessageProcessor";
+    String OBJECT_MP_CLASSNAME = "org.apache.tuscany.sca.binding.jms.provider.ObjectMessageProcessor";
+    String DEFAULT_MP_CLASSNAME = XML_MP_CLASSNAME;
+    String DEFAULT_OPERATION_PROP_NAME = "scaOperationName";
+
+    String FAULT_PROPERTY = "org_apache_tuscany_sca_fault";
+    
+    String CALLBACK_ID_PROPERTY = "CallbackID";
+    String CALLBACK_Q_PROPERTY = "scaCallbackQueue ";
+    String CONVERSATION_ID_PROPERTY = "scaConversationId";
+
+}
diff --git a/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
new file mode 100644
index 0000000000..0928e02082
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
@@ -0,0 +1,45 @@
+/*
+ * 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.impl;
+
+/**
+ * Base exception for the JMSBinding.
+ *
+ * @version $Rev$ $Date$
+ */
+public class JMSBindingException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    public JMSBindingException() {
+        super();
+    }
+
+    public JMSBindingException(String arg0, Throwable arg1) {
+        super(arg0, arg1);
+    }
+
+    public JMSBindingException(String arg0) {
+        super(arg0);
+    }
+
+    public JMSBindingException(Throwable arg0) {
+        super(arg0);
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
new file mode 100644
index 0000000000..2fa7ea057b
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
@@ -0,0 +1,684 @@
+/*
+ * 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.impl;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+/**
+ * A processor to read the XML that describes the JMS binding...
+ * 
+ * <binding.jms correlationScheme="string"?
+ *              initialContextFactory="xs:anyURI"?
+ *              jndiURL="xs:anyURI"?
+ *              requestConnection="QName"?
+ *              responseConnection="QName"?
+ *              operationProperties="QName"?
+ *              ...>
+ * 
+ *     <destination name="xs:anyURI" type="string"? create="string"?>
+ *         <property name="NMTOKEN" type="NMTOKEN">*
+ *     </destination>?
+ * 
+ *     <connectionFactory name="xs:anyURI" create="string"?>
+ *         <property name="NMTOKEN" type="NMTOKEN">*
+ *     </connectionFactory>?
+ * 
+ *     <activationSpec name="xs:anyURI" create="string"?>
+ *         <property name="NMTOKEN" type="NMTOKEN">*
+ *     </activationSpec>?
+ * 
+ *     <response>
+ *         <destination name="xs:anyURI" type="string"? create="string"?>
+ *             <property name="NMTOKEN" type="NMTOKEN">*
+ *         </destination>?
+ * 
+ *         <connectionFactory name="xs:anyURI" create="string"?>
+ *             <property name="NMTOKEN" type="NMTOKEN">*
+ *         </connectionFactory>?
+ * 
+ *         <activationSpec name="xs:anyURI" create="string"?>
+ *             <property name="NMTOKEN" type="NMTOKEN">*
+ *         </activationSpec>?
+ *     </response>?
+ * 
+ *     <complexType name="SubscriptionHeaders"> 
+ *         <attribute name="JMSSelector" type="string"/> 
+ *     </complexType>
+ *
+ *     <resourceAdapter name="NMTOKEN">?
+ *         <property name="NMTOKEN" type="NMTOKEN">*
+ *     </resourceAdapter>?
+ * 
+ *     <headers JMSType="string"?
+ *              JMSCorrelationId="string"?
+ *              JMSDeliveryMode="string"?
+ *              JMSTimeToLive="int"?
+ *              JMSPriority="string"?>
+ *         <property name="NMTOKEN" type="NMTOKEN">*
+ *     </headers>?
+ * 
+ *     <operationProperties name="string" nativeOperation="string"?>
+ *         <property name="NMTOKEN" type="NMTOKEN">*
+ *         <headers JMSType="string"?
+ *                  JMSCorrelationId="string"?
+ *                  JMSDeliveryMode="string"?
+ *                  JMSTimeToLive="int"?
+ *                  JMSPriority="string"?>
+ *             <property name="NMTOKEN" type="NMTOKEN">*
+ *         </headers>?
+ *     </operationProperties>*
+ * </binding.jms>
+ *
+ * @version $Rev$ $Date$
+ */
+
+public class JMSBindingProcessor implements StAXArtifactProcessor<JMSBinding> {
+
+    private PolicyFactory policyFactory;
+    private PolicyAttachPointProcessor policyProcessor;
+    private Monitor monitor;
+
+    public JMSBindingProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
+        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+        this.monitor = monitor;
+    }
+    
+    /**
+     * Report a error.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+    */
+    private void warning(String message, Object model, Object... messageParameters) {
+        if (monitor != null) {
+            Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
+    	    monitor.problem(problem);
+        }        
+    }
+     
+    /**
+      * Report a error.
+      * 
+      * @param problems
+      * @param message
+      * @param model
+    */
+    private void error(String message, Object model, Object... messageParameters) {
+        if (monitor != null) {
+            Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+     	    monitor.problem(problem);
+        }        
+    }
+
+    public QName getArtifactType() {
+        return JMSBindingConstants.BINDING_JMS_QNAME;
+    }
+
+    public Class<JMSBinding> getModelType() {
+        return JMSBinding.class;
+    }
+
+    public JMSBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+        JMSBinding jmsBinding = new JMSBinding();
+
+        // Read policies
+        policyProcessor.readPolicies(jmsBinding, reader);
+
+        // Read binding name
+        String name = reader.getAttributeValue(null, "name");
+        if (name != null) {
+            jmsBinding.setName(name);
+        }
+
+        // Read binding URI
+        String uri = reader.getAttributeValue(null, "uri");
+        if (uri != null && uri.length() > 0) {
+            parseURI(uri, jmsBinding);
+        }
+
+        // Read correlation scheme
+        String correlationScheme = reader.getAttributeValue(null, "correlationScheme");
+        if (correlationScheme != null && correlationScheme.length() > 0) {
+            if (JMSBindingConstants.VALID_CORRELATION_SCHEMES.contains(correlationScheme.toLowerCase())) {
+                jmsBinding.setCorrelationScheme(correlationScheme);
+            } else {
+            	error("InvalidCorrelationScheme", reader, correlationScheme);
+            }
+        }
+
+        // Read initial context factory
+        String initialContextFactory = reader.getAttributeValue(null, "initialContextFactory");
+        if (initialContextFactory != null && initialContextFactory.length() > 0) {
+            jmsBinding.setInitialContextFactoryName(initialContextFactory);
+        }
+
+        // Read JNDI URL
+        String jndiURL = reader.getAttributeValue(null, "jndiURL");
+        if (jndiURL != null && jndiURL.length() > 0) {
+            jmsBinding.setJndiURL(jndiURL);
+        }
+
+        // Read message processor class name
+        String messageProcessorName = reader.getAttributeValue(null, "messageProcessor");
+        if (messageProcessorName != null && messageProcessorName.length() > 0) {
+            if ("XMLTextMessage".equalsIgnoreCase(messageProcessorName)) {
+                messageProcessorName = JMSBindingConstants.XML_MP_CLASSNAME;
+            } else if ("TextMessage".equalsIgnoreCase(messageProcessorName)) {
+                messageProcessorName = JMSBindingConstants.TEXT_MP_CLASSNAME;
+            } else if ("ObjectMessage".equalsIgnoreCase(messageProcessorName)) {
+                messageProcessorName = JMSBindingConstants.OBJECT_MP_CLASSNAME;
+            }
+            jmsBinding.setRequestMessageProcessorName(messageProcessorName);
+            jmsBinding.setResponseMessageProcessorName(messageProcessorName);
+
+        }
+
+        String requestConnectionName = reader.getAttributeValue(null, "requestConnection");
+        if (requestConnectionName != null && requestConnectionName.length() > 0) {
+            jmsBinding.setRequestConnectionName(requestConnectionName);
+        }
+        String responseConnectionName = reader.getAttributeValue(null, "responseConnection");
+        if (responseConnectionName != null && responseConnectionName.length() > 0) {
+            jmsBinding.setResponseConnectionName(responseConnectionName);
+        }
+
+        // Read sub-elements of binding.jms
+        boolean endFound = false;
+        while (!endFound) {
+            int fg = reader.next();
+            switch (fg) {
+                case START_ELEMENT:
+                    String elementName = reader.getName().getLocalPart();
+                    if ("destination".equals(elementName)) {
+                        parseDestination(reader, jmsBinding);
+                    } else if ("connectionFactory".equals(elementName)) {
+                        parseConnectionFactory(reader, jmsBinding);
+                    } else if ("activationSpec".equals(elementName)) {
+                        parseActivationSpec(reader, jmsBinding);
+                    } else if ("response".equals(elementName)) {
+                        parseResponse(reader, jmsBinding);
+                    } else if ("resourceAdapter".equals(elementName)) {
+                        parseResourceAdapter(reader, jmsBinding);
+                    } else if ("headers".equals(elementName)) {
+                        parseHeaders(reader, jmsBinding);
+                    } else if ("operationProperties".equals(elementName)) {
+                        parseOperationProperties(reader, jmsBinding);
+                    } else if ("SubscriptionHeaders".equals(elementName)) {
+                        parseSubscriptionHeaders(reader, jmsBinding);
+                    }
+                    reader.next();
+                    break;
+                case END_ELEMENT:
+                    QName x = reader.getName();
+                    if (x.equals(JMSBindingConstants.BINDING_JMS_QNAME)) {
+                        endFound = true;
+                    } else {
+                    	error("UnexpectedElement", reader, x.toString());
+                    }
+            }
+        }
+
+        validate();
+
+        return jmsBinding;
+    }
+
+    protected void parseURI(String uri, JMSBinding jmsBinding) {
+        if (!uri.startsWith("jms:")) {
+        	error("MustStartWithSchema", jmsBinding, uri);
+        	return;
+        }
+        int i = uri.indexOf('?');            
+        if (i >= 0) {
+        	StringTokenizer st = new StringTokenizer(uri.substring(i+1),"&");
+        	while (st.hasMoreTokens()) {
+        	    String s = st.nextToken();
+        	    if (s.startsWith("connectionFactoryName=")) {
+        	        jmsBinding.setConnectionFactoryName(s.substring(22));
+        	    } else {
+        	        error("UnknownTokenInURI", jmsBinding, s, uri);
+        	        //throw new JMSBindingException("unknown token '" + s + "' in uri: " + uri);
+                 	return;
+        	     }
+        	}
+        	jmsBinding.setDestinationName(uri.substring(4, i));
+        } else {
+           jmsBinding.setDestinationName(uri.substring(4));
+        }
+    }
+
+    public void resolve(JMSBinding model, ModelResolver resolver) throws ContributionResolveException {
+        if (model.getRequestConnectionName() != null) {
+            model.setRequestConnectionBinding(getConnectionBinding(model.getRequestConnectionName(), resolver));
+        }
+        if (model.getResponseConnectionName() != null) {
+            model.setResponseConnectionBinding(getConnectionBinding(model.getResponseConnectionName(), resolver));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private JMSBinding getConnectionBinding(String bindingName, ModelResolver resolver) {
+        if (resolver instanceof ExtensibleModelResolver) {
+            DefaultModelResolver dr = (DefaultModelResolver)((ExtensibleModelResolver) resolver).getDefaultModelResolver();
+            Map models = dr.getModels();
+            for (Object o : models.keySet()) {
+                if (o instanceof JMSBinding) {
+                    JMSBinding binding = (JMSBinding) o;
+                    if (bindingName.equals(binding.getName())) {
+                        return binding;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public void write(JMSBinding rmiBinding, XMLStreamWriter writer) throws ContributionWriteException,
+        XMLStreamException {
+        // Write a <binding.jms>
+        writer.writeStartElement(Constants.SCA10_NS, JMSBindingConstants.BINDING_JMS);
+
+        // FIXME Implement
+
+        writer.writeEndElement();
+    }
+
+    private void parseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+        String name = reader.getAttributeValue(null, "name");
+        if (name != null && name.length() > 0) {
+            jmsBinding.setDestinationName(name);
+        }
+
+        String type = reader.getAttributeValue(null, "type");                
+        if (type != null && type.length() > 0) {
+        	warning("DoesntProcessDestinationType", jmsBinding);
+            if (JMSBindingConstants.DESTINATION_TYPE_QUEUE.equalsIgnoreCase(type)) {
+                jmsBinding.setDestinationType(JMSBindingConstants.DESTINATION_TYPE_QUEUE);
+            } else if (JMSBindingConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(type)) {
+                jmsBinding.setDestinationType(JMSBindingConstants.DESTINATION_TYPE_TOPIC);
+            } else {
+            	warning("InvalidDestinationType", reader, type);
+            }            
+        }
+
+        String create = reader.getAttributeValue(null, "create");
+        if (create != null && create.length() > 0) {
+            jmsBinding.setDestinationCreate(create);
+        }
+    }
+
+    private void parseConnectionFactory(XMLStreamReader reader, JMSBinding jmsBinding) {
+        String name = reader.getAttributeValue(null, "name");
+        if (name != null && name.length() > 0) {
+            jmsBinding.setConnectionFactoryName(name);
+        } else {
+        	error("MissingConnectionFactoryName", reader);
+        }
+    }
+
+    private void parseActivationSpec(XMLStreamReader reader, JMSBinding jmsBinding) {
+        String name = reader.getAttributeValue(null, "name");        
+        if (name != null && name.length() > 0) {
+        	warning("DoesntProcessActivationSpec", jmsBinding);
+            jmsBinding.setActivationSpecName(name);            
+        } else {
+        	warning("MissingActivationSpecName", reader);
+        }
+    }
+
+    private void parseResponseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+        String name = reader.getAttributeValue(null, "name");
+        if (name != null && name.length() > 0) {
+            jmsBinding.setResponseDestinationName(name);
+        }
+
+        String type = reader.getAttributeValue(null, "type");        
+        if (type != null && type.length() > 0) {
+        	warning("DoesntProcessResponseDestinationType", jmsBinding);
+        	if (JMSBindingConstants.DESTINATION_TYPE_QUEUE.equalsIgnoreCase(type)) {
+                jmsBinding.setResponseDestinationType(JMSBindingConstants.DESTINATION_TYPE_QUEUE);
+            } else if (JMSBindingConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(type)) {
+                jmsBinding.setResponseDestinationType(JMSBindingConstants.DESTINATION_TYPE_TOPIC);
+            } else {
+            	warning("InvalidResponseDestinationType", reader, type);
+            }            
+        }
+
+        String create = reader.getAttributeValue(null, "create");
+        if (create != null && create.length() > 0) {
+            jmsBinding.setResponseDestinationCreate(create);
+        }
+    }
+
+    private void parseResponseConnectionFactory(XMLStreamReader reader, JMSBinding jmsBinding) {
+        String name = reader.getAttributeValue(null, "name");
+        if (name != null && name.length() > 0) {
+        	warning("DoesntProcessResponseConnectionFactory", jmsBinding);
+            jmsBinding.setResponseConnectionFactoryName(name);            
+        } else {
+        	warning("MissingResponseConnectionFactory", reader);
+        }
+    }
+
+    private void parseResponseActivationSpec(XMLStreamReader reader, JMSBinding jmsBinding) {
+        String name = reader.getAttributeValue(null, "name");
+        if (name != null && name.length() > 0) {
+        	warning("DoesntProcessResponseActivationSpec", jmsBinding);
+            jmsBinding.setResponseActivationSpecName(name);            
+        } else {
+        	warning("MissingResponseActivationSpec", reader);
+        }
+    }
+
+    private void parseResponse(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+        // Read sub-elements of response
+        while (true) {
+            switch (reader.next()) {
+                case START_ELEMENT:
+                    String elementName = reader.getName().getLocalPart();
+                    if ("destination".equals(elementName)) {
+                        parseResponseDestination(reader, jmsBinding);
+                    } else if ("connectionFactory".equals(elementName)) {
+                        parseResponseConnectionFactory(reader, jmsBinding);
+                    } else if ("activationSpec".equals(elementName)) {
+                        parseResponseActivationSpec(reader, jmsBinding);
+                    }
+                    reader.next();
+                    break;
+                case END_ELEMENT:
+                    QName x = reader.getName();
+                    if (x.getLocalPart().equals("response")) {
+                        return;
+                    } else {
+                    	error("UnexpectedResponseElement", reader, x.toString());
+                    }
+            }
+        }
+    }
+
+    private void parseResourceAdapter(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+    	warning("DoesntProcessResourceAdapter", jmsBinding);
+    }
+
+    /**
+     * <headers JMSType=”string”?
+     *          JMSCorrelationID=”string”?
+     *          JMSDeliveryMode=”PERSISTENT or NON_PERSISTENT”?
+     *          JMSTimeToLive=”long”?      
+     *          JMSPriority=”0 .. 9”?>
+     *     <property name=”NMTOKEN” type=”NMTOKEN”?>*    
+     * </headers>?
+     */
+    private void parseHeaders(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+        
+        String jmsType = reader.getAttributeValue(null, "JMSType");
+        if (jmsType != null && jmsType.length() > 0) {
+            jmsBinding.setJMSType(jmsType);
+        }
+
+        String jmsCorrelationId = reader.getAttributeValue(null, "JMSCorrelationID");
+        if (jmsCorrelationId != null && jmsCorrelationId.length() > 0) {
+            jmsBinding.setJMSCorrelationId(jmsCorrelationId);
+        }
+
+        String jmsDeliveryMode = reader.getAttributeValue(null, "JMSDeliveryMode");
+        if (jmsDeliveryMode != null && jmsDeliveryMode.length() > 0) {
+            if ("PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+                jmsBinding.setJMSDeliveryMode(true);
+            } else if ("NON_PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+                jmsBinding.setJMSDeliveryMode(false);
+            } else {
+                warning("InvalidJMSDeliveryMode", jmsBinding, jmsDeliveryMode);
+            }
+        }
+
+        String jmsTimeToLive = reader.getAttributeValue(null, "JMSTimeToLive");
+        if (jmsTimeToLive != null && jmsTimeToLive.length() > 0) {
+            jmsBinding.setJMSTimeToLive(Long.parseLong(jmsTimeToLive));
+        }
+
+        String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
+        if (jmsPriority != null && jmsPriority.length() > 0) {
+            int p = Integer.parseInt(jmsPriority);
+            if (p >= 0 && p <= 9) {
+                jmsBinding.setJMSPriority(p);
+            } else {
+                warning("InvalidJMSPriority", jmsBinding, jmsPriority);
+            }
+        }
+
+        while (true) {
+            switch (reader.next()) {
+                case START_ELEMENT:
+                    if (reader.getName().getLocalPart().equals("property")) {
+                        parseProperty(reader, jmsBinding);
+                    }
+                    break;
+                case END_ELEMENT:
+                    QName x = reader.getName();
+                    if (x.getLocalPart().equals("headers")) {
+                        return;
+                    } else {
+                        error("UnexpectedResponseElement", reader, x.toString());
+                    }
+            }
+        }
+    }
+    
+    private void parseProperty(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+        String name = reader.getAttributeValue(null, "name");
+        String type = reader.getAttributeValue(null, "type");
+        if (name != null && name.length() > 0) {
+            Object value = reader.getElementText();
+            if ("boolean".equalsIgnoreCase(type)) {
+                value = Boolean.parseBoolean((String)value);
+            } else if ("byte".equalsIgnoreCase(type)) {
+                value = Byte.parseByte(((String)value));
+            } else if ("short".equalsIgnoreCase(type)) {
+                value = Short.parseShort((String)value);
+            } else if ("int".equalsIgnoreCase(type)) {
+                value = Integer.parseInt((String)value);
+            } else if ("long".equalsIgnoreCase(type)) {
+                value = Long.parseLong((String)value);
+            } else if ("float".equalsIgnoreCase(type)) {
+                value = Float.parseFloat((String)value);
+            } else if ("double".equalsIgnoreCase(type)) {
+                value = Double.parseDouble((String)value);
+            } else if ("String".equalsIgnoreCase(type)) {
+                // its already a string
+            }
+            jmsBinding.setProperty(name, value);
+        }
+    }
+
+    /**
+     * <operationProperties name=”string” nativeOperation=”string”?>
+     *   <property name=”NMTOKEN” type=”NMTOKEN”?>*
+     *   <headers JMSType=”string”?
+     *            JMSCorrelationId=”string”?
+     *            JMSDeliveryMode=”PERSISTENT or NON_PERSISTENT”?
+     *            JMSTimeToLive=”long”?
+     *            JMSPriority=”0 .. 9”?>
+     *       <property name=”NMTOKEN” type=”NMTOKEN”?>*
+     *   </headers>?
+     * </operationProperties>*
+     */
+    private void parseOperationProperties(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+        String opName = reader.getAttributeValue(null, "name");
+        if (opName == null || opName.length() < 1) {
+            warning("MissingJMSOperationPropertyName", jmsBinding);
+            return;
+        }
+        String nativeOpName = reader.getAttributeValue(null, "nativeOperation");
+        if (nativeOpName != null && nativeOpName.length() > 0) {
+            jmsBinding.setNativeOperationName(opName, nativeOpName);
+        }
+
+        while (true) {
+            switch (reader.next()) {
+                case START_ELEMENT:
+                    if (reader.getName().getLocalPart().equals("headers")) {
+                        parseOperationHeaders(reader, jmsBinding, opName);
+                    }
+                    break;
+                case END_ELEMENT:
+                    QName x = reader.getName();
+                    if (x.getLocalPart().equals("operationProperties")) {
+                        return;
+                    } else {
+                        error("UnexpectedResponseElement", reader, x.toString());
+                    }
+            }
+        }
+    }
+
+    private void parseOperationHeaders(XMLStreamReader reader, JMSBinding jmsBinding, String opName) throws XMLStreamException {
+        String jmsType = reader.getAttributeValue(null, "JMSType");
+        if (jmsType != null && jmsType.length() > 0) {
+            jmsBinding.setOperationJMSType(opName, jmsType);
+        }
+
+        String jmsCorrelationId = reader.getAttributeValue(null, "JMSCorrelationID");
+        if (jmsCorrelationId != null && jmsCorrelationId.length() > 0) {
+            jmsBinding.setOperationJMSCorrelationId(opName, jmsCorrelationId);
+        }
+
+        String jmsDeliveryMode = reader.getAttributeValue(null, "JMSDeliveryMode");
+        if (jmsDeliveryMode != null && jmsDeliveryMode.length() > 0) {
+            if ("PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+                jmsBinding.setJMSDeliveryMode(true);
+            } else if ("NON_PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
+                jmsBinding.setOperationJMSDeliveryMode(opName, false);
+            } else {
+                warning("InvalidOPJMSDeliveryMode", jmsBinding, jmsDeliveryMode);
+            }
+        }
+
+        String jmsTimeToLive = reader.getAttributeValue(null, "JMSTimeToLive");
+        if (jmsTimeToLive != null && jmsTimeToLive.length() > 0) {
+            jmsBinding.setOperationJMSTimeToLive(opName, Long.parseLong(jmsTimeToLive));
+        }
+
+        String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
+        if (jmsPriority != null && jmsPriority.length() > 0) {
+            int p = Integer.parseInt(jmsPriority);
+            if (p >= 0 && p <= 9) {
+                jmsBinding.setOperationJMSPriority(opName, p);
+            } else {
+                warning("InvalidOPJMSPriority", jmsBinding, jmsPriority);
+            }
+        }
+
+        while (true) {
+            switch (reader.next()) {
+                case START_ELEMENT:
+                    if (reader.getName().getLocalPart().equals("property")) {
+                        parseOperationPropertyProperties(reader, jmsBinding, opName);
+                    }
+                    break;
+                case END_ELEMENT:
+                    QName x = reader.getName();
+                    if (x.getLocalPart().equals("headers")) {
+                        return;
+                    } else {
+                        error("UnexpectedResponseElement", reader, x.toString());
+                    }
+            }
+        }
+    }
+
+    private void parseOperationPropertyProperties(XMLStreamReader reader, JMSBinding jmsBinding, String opName) throws XMLStreamException {
+        String propName = reader.getAttributeValue(null, "name");
+        String type = reader.getAttributeValue(null, "type");
+        if (propName != null && propName.length() > 0) {
+            Object value = reader.getElementText();
+            if ("boolean".equalsIgnoreCase(type)) {
+                value = Boolean.parseBoolean((String)value);
+            } else if ("byte".equalsIgnoreCase(type)) {
+                value = Byte.parseByte(((String)value));
+            } else if ("short".equalsIgnoreCase(type)) {
+                value = Short.parseShort((String)value);
+            } else if ("int".equalsIgnoreCase(type)) {
+                value = Integer.parseInt((String)value);
+            } else if ("long".equalsIgnoreCase(type)) {
+                value = Long.parseLong((String)value);
+            } else if ("float".equalsIgnoreCase(type)) {
+                value = Float.parseFloat((String)value);
+            } else if ("double".equalsIgnoreCase(type)) {
+                value = Double.parseDouble((String)value);
+            } else if ("String".equalsIgnoreCase(type)) {
+                // its already a string
+            }
+            jmsBinding.setOperationProperty(opName, propName, value);
+        }
+    }
+
+    private void parseSubscriptionHeaders(XMLStreamReader reader, JMSBinding jmsBinding) {
+        String jmsSelector = reader.getAttributeValue(null, "JMSSelector");
+        if (jmsSelector != null && jmsSelector.length() > 0) {
+            jmsBinding.setJMSSelector(jmsSelector);
+        }
+    }
+
+    /**
+     * The validation rules for the JMS model are relatively complicated to they all live together here
+     */
+    public void validate() throws JMSBindingException {
+        /*
+         * first fix up anything now the model has been read
+         */
+
+        /*
+         * Now some cross field validation
+         */
+
+        // connection factory doesn't contradict destination type
+        // connection factory and activation Specification are mutually exclusive
+        // TODO check Specification for all validations
+    }
+
+}
diff --git a/branches/sca-android/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-android/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..ac37a0f26b
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -0,0 +1,19 @@
+# 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. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.binding.jms.impl.JMSBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.jms,model=org.apache.tuscany.sca.binding.jms.impl.JMSBinding
diff --git a/branches/sca-android/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/branches/sca-android/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
new file mode 100644
index 0000000000..2f1048e601
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
@@ -0,0 +1,47 @@
+#
+#
+#    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.
+#
+#
+DoesntProcessOperationProperties = JMS Binding doesn't process operationProperties yet
+DoesntProcessHeaders = JMS Binding doesn't process headers yet
+DoesntProcessResourceAdapter = JMS Binding doesn't process resourceAdapter yet
+DoesntProcessResponseConnectionFactory = JMS Binding doesn't process response connectionFactory yet
+DoesntProcessResponseActivationSpec = JMS Binding doesn't process response activationSpec yet
+DoesntProcessResponseDestinationType = JMS Binding doesn't process response destination type yet
+DoesntProcessActivationSpec = JMS Binding doesn't process activationSpec yet
+DoesntProcessDestinationType = JMS Binding doesn't process destination type yet
+MissingConnectionFactoryName = Missing ConnectionFactory Name
+MissingResponseConnectionFactory = Missing response connectionFactory name
+InvalidResponseDestinationType = Invalid response destination type: {0}
+InvalidDestinationType = Invalid destination type: {0}
+MissingActivationSpecName = Missing ActivationSpec Name
+MissingResponseActivationSpec = Missing response ActivationSpec name
+UnknownTokenInURI = Unknown token {0} in uri: {1}
+MustStartWithSchema = URI must start with the scheme 'jms:' for uri: {0}
+InvalidCorrelationScheme = Invalid correlationScheme: {0}
+UnexpectedElement = Incomplete binding.jms definition found unexpected element: {0}
+UnexpectedResponseElement = Incomplete binding.jms/response definition found unexpected element: {0}
+InvalidJMSDeliveryMode = Invalid JMSDeliveryMode: {0}
+InvalidJMSPriority = Invalid JMSPriority: {0}
+MissingJMSOperationPropertyName = Missing JMSOperationProperty Name
+InvalidOPJMSDeliveryMode = Invalid OPJMSDeliveryMode: {0}
+InvalidOPJMSPriority = Invalid OPJMSPriority: {0}
+
+
+
diff --git a/branches/sca-android/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/branches/sca-android/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
new file mode 100644
index 0000000000..7fe482c4f2
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
@@ -0,0 +1,211 @@
+/*

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

+

+import java.io.StringReader;

+import java.util.Map;

+

+import javax.xml.stream.XMLInputFactory;

+import javax.xml.stream.XMLStreamReader;

+

+import junit.framework.TestCase;

+

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

+import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

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

+import org.apache.tuscany.sca.monitor.Monitor;

+import org.apache.tuscany.sca.monitor.MonitorFactory;

+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;

+

+/**

+ * Tests for JMS binding xml

+ */

+public class JMSBindingProcessorTestCase extends TestCase {

+    

+    private static final String COMPOSITE =

+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

+        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+            + " <component name=\"HelloWorldComponent\">"

+            + "   <implementation.java class=\"services.HelloWorld\"/>"

+            + "      <service name=\"HelloWorldService\">"

+            + "          <binding.jms uri=\"jms:testQueue\" />"

+            + "      </service>"

+            + " </component>"

+            + "</composite>";

+

+    private static final String HEADERS1 =

+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

+        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+            + " <component name=\"HelloWorldComponent\">"

+            + "   <implementation.java class=\"services.HelloWorld\"/>"

+            + "      <service name=\"HelloWorldService\">"

+            + "          <binding.jms uri=\"jms:testQueue\" >"

+            + "             <headers JMSType=\"myType\" JMSCorrelationID=\"myCorrelId\" JMSDeliveryMode=\"PERSISTENT\" JMSTimeToLive=\"54321\" JMSPriority=\"5\" >"

+            + "             </headers>" 

+            + "          </binding.jms>"

+            + "      </service>"

+            + " </component>"

+            + "</composite>";

+

+    private static final String PROPERTIES1 =

+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

+        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+            + " <component name=\"HelloWorldComponent\">"

+            + "   <implementation.java class=\"services.HelloWorld\"/>"

+            + "      <service name=\"HelloWorldService\">"

+            + "          <binding.jms uri=\"jms:testQueue\" >"

+            + "             <headers>"

+            + "                <property name=\"p1\">bla</property>"

+            + "                <property name=\"intProp\" type=\"int\">42</property>"

+            + "             </headers>" 

+            + "          </binding.jms>"

+            + "      </service>"

+            + " </component>"

+            + "</composite>";

+    

+    private static final String OP_PROPERTIES1 =

+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

+        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+            + " <component name=\"HelloWorldComponent\">"

+            + "   <implementation.java class=\"services.HelloWorld\"/>"

+            + "      <service name=\"HelloWorldService\">"

+            + "          <binding.jms uri=\"jms:testQueue\" >"

+            + "             <operationProperties name=\"op1\">"

+            + "                <headers JMSType=\"op1Type\" >"

+            + "                   <property name=\"p1\">bla</property>"

+            + "                   <property name=\"intProp\" type=\"int\">42</property>"

+            + "                </headers>" 

+            + "             </operationProperties >" 

+            + "             <operationProperties name=\"op2\" nativeOperation=\"nativeOp2\" >"

+            + "                <headers JMSType=\"op2Type\">"

+            + "                   <property name=\"p2\">op2bla</property>"

+            + "                   <property name=\"intProp\" type=\"int\">77</property>"

+            + "                </headers>" 

+            + "             </operationProperties >" 

+            + "          </binding.jms>"

+            + "      </service>"

+            + " </component>"

+            + "</composite>";

+

+    private static final String SELECTOR =

+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

+        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+            + " <component name=\"HelloWorldComponent\">"

+            + "   <implementation.java class=\"services.HelloWorld\"/>"

+            + "      <service name=\"HelloWorldService\">"

+            + "          <binding.jms uri=\"jms:testQueue\" >"

+            + "             <SubscriptionHeaders JMSSelector=\"prop1 = 2\" />"

+            + "          </binding.jms>"

+            + "      </service>"

+            + " </component>"

+            + "</composite>";

+

+    private XMLInputFactory inputFactory;

+    private StAXArtifactProcessor<Object> staxProcessor;

+    private Monitor monitor;

+

+    @Override

+    protected void setUp() throws Exception {

+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        inputFactory = XMLInputFactory.newInstance();

+        // Create a monitor

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

+        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  

+        if (monitorFactory != null) {

+        	monitor = monitorFactory.createMonitor();

+        	utilities.addUtility(monitorFactory);

+        }

+        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor);

+    }

+

+    /**

+     * Test parsing valid composite definition. Valid composite populated with correct values expected.

+     * @throws Exception

+     */

+    public void testLoadValidComposite() throws Exception {

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE));

+        

+        Composite composite = (Composite)staxProcessor.read(reader);

+        JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

+        

+        assertNotNull(binding);

+        assertEquals("testQueue", binding.getDestinationName());

+    }

+

+    public void testHeaders1() throws Exception {

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(HEADERS1));

+        

+        Composite composite = (Composite)staxProcessor.read(reader);

+        JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

+        

+        assertNotNull(binding);

+        assertEquals("myType", binding.getJMSType());

+        assertEquals("myCorrelId", binding.getJMSCorrelationId());

+        assertTrue(binding.isdeliveryModePersistent());

+        assertEquals(54321, binding.getJMSTimeToLive().longValue());

+        assertEquals(5, binding.getJMSPriority().intValue());

+    }

+

+    public void testProperties1() throws Exception {

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(PROPERTIES1));

+        

+        Composite composite = (Composite)staxProcessor.read(reader);

+        JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

+        

+        assertNotNull(binding);

+        assertEquals("bla", binding.getProperty("p1"));

+        assertEquals(42, ((Integer)binding.getProperty("intProp")).intValue());

+    }

+

+    public void testOpProperties1() throws Exception {

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_PROPERTIES1));

+        

+        Composite composite = (Composite)staxProcessor.read(reader);

+        JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

+        

+        assertNotNull(binding);

+

+        Map<String, Object> op1Props = binding.getOperationProperties("op1");

+        assertEquals("op1Type", binding.getOperationJMSType("op1"));

+        assertEquals("bla", op1Props.get("p1"));

+        assertEquals(42, ((Integer)op1Props.get("intProp")).intValue());

+        

+        assertEquals("op2Type", binding.getOperationJMSType("op2"));

+        Map<String, Object> op2Props = binding.getOperationProperties("op2");

+        assertEquals("op2bla", op2Props.get("p2"));

+        assertEquals(77, ((Integer)op2Props.get("intProp")).intValue());

+    }

+

+    public void testSubscriptionHeaders () throws Exception {

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(SELECTOR));

+        

+        Composite composite = (Composite)staxProcessor.read(reader);

+        JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

+        

+        assertNotNull(binding);

+

+        assertEquals("prop1 = 2", binding.getJMSSelector());

+    }

+}