Branch for 1.3.3

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

124 files changed, 9670 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/LICENSE b/branches/sca-java-1.3.3/modules/binding-ws-axis2/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/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-java-1.3.3/modules/binding-ws-axis2/NOTICE b/branches/sca-java-1.3.3/modules/binding-ws-axis2/NOTICE
new file mode 100644
index 0000000000..fdfa0e9faa
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/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-java-1.3.3/modules/binding-ws-axis2/pom.xml b/branches/sca-java-1.3.3/modules/binding-ws-axis2/pom.xml
new file mode 100644
index 0000000000..da246ba60e
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/pom.xml
@@ -0,0 +1,580 @@
+<?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.3.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-binding-ws-axis2</artifactId>
+    <name>Apache Tuscany SCA Axis2-based WS Binding Extension</name>
+
+    <repositories>
+        <repository>
+            <id>apache.ws</id>
+            <name>Apache WebServices Repository</name>
+            <url>http://ws.zones.apache.org/repository/</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl-xml</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-xml</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-xml-ws</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security-ws</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-launcher</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-java2wsdl</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-launcher</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xom</groupId>
+                    <artifactId>xom</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-adb</artifactId>
+            <version>1.3</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-codegen</artifactId>
+            <version>1.3</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>1.2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>1.2.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.woden</groupId>
+            <artifactId>woden</artifactId>
+            <version>1.0-incubating-M7b</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version><!-- to keep compatible with older servlet containers -->
+            <scope>provided</scope>
+            <exclusions>
+               <exclusion>
+                   <groupId>javax.servlet</groupId>
+                   <artifactId>servlet-api</artifactId>
+               </exclusion>
+            </exclusions>            
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>wsdl4j</groupId>
+                    <artifactId>wsdl4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>2.2</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-mtompolicy</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.santuario</groupId>
+            <artifactId>xmlsec</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.security</groupId>
+            <artifactId>wss4j</artifactId>
+            <version>1.5.3</version>
+        </dependency>
+        <!-- xalan is required by wss4j -->
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.0</version>
+            <scope>optional</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rampart</groupId>
+            <artifactId>rampart-core</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-nodeps</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-xmlbeans</artifactId>
+                </exclusion>
+				<exclusion>
+					<groupId>xmlbeans</groupId>
+					<artifactId>xbean</artifactId>
+				</exclusion>
+                <exclusion>
+                   <groupId>javax.servlet</groupId>
+                   <artifactId>servlet-api</artifactId>
+               </exclusion>
+                <!-- Exclude XmlSchema 1.3.1 -->
+                <exclusion>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rampart</groupId>
+            <artifactId>rampart-policy</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-nodeps</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-xmlbeans</artifactId>
+                </exclusion>
+				<exclusion>
+					<groupId>xmlbeans</groupId>
+					<artifactId>xbean</artifactId>
+				</exclusion>
+                <exclusion>
+                   <groupId>javax.servlet</groupId>
+                   <artifactId>servlet-api</artifactId>
+               </exclusion>
+               <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>                
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+                <!-- Exclude XmlSchema 1.3.1 -->
+                <exclusion>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                </exclusion>
+
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rampart</groupId>
+            <artifactId>rampart-trust</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-nodeps</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-xmlbeans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>   
+                <exclusion>
+                    <groupId>wsdl4j</groupId>
+                    <artifactId>wsdl4j</artifactId>
+                </exclusion>                                
+				<exclusion>
+					<groupId>xmlbeans</groupId>
+					<artifactId>xbean</artifactId>
+				</exclusion>
+                <exclusion>
+                   <groupId>javax.servlet</groupId>
+                   <artifactId>servlet-api</artifactId>
+               </exclusion> 
+               <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>  
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+
+
+                <!-- Exclude XmlSchema 1.3.1 -->
+                <exclusion>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.0</version>
+        </dependency>         
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.12</version>
+        </dependency>  
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version> <!-- to keep compatible with older servlet containers --> 
+            <scope>provided</scope>
+        </dependency>		      
+
+<!-- xerces, xalan, and xml-apis are required for running in websphere -->
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.8.1</version>
+        </dependency>  
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.0</version>
+        </dependency>  
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.3.03</version>
+        </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.ws.axis2</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.binding.ws.axis2*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
new file mode 100644
index 0000000000..b01707d93e
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
@@ -0,0 +1,247 @@
+/*
+ * 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.ws.axis2;
+
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPBody;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.EndpointReferenceHelper;
+import org.apache.axis2.client.OperationClient;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.interfacedef.util.FaultException;
+import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.policy.util.PolicyHandler;
+import org.apache.tuscany.sca.runtime.ReferenceParameters;
+
+/**
+ * Axis2BindingInvoker uses an Axis2 OperationClient to invoke a remote web service
+ *
+ * @version $Rev$ $Date$
+ */
+public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
+
+    private Axis2ServiceClient serviceClient;
+    private QName wsdlOperationName;
+    private Options options;
+    private SOAPFactory soapFactory;
+
+    public static final QName QNAME_WSA_FROM =
+        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_FROM,
+                  AddressingConstants.WSA_DEFAULT_PREFIX);
+
+    public static final String TUSCANY_PREFIX = "tuscany";
+    public static final QName CALLBACK_ID_REFPARM_QN =
+        new QName(Constants.SCA10_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
+    public static final QName CONVERSATION_ID_REFPARM_QN =
+        new QName(Constants.SCA10_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
+    
+    private List<PolicyHandler> policyHandlerList = null;
+
+    public Axis2BindingInvoker(Axis2ServiceClient serviceClient,
+                               QName wsdlOperationName,
+                               Options options,
+                               SOAPFactory soapFactory,
+                               List<PolicyHandler> policyHandlerList) {
+        this.serviceClient = serviceClient;
+        this.wsdlOperationName = wsdlOperationName;
+        this.options = options;
+        this.soapFactory = soapFactory;
+        this.policyHandlerList = policyHandlerList;
+    }
+
+    private static final QName EXCEPTION = new QName("", "Exception");
+    
+    public Message invoke(Message msg) {
+        try {
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.beforeInvoke(msg);
+            }
+            
+            Object resp = invokeTarget(msg);
+            
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.afterInvoke(msg);
+            }
+            msg.setBody(resp);
+        } catch (AxisFault e) {
+            if (e.getDetail() != null ) {
+                FaultException f = new FaultException(e.getMessage(), e.getDetail(), e);
+                f.setFaultName(e.getDetail().getQName());
+                msg.setFaultBody(f);
+            } else {
+                msg.setFaultBody(e);
+            }
+        } catch (Throwable e) {
+            msg.setFaultBody(e);
+        }
+
+        return msg;
+    }
+
+    protected Object invokeTarget(Message msg) throws AxisFault {
+        final OperationClient operationClient = createOperationClient(msg);
+
+        // ensure connections are tracked so that they can be closed by the reference binding
+        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+        requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
+        requestMC.getOptions().setTimeOutInMilliSeconds(240000L);
+
+        // Allow privileged access to read properties. Requires PropertiesPermission read in
+        // security policy.
+        try {
+            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+                public Object run() throws AxisFault {
+                    operationClient.execute(true);
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            operationClient.complete(requestMC);
+            throw (AxisFault)e.getException();
+        }
+
+        MessageContext responseMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+
+        OMElement response = responseMC.getEnvelope().getBody().getFirstElement();
+
+        // FIXME: [rfeng] We have to pay performance penalty to build the complete OM as the operationClient.complete() will
+        // release the underlying HTTP connection. 
+        // Force the response to be populated, see https://issues.apache.org/jira/browse/TUSCANY-1541
+        if (response != null) {
+            response.build();
+        }
+
+        operationClient.complete(requestMC);
+
+        return response;
+    }
+
+    @SuppressWarnings("deprecation")
+    protected OperationClient createOperationClient(Message msg) throws AxisFault {
+        SOAPEnvelope env = soapFactory.getDefaultEnvelope();
+        Object[] args = (Object[])msg.getBody();
+        if (args != null && args.length > 0) {
+            SOAPBody body = env.getBody();
+            for (Object bc : args) {
+                if (bc instanceof OMElement) {
+                    body.addChild((OMElement)bc);
+                } else {
+                    throw new IllegalArgumentException(
+                                                       "Can't handle mixed payloads between OMElements and other types.");
+                }
+            }
+        }
+        final MessageContext requestMC = new MessageContext();
+        requestMC.setEnvelope(env);
+
+        // Axis2 operationClients can not be shared so create a new one for each request
+        final OperationClient operationClient = serviceClient.getServiceClient().createClient(wsdlOperationName);
+        operationClient.setOptions(options);
+
+        ReferenceParameters parameters = msg.getFrom().getReferenceParameters();
+
+        // set callback endpoint and callback ID for WS-Addressing header
+        EndpointReference fromEPR = null;
+        org.apache.tuscany.sca.runtime.EndpointReference callbackEPR = parameters.getCallbackReference();
+        if (callbackEPR != null) {
+            fromEPR = new EndpointReference(callbackEPR.getBinding().getURI());
+        }
+        Object callbackID = parameters.getCallbackID();
+        if (callbackID != null) {
+            if (fromEPR == null) {
+                fromEPR = new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
+            }
+            //FIXME: serialize callback ID to XML in case it is not a string
+            fromEPR.addReferenceParameter(CALLBACK_ID_REFPARM_QN, callbackID.toString());
+        }
+
+        // set conversation ID for WS-Addressing header
+        Object conversationId = parameters.getConversationID();
+        if (conversationId != null) {
+            if (fromEPR == null) {
+                fromEPR = new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
+            }
+            //FIXME: serialize conversation ID to XML in case it is not a string
+            fromEPR.addReferenceParameter(CONVERSATION_ID_REFPARM_QN, conversationId.toString());
+        }
+
+        // add WS-Addressing header
+        //FIXME: is there any way to use the Axis2 addressing support for this?
+        if (fromEPR != null) {
+            SOAPEnvelope sev = requestMC.getEnvelope();
+            SOAPHeader sh = sev.getHeader();
+            OMElement epr =
+                EndpointReferenceHelper.toOM(sev.getOMFactory(),
+                                             fromEPR,
+                                             QNAME_WSA_FROM,
+                                             AddressingConstants.Final.WSA_NAMESPACE);
+            sh.addChild(epr);
+            requestMC.setFrom(fromEPR);
+        }
+
+        // if target endpoint was not specified when this invoker was created, 
+        // use dynamically specified target endpoint passed in on this call
+        if (options.getTo() == null) {
+            org.apache.tuscany.sca.runtime.EndpointReference ep = msg.getTo();
+            if (ep != null) {
+                requestMC.setTo(new EndpointReference(ep.getURI()));
+            } else {
+                throw new RuntimeException("Unable to determine destination endpoint");
+            }
+        } else {
+            requestMC.setTo(new EndpointReference(options.getTo().getAddress())); 
+        }
+        
+        // Allow privileged access to read properties. Requires PropertiesPermission read in
+        // security policy.
+        try {
+            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+                public Object run() throws AxisFault {
+                    operationClient.addMessageContext(requestMC);
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            throw (AxisFault)e.getException();
+        }
+        return operationClient;
+    }
+    
+    public boolean allowsPassByReference() {
+        return true;
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
new file mode 100644
index 0000000000..3be3c5b600
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
@@ -0,0 +1,83 @@
+/*
+ * 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.ws.axis2;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
+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.osoa.sca.ServiceRuntimeException;
+
+/**
+ * Axis2BindingProviderFactory
+ *
+ * @version $Rev$ $Date$
+ */
+
+public class Axis2BindingProviderFactory implements BindingProviderFactory<WebServiceBinding> {
+
+    private ModelFactoryExtensionPoint modelFactories;
+    private ServletHost servletHost;
+    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
+    private DataBindingExtensionPoint dataBindings;
+
+    public Axis2BindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
+        List<ServletHost> hosts = servletHosts.getServletHosts();
+        if (!hosts.isEmpty()) {
+            this.servletHost = hosts.get(0);
+        }
+        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        policyHandlerClassnames = PolicyHandlerDefinitionsLoader.loadPolicyHandlerClassnames();
+        dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
+    }
+
+    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
+                                                                   RuntimeComponentReference reference,
+                                                                   WebServiceBinding binding) {
+        return new Axis2ReferenceBindingProvider(component, reference, binding,
+                                                 modelFactories, policyHandlerClassnames, dataBindings);
+    }
+
+    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
+                                                               RuntimeComponentService service,
+                                                               WebServiceBinding binding) {
+        return new Axis2ServiceBindingProvider(component, service, binding,
+                                               servletHost, modelFactories,
+                                               policyHandlerClassnames, dataBindings);
+    }
+    
+    public Class<WebServiceBinding> getModelType() {
+        return WebServiceBinding.class;
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
new file mode 100644
index 0000000000..7ea5d65ce9
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
@@ -0,0 +1,69 @@
+/*
+ * 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.ws.axis2;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.client.OperationClient;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.policy.util.PolicyHandler;
+
+/**
+ * Axis2OneWayBindingInvoker uses an Axis2 OperationClient to invoke a OneWay remote web service.
+ *
+ * @version $Rev$ $Date$
+ */
+public class Axis2OneWayBindingInvoker extends Axis2BindingInvoker {
+
+    public Axis2OneWayBindingInvoker(Axis2ServiceClient serviceClient,
+                                     QName wsdlOperationName,
+                                     Options options,
+                                     SOAPFactory soapFactory,
+                                     List<PolicyHandler> policyHandlerList) {
+
+        super(serviceClient, wsdlOperationName, options, soapFactory, policyHandlerList);
+    }
+
+    @Override
+    protected Object invokeTarget(Message msg) throws AxisFault {
+        OperationClient operationClient = createOperationClient(msg);
+
+        // ensure connections are tracked so that they can be closed by the reference binding
+        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+        //requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
+        Options opt = requestMC.getOptions();
+        opt.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
+        opt.setUseSeparateListener(true);
+        opt.setProperty(HTTPConstants.AUTO_RELEASE_CONNECTION,Boolean.TRUE);        
+
+        operationClient.execute(false);
+
+        // REVIEW it seems ok to return null
+        return null;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
new file mode 100644
index 0000000000..9fdb2615c2
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
@@ -0,0 +1,88 @@
+/*
+ * 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.ws.axis2;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+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.invocation.MessageFactory;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.osoa.sca.ServiceRuntimeException;
+
+public class Axis2ReferenceBindingProvider implements ReferenceBindingProvider {
+
+    private WebServiceBinding wsBinding;
+    private Axis2ServiceClient axisClient;
+
+    public Axis2ReferenceBindingProvider(RuntimeComponent component,
+                                         RuntimeComponentReference reference,
+                                         WebServiceBinding wsBinding,
+                                         ModelFactoryExtensionPoint modelFactories,
+                                         Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames,
+                                         DataBindingExtensionPoint dataBindings) {
+
+        MessageFactory messageFactory = modelFactories.getFactory(MessageFactory.class); 
+        this.wsBinding = wsBinding;
+
+        // A WSDL document should always be present in the binding
+        if (wsBinding.getWSDLDocument() == null) {
+            throw new ServiceRuntimeException("No WSDL document for " + component.getName() + "/" + reference.getName());
+        }
+
+        // Set to use the Axiom data binding
+        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
+        if (contract.getInterface() != null) {
+            contract.getInterface().resetDataBinding(OMElement.class.getName());
+        }
+
+        axisClient = new Axis2ServiceClient(component, reference, wsBinding, messageFactory, policyHandlerClassnames);
+    }
+
+    public void start() {
+        axisClient.start();
+    }
+
+    public void stop() {
+        axisClient.stop();
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return wsBinding.getBindingInterfaceContract();
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return true;
+    }
+
+    public Invoker createInvoker(Operation operation) {
+        return axisClient.createInvoker(operation);
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
new file mode 100644
index 0000000000..eac047d23f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
@@ -0,0 +1,87 @@
+/*
+ * 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.ws.axis2;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.osoa.sca.ServiceRuntimeException;
+
+public class Axis2ServiceBindingProvider implements ServiceBindingProvider {
+
+    private WebServiceBinding wsBinding;
+    private Axis2ServiceProvider axisProvider;
+
+    public Axis2ServiceBindingProvider(RuntimeComponent component,
+                                       RuntimeComponentService service,
+                                       WebServiceBinding wsBinding,
+                                       ServletHost servletHost,
+                                       ModelFactoryExtensionPoint modelFactories,
+                                       Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames,
+                                       DataBindingExtensionPoint dataBindings) {
+
+        if (servletHost == null) {
+            throw new ServiceRuntimeException("No Servlet host is avaible for HTTP web services");
+        }
+
+        MessageFactory messageFactory = modelFactories.getFactory(MessageFactory.class); 
+        this.wsBinding = wsBinding;
+
+        // A WSDL document should always be present in the binding
+        if (wsBinding.getWSDLDocument() == null) {
+            throw new ServiceRuntimeException("No WSDL document for " + component.getName() + "/" + service.getName());
+        }
+        
+        // Set to use the Axiom data binding
+        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
+        contract.getInterface().resetDataBinding(OMElement.class.getName());
+
+        axisProvider = new Axis2ServiceProvider(component, service, wsBinding, servletHost, messageFactory, policyHandlerClassnames);
+    }
+
+    public void start() {
+        axisProvider.start();                                          
+    }
+
+    public void stop() {
+        axisProvider.stop();
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return wsBinding.getBindingInterfaceContract();
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return true;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
new file mode 100644
index 0000000000..9bb88698b9
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
@@ -0,0 +1,498 @@
+/*
+ * 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.ws.axis2;
+
+import static org.apache.tuscany.sca.binding.ws.axis2.AxisPolicyHelper.SOAP12_INTENT;
+import static org.apache.tuscany.sca.binding.ws.axis2.AxisPolicyHelper.isIntentRequired;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.wsdl.Binding;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.Definition;
+import javax.wsdl.Import;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.wsdl.factory.WSDLFactory;
+import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.dom.DOMSource;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.EndpointReferenceHelper;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisEndpoint;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.util.threadpool.ThreadPool;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+import org.apache.tuscany.sca.assembly.AbstractContract;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy;
+import org.apache.tuscany.sca.policy.util.PolicyHandler;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;
+import org.apache.ws.commons.schema.resolver.URIResolver;
+import org.osoa.sca.ServiceRuntimeException;
+
+public class Axis2ServiceClient {
+
+    private RuntimeComponent component;
+    private AbstractContract contract;
+    private WebServiceBinding wsBinding;
+    private ServiceClient serviceClient;
+    Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
+    private List<PolicyHandler> policyHandlerList = new ArrayList<PolicyHandler>();
+
+    public Axis2ServiceClient(RuntimeComponent component,
+                              AbstractContract contract,
+                              WebServiceBinding wsBinding,
+                              MessageFactory messageFactory,
+                              Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
+
+        this.component = component;
+        this.contract = contract;
+        this.wsBinding = wsBinding;
+        this.policyHandlerClassnames = policyHandlerClassnames;
+    }
+
+    protected void start() {
+        if (serviceClient == null) {
+            this.serviceClient = createServiceClient();
+        }
+    }
+
+    public ServiceClient getServiceClient() {
+        return serviceClient;
+    }
+    
+    protected void configurePolicy(ConfigurationContext context, PolicySet ps) throws AxisFault {
+        if (ps == null) {
+            return;
+        }
+        for (Object policy : ps.getPolicies()) {
+            if (policy instanceof Axis2ConfigParamPolicy) {
+                Axis2ConfigParamPolicy axis2ConfigParamPolicy = (Axis2ConfigParamPolicy)policy;
+                for (Map.Entry<String, OMElement> param : axis2ConfigParamPolicy.getParamElements().entrySet()) {
+                    Parameter configParam = new Parameter(param.getKey(), param.getValue().getFirstElement());
+                    configParam.setParameterElement(param.getValue());
+                    context.getAxisConfiguration().addParameter(configParam);
+                }
+            }
+        }
+    }
+
+    /**
+     * Create an Axis2 ServiceClient
+     */
+    protected ServiceClient createServiceClient() {
+        try {
+            final boolean isRampartRequired = AxisPolicyHelper.isRampartRequired(wsBinding);
+            ConfigurationContext configContext;
+            
+            try {
+                // TuscanyAxisConfigurator tuscanyAxisConfigurator = new TuscanyAxisConfigurator();
+                // Allow privileged access to read properties. Requires PropertyPermission read in
+                // security policy.
+                TuscanyAxisConfigurator tuscanyAxisConfigurator =
+                    AccessController.doPrivileged(new PrivilegedExceptionAction<TuscanyAxisConfigurator>() {
+                        public TuscanyAxisConfigurator run() throws AxisFault {
+                            return new TuscanyAxisConfigurator(isRampartRequired);
+                        }
+                    });
+                configContext = tuscanyAxisConfigurator.getConfigurationContext();
+                // deployRampartModule();
+                // configureSecurity();
+            } catch (PrivilegedActionException e) {
+                throw new ServiceRuntimeException(e.getException());
+            }
+
+            createPolicyHandlers();
+            setupPolicyHandlers(policyHandlerList, configContext);
+
+            Definition definition = wsBinding.getWSDLDocument();
+            QName serviceQName = wsBinding.getService().getQName();
+            Port port = wsBinding.getPort();
+            if (port == null) {
+                // service has multiple ports, select one port to use
+                Collection<Port> ports = wsBinding.getService().getPorts().values();
+                for (Port p : ports) {
+                    // look for a SOAP 1.1 port first
+                    if (p.getExtensibilityElements().get(0) instanceof SOAPAddress) {
+                        port = p;
+                        break;
+                    }
+                }
+                if (port == null) {
+                    // no SOAP 1.1 port available, so look for a SOAP 1.2 port
+                    for (Port p : ports) {
+                        if (p.getExtensibilityElements().get(0) instanceof SOAP12Address) {
+                            port = p;
+                            break;
+                        }
+                    }
+                }
+            }
+            AxisService axisService =
+                createClientSideAxisService(definition, serviceQName, port.getName(), new Options());
+
+            HttpClient httpClient = (HttpClient)configContext.getProperty(HTTPConstants.CACHED_HTTP_CLIENT);
+            if (httpClient == null) {
+                MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
+                HttpConnectionManagerParams connectionManagerParams = new HttpConnectionManagerParams();
+                connectionManagerParams.setDefaultMaxConnectionsPerHost(2);
+                connectionManagerParams.setTcpNoDelay(true);
+                connectionManagerParams.setStaleCheckingEnabled(true);
+                connectionManagerParams.setLinger(0);
+                connectionManager.setParams(connectionManagerParams);
+                httpClient = new HttpClient(connectionManager);
+                configContext.setThreadPool(new ThreadPool(1, 5));
+                configContext.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
+                configContext.setProperty(HTTPConstants.CACHED_HTTP_CLIENT, httpClient);
+            }
+
+            return new ServiceClient(configContext, axisService);
+
+        } catch (AxisFault e) {
+            throw new RuntimeException(e); // TODO: better exception
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * URI resolver implementation for XML schema
+     */
+    public static class URIResolverImpl implements URIResolver {
+        private Definition definition;
+
+        public URIResolverImpl(Definition definition) {
+            this.definition = definition;
+        }
+
+        public org.xml.sax.InputSource resolveEntity(java.lang.String targetNamespace,
+                                                     java.lang.String schemaLocation,
+                                                     java.lang.String baseUri) {
+            try {
+                if (baseUri == null) {
+                    baseUri = definition.getDocumentBaseURI();
+                }
+                URL url = new URL(new URL(baseUri), schemaLocation);
+                return XMLDocumentHelper.getInputSource(url);
+            } catch (IOException e) {
+                return null;
+            }
+        }
+    }
+
+    /**
+     * Workaround for https://issues.apache.org/jira/browse/AXIS2-3205
+     * @param definition
+     * @param serviceName
+     * @return
+     */
+    private static Definition getDefinition(Definition definition, QName serviceName) {
+
+        if (serviceName == null) {
+            return definition;
+        }
+
+        if (definition == null) {
+            return null;
+        }
+        Object service = definition.getServices().get(serviceName);
+        if (service != null) {
+            return definition;
+        }
+        for (Object i : definition.getImports().values()) {
+            List<Import> imports = (List<Import>)i;
+            for (Import imp : imports) {
+                Definition d = getDefinition(imp.getDefinition(), serviceName);
+                if (d != null) {
+                    return d;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * This method is copied from AxisService.createClientSideAxisService to
+     * work around http://issues.apache.org/jira/browse/WSCOMMONS-228
+     * 
+     * @param wsdlDefinition
+     * @param wsdlServiceName
+     * @param portName
+     * @param options
+     * @return
+     * @throws AxisFault
+     */
+    @Deprecated
+    public static AxisService createClientSideAxisService(Definition definition,
+                                                          QName serviceName,
+                                                          String portName,
+                                                          Options options) throws AxisFault {
+        Definition def = getDefinition(definition, serviceName);
+        final WSDL11ToAxisServiceBuilder serviceBuilder = new WSDL11ToAxisServiceBuilder(def, serviceName, portName);
+        serviceBuilder.setServerSide(false);
+        // [rfeng] Add a custom resolver to work around WSCOMMONS-228
+        serviceBuilder.setCustomResolver(new URIResolverImpl(def));
+        serviceBuilder.setBaseUri(def.getDocumentBaseURI());
+        // [rfeng]
+        // Allow access to read properties. Requires PropertiesPermission in security policy.
+        AxisService axisService;         
+        try {        
+            axisService = AccessController.doPrivileged(new PrivilegedExceptionAction<AxisService>() {
+                public AxisService run() throws AxisFault {
+                    return serviceBuilder.populateService();
+                }
+            });
+            } catch ( PrivilegedActionException e ) {
+               throw (AxisFault) e.getException();
+            }
+
+        AxisEndpoint axisEndpoint = (AxisEndpoint)axisService.getEndpoints().get(axisService.getEndpointName());
+        options.setTo(new EndpointReference(axisEndpoint.getEndpointURL()));
+        if (axisEndpoint != null) {
+            options.setSoapVersionURI((String)axisEndpoint.getBinding().getProperty(WSDL2Constants.ATTR_WSOAP_VERSION));
+        }
+        return axisService;
+    }
+
+    /*
+    private static <T extends ExtensibilityElement> T getExtensibilityElement(List elements, Class<T> type) {
+        for (Object e : elements) {
+            if (type.isInstance(e)) {
+                return type.cast(e);
+            }
+        }
+        return null;
+    }
+    */
+
+    protected void stop() {
+        if (serviceClient != null) {
+            // close all connections that we have initiated, so that the jetty server
+            // can be restarted without seeing ConnectExceptions
+            HttpClient httpClient =
+                (HttpClient)serviceClient.getServiceContext().getConfigurationContext()
+                    .getProperty(HTTPConstants.CACHED_HTTP_CLIENT);
+            if (httpClient != null)
+                ((MultiThreadedHttpConnectionManager)httpClient.getHttpConnectionManager()).shutdown();
+
+            serviceClient = null;
+        }
+    }
+
+    /**
+     * Create and configure an Axis2BindingInvoker for each operation
+     */
+    protected Invoker createInvoker(Operation operation) {
+        Options options = new Options();
+        EndpointReference epTo = getWSATOEPR(wsBinding);
+        if (epTo != null) {
+            options.setTo(epTo);
+        }
+        options.setProperty(HTTPConstants.CHUNKED, Boolean.FALSE);
+
+        String operationName = operation.getName();
+
+        String soapAction = getSOAPAction(operationName);
+        if (soapAction != null && soapAction.length() > 1) {
+            options.setAction(soapAction);
+        }
+
+        options.setTimeOutInMilliSeconds(30 * 1000); // 30 seconds
+
+        // Allow privileged access to read properties. Requires PropertiesPermission read in
+        // security policy.
+        SOAPFactory soapFactory = AccessController.doPrivileged(new PrivilegedAction<SOAPFactory>() {
+            public SOAPFactory run() {
+                if (requiresSOAP12())
+                    return OMAbstractFactory.getSOAP12Factory();
+                else
+                    return OMAbstractFactory.getSOAP11Factory();
+
+            }
+        });
+        QName wsdlOperationQName = new QName(operationName);
+        if (requiresMTOM())
+        {
+        	options.setProperty(org.apache.axis2.Constants.Configuration.ENABLE_MTOM, org.apache.axis2.Constants.VALUE_TRUE);
+        }
+        Axis2BindingInvoker invoker;
+        if (operation.isNonBlocking()) {
+            invoker = new Axis2OneWayBindingInvoker(this, wsdlOperationQName, options, soapFactory, policyHandlerList);
+        } else {
+            invoker = new Axis2BindingInvoker(this, wsdlOperationQName, options, soapFactory, policyHandlerList);
+        }
+        
+        return invoker;
+    }
+
+    private boolean requiresSOAP12() {
+        return isIntentRequired(wsBinding, SOAP12_INTENT);
+    }
+
+    private boolean requiresMTOM() {
+        return isIntentRequired(wsBinding, AxisPolicyHelper.MTOM_INTENT);
+    }
+
+    protected EndpointReference getWSATOEPR(WebServiceBinding binding) {
+        EndpointReference epr = getEPR(binding);
+        if (epr == null) {
+            epr = getPortLocationEPR(binding);
+        } else if (epr.getAddress() == null || epr.getAddress().length() < 1) {
+            EndpointReference bindingEPR = getPortLocationEPR(binding);
+            if (bindingEPR != null) {
+                epr.setAddress(bindingEPR.getAddress());
+            }
+        }
+        return epr;
+    }
+
+    protected EndpointReference getPortLocationEPR(WebServiceBinding binding) {
+        String ep = null;
+        if (binding.getPort() != null) {
+            List<?> wsdlPortExtensions = binding.getPort().getExtensibilityElements();
+            for (final Object extension : wsdlPortExtensions) {
+                if (extension instanceof SOAPAddress) {
+                    ep = ((SOAPAddress)extension).getLocationURI();
+                    break;
+                }
+                if (extension instanceof SOAP12Address) {
+                    SOAP12Address address = (SOAP12Address)extension;
+                    ep = address.getLocationURI();
+                    break;
+                }
+            }
+        }
+        if(ep == null || ep.equals("")) {
+            ep = binding.getURI();
+        }
+        return ep == null || "".equals(ep) ? null : new EndpointReference(ep);
+    }
+
+    protected org.apache.axis2.addressing.EndpointReference getEPR(WebServiceBinding wsBinding) {
+        if (wsBinding.getEndPointReference() == null) {
+            return null;
+        }
+        try {
+
+            XMLStreamReader parser =
+                XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(wsBinding.getEndPointReference()));
+            StAXOMBuilder builder = new StAXOMBuilder(parser);
+            OMElement omElement = builder.getDocumentElement();
+            org.apache.axis2.addressing.EndpointReference epr = EndpointReferenceHelper.fromOM(omElement);
+            return epr;
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (XMLStreamException e) {
+            throw new RuntimeException(e);
+        } catch (FactoryConfigurationError e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected String getSOAPAction(String operationName) {
+        Binding binding = wsBinding.getBinding();
+        if (binding != null) {
+            for (Object o : binding.getBindingOperations()) {
+                BindingOperation bop = (BindingOperation)o;
+                if (bop.getName().equalsIgnoreCase(operationName)) {
+                    for (Object o2 : bop.getExtensibilityElements()) {
+                        if (o2 instanceof SOAPOperation) {
+                            return ((SOAPOperation)o2).getSoapActionURI();
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private void createPolicyHandlers() throws IllegalAccessException, InstantiationException, ClassNotFoundException {
+        if (wsBinding instanceof PolicySetAttachPoint) {
+            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)wsBinding;
+            PolicyHandler policyHandler = null;
+            for (PolicySet policySet : policiedBinding.getPolicySets()) {
+                policyHandler = PolicyHandlerUtils.findPolicyHandler(policySet, policyHandlerClassnames);
+                if (policyHandler != null) {
+                    policyHandler.setApplicablePolicySet(policySet);
+                    policyHandlerList.add(policyHandler);
+                }
+            }
+        }
+    }
+
+    private void setupPolicyHandlers(List<PolicyHandler> policyHandlers, ConfigurationContext configContext) {
+        for (PolicyHandler aHandler : policyHandlers) {
+            aHandler.setUp(configContext);
+        }
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
new file mode 100644
index 0000000000..3b188b0176
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.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.ws.axis2;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.receivers.AbstractInMessageReceiver;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.policy.util.PolicyHandler;
+
+public class Axis2ServiceInMessageReceiver extends AbstractInMessageReceiver {
+
+    protected Operation operation;
+
+    private Axis2ServiceProvider provider;
+    
+    private List<PolicyHandler> policyHandlerList = null;
+
+    public Axis2ServiceInMessageReceiver(Axis2ServiceProvider provider, Operation operation, List<PolicyHandler> policyHandlerList) {
+        this.provider = provider;
+        this.operation = operation;
+        this.policyHandlerList = policyHandlerList;
+    }
+
+    public Axis2ServiceInMessageReceiver() {
+    }
+
+    @Override
+    public void invokeBusinessLogic(MessageContext inMC) throws AxisFault {
+        try {
+            OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
+            Object[] args = new Object[] {requestOM};
+            
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.beforeInvoke(operation, args, inMC);
+            }
+            
+            provider.invokeTarget(operation, args, inMC);
+            
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.afterInvoke(operation, args, inMC);
+            }
+
+        } catch (InvocationTargetException e) {
+            Throwable t = e.getCause();
+            if (t instanceof Exception) {
+                throw AxisFault.makeFault((Exception)t);
+            }
+            throw new RuntimeException(e);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw AxisFault.makeFault(e);
+        }
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
new file mode 100644
index 0000000000..20930666b1
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
@@ -0,0 +1,99 @@
+/*
+ * 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.ws.axis2;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.util.FaultException;
+import org.apache.tuscany.sca.policy.util.PolicyHandler;
+import org.osoa.sca.ServiceRuntimeException;
+
+public class Axis2ServiceInOutSyncMessageReceiver extends AbstractInOutSyncMessageReceiver {
+    private static final Logger logger = Logger.getLogger(Axis2ServiceInOutSyncMessageReceiver.class.getName());
+	
+    protected Operation operation;
+    private List<PolicyHandler> policyHandlerList = null;
+
+    private Axis2ServiceProvider provider;
+
+    public Axis2ServiceInOutSyncMessageReceiver(Axis2ServiceProvider provider, Operation operation, List<PolicyHandler> policyHandlerList) {
+        this.provider = provider;
+        this.operation = operation;
+        this.policyHandlerList = policyHandlerList;
+    }
+
+    public Axis2ServiceInOutSyncMessageReceiver() {
+    }
+
+    @Override
+    public void invokeBusinessLogic(MessageContext inMC, MessageContext outMC) throws AxisFault {
+        try {
+            OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
+            Object[] args = null;
+            	
+            if (requestOM != null) {
+            	args = new Object[] {requestOM};
+            }
+            
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.beforeInvoke(operation, args, inMC);
+            }
+            
+            OMElement responseOM = (OMElement)provider.invokeTarget(operation, args, inMC);
+            
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.afterInvoke(operation, args, inMC, responseOM);
+            }
+
+            SOAPEnvelope soapEnvelope = getSOAPFactory(inMC).getDefaultEnvelope();
+            if (null != responseOM ) {
+                soapEnvelope.getBody().addChild(responseOM);
+            }
+            outMC.setEnvelope(soapEnvelope);
+            outMC.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
+
+        } catch (InvocationTargetException e) {
+            Throwable t = e.getCause();
+            if (t instanceof FaultException && ((FaultException)t).getFaultInfo() instanceof OMElement) {
+                OMElement faultDetail = (OMElement)((FaultException)t).getFaultInfo();
+                inMC.setProperty(Constants.FAULT_NAME, faultDetail.getQName().getLocalPart());
+                AxisFault f = new AxisFault(null, e.getMessage(), "faultNode", "faultRole", faultDetail);
+                throw f;
+            }
+            if (t instanceof Exception) {
+                throw AxisFault.makeFault((Exception)t);
+            }
+            logger.log(Level.SEVERE, e.getMessage(), t);
+            throw new ServiceRuntimeException(e);
+        } catch (Throwable e) {
+            logger.log(Level.SEVERE, e.getMessage(), e);
+            throw AxisFault.makeFault(e);
+        }
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
new file mode 100644
index 0000000000..532c0848ec
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -0,0 +1,758 @@
+/*
+ * 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.ws.axis2;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Import;
+import javax.wsdl.Port;
+import javax.wsdl.Types;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.dom.DOMSource;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.addressing.EndpointReferenceHelper;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.deployment.util.Utils;
+import org.apache.axis2.description.AxisEndpoint;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.WSDLToAxisServiceBuilder;
+import org.apache.axis2.engine.ListenerManager;
+import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.transport.jms.JMSConstants;
+import org.apache.axis2.transport.jms.JMSListener;
+import org.apache.axis2.transport.jms.JMSSender;
+import org.apache.axis2.transport.jms.JMSUtils;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.tuscany.sca.assembly.AbstractContract;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceClient.URIResolverImpl;
+import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.interfacedef.Interface;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy;
+import org.apache.tuscany.sca.policy.util.PolicyHandler;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils;
+import org.apache.tuscany.sca.runtime.EndpointReference;
+import org.apache.tuscany.sca.runtime.ReferenceParameters;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+import org.apache.tuscany.sca.xsd.XSDefinition;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaExternal;
+import org.apache.ws.security.WSSecurityEngineResult;
+import org.apache.ws.security.handler.WSHandlerConstants;
+import org.apache.ws.security.handler.WSHandlerResult;
+import org.osoa.sca.ServiceRuntimeException;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+
+public class Axis2ServiceProvider {
+    public static final String IMPORT_TAG = "import";
+    public static final String INCLUDE_TAG = "include";
+    
+    private static final Logger logger = Logger.getLogger(Axis2ServiceProvider.class.getName());    
+
+    private RuntimeComponent component;
+    private AbstractContract contract;
+    private WebServiceBinding wsBinding;
+    private ServletHost servletHost;
+    private MessageFactory messageFactory;
+    private ConfigurationContext configContext;
+    private JMSSender jmsSender;
+    private JMSListener jmsListener;
+    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
+    private List<PolicyHandler> policyHandlerList = new ArrayList<PolicyHandler>();
+    private Map<String, Port> urlMap = new HashMap<String, Port>();
+
+    public static final QName QNAME_WSA_ADDRESS =
+        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.EPR_ADDRESS);
+    public static final QName QNAME_WSA_FROM =
+        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_FROM);
+    public static final QName QNAME_WSA_REFERENCE_PARAMETERS =
+        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.EPR_REFERENCE_PARAMETERS);
+
+    private static final QName TRANSPORT_JMS_QUALIFIED_INTENT =
+        new QName("http://www.osoa.org/xmlns/sca/1.0", "transport.jms");
+    private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
+
+    //Schema element names
+    public static final String ELEM_SCHEMA = "schema";
+
+    //Schema URI
+    public static final String NS_URI_XSD_1999 = "http://www.w3.org/1999/XMLSchema";
+    public static final String NS_URI_XSD_2000 = "http://www.w3.org/2000/10/XMLSchema";
+    public static final String NS_URI_XSD_2001 = "http://www.w3.org/2001/XMLSchema";
+
+    //Schema QNames
+    public static final QName Q_ELEM_XSD_1999 = new QName(NS_URI_XSD_1999, ELEM_SCHEMA);
+    public static final QName Q_ELEM_XSD_2000 = new QName(NS_URI_XSD_2000, ELEM_SCHEMA);
+    public static final QName Q_ELEM_XSD_2001 = new QName(NS_URI_XSD_2001, ELEM_SCHEMA);
+    public static final List<QName> XSD_QNAME_LIST =
+        Arrays.asList(new QName[] {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001});
+
+    public Axis2ServiceProvider(RuntimeComponent component,
+                                AbstractContract contract,
+                                WebServiceBinding wsBinding,
+                                ServletHost servletHost,
+                                MessageFactory messageFactory,
+                                Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
+
+        this.component = component; 
+        this.contract = contract; 
+        this.wsBinding = wsBinding;
+        this.servletHost = servletHost;
+        this.messageFactory = messageFactory;
+        this.policyHandlerClassnames = policyHandlerClassnames;
+
+        final boolean isRampartRequired = AxisPolicyHelper.isRampartRequired(wsBinding);
+        try {
+            // TuscanyAxisConfigurator tuscanyAxisConfigurator = new TuscanyAxisConfigurator();
+            // Allow privileged access to read properties. Requires PropertyPermission read in
+            // security policy.
+            TuscanyAxisConfigurator tuscanyAxisConfigurator =
+                AccessController.doPrivileged(new PrivilegedExceptionAction<TuscanyAxisConfigurator>() {
+                    public TuscanyAxisConfigurator run() throws AxisFault {
+                        return new TuscanyAxisConfigurator(isRampartRequired);
+                    }
+                });
+            configContext = tuscanyAxisConfigurator.getConfigurationContext();
+            // deployRampartModule();
+            // configureSecurity();
+        } catch (PrivilegedActionException e) {
+            throw new ServiceRuntimeException(e.getException());
+        } catch (AxisFault e) {
+            throw new ServiceRuntimeException(e); // TODO: better exception
+        } 
+
+        configContext.setContextRoot(servletHost.getContextPath());
+
+        // Update port addresses with runtime information, and create a
+        // map from endpoint URIs to WSDL ports that eliminates duplicate
+        // ports for the same endpoint.
+        for (Object port : wsBinding.getService().getPorts().values()) {
+            String portAddress = getPortAddress((Port)port);
+            String endpointURI = computeEndpointURI(portAddress, servletHost);
+            setPortAddress((Port)port, endpointURI);
+            urlMap.put(endpointURI, (Port)port);
+        }
+    }
+
+    static String getPortAddress(Port port) {
+        Object ext = port.getExtensibilityElements().get(0);
+        if (ext instanceof SOAPAddress) {
+            return ((SOAPAddress)ext).getLocationURI();
+        }
+        if (ext instanceof SOAP12Address) {
+            return ((SOAP12Address)ext).getLocationURI();
+        }
+        return null;
+    }
+
+    static void setPortAddress(Port port, String locationURI) {
+        Object ext = port.getExtensibilityElements().get(0);
+        if (ext instanceof SOAPAddress) {
+            ((SOAPAddress)ext).setLocationURI(locationURI);
+        }
+        if (ext instanceof SOAP12Address) {
+            ((SOAP12Address)ext).setLocationURI(locationURI);
+        }
+    }
+
+    private String computeEndpointURI(String uri, ServletHost servletHost) {
+
+        if (uri == null) {
+            return null;
+        }
+
+        // pull out the binding intents to see what sort of transport is required
+        PolicySet transportJmsPolicySet = AxisPolicyHelper.getPolicySet(wsBinding, TRANSPORT_JMS_QUALIFIED_INTENT);
+        if (transportJmsPolicySet != null){
+            if (!uri.startsWith("jms:/")) {
+                uri = "jms:" + uri;
+            }
+            
+            // construct the rest of the URI based on the policy. All the details are put
+            // into the URI here rather than being place directly into the Axis configuration 
+            // as the Axis JMS sender relies on parsing the target URI      
+            Axis2ConfigParamPolicy axis2ConfigParamPolicy = null;
+            for ( Object policy : transportJmsPolicySet.getPolicies() ) {
+                if ( policy instanceof Axis2ConfigParamPolicy ) {
+                    axis2ConfigParamPolicy = (Axis2ConfigParamPolicy)policy;
+                    Iterator paramIterator = axis2ConfigParamPolicy.getParamElements().get(DEFAULT_QUEUE_CONNECTION_FACTORY).getChildElements();
+                    
+                    if (paramIterator.hasNext()){
+                        StringBuffer uriParams = new StringBuffer("?");
+                       
+                        while (paramIterator.hasNext()){
+                            OMElement parameter = (OMElement)paramIterator.next();
+                            uriParams.append(parameter.getAttributeValue(new QName("","name")));
+                            uriParams.append("=");
+                            uriParams.append(parameter.getText());
+                            
+                            if (paramIterator.hasNext()){
+                                uriParams.append("&");
+                            }
+                        }
+                        
+                        uri = uri + uriParams;
+                    }
+                }
+            }                     
+        } else {
+            if (!uri.startsWith("jms:")) {
+                uri = servletHost.getURLMapping(uri).toString();
+            }
+        }
+
+        return uri;
+    }
+
+    public void start() {
+
+        try {
+            createPolicyHandlers();
+            for (Map.Entry<String, Port> entry : urlMap.entrySet()) {
+                AxisService axisService = createAxisService(entry.getKey(), entry.getValue());
+                configContext.getAxisConfiguration().addService(axisService);
+            }
+            setupPolicyHandlers(policyHandlerList, configContext);
+          
+            Axis2ServiceServlet servlet = null;
+            for (String endpointURL : urlMap.keySet()) {
+                if (endpointURL.startsWith("http://") || endpointURL.startsWith("/")) {
+                    if (servlet == null) {
+                        servlet = new Axis2ServiceServlet();
+                        servlet.init(configContext);
+                    }
+                    //[nash] configContext.setContextRoot(endpointURL);
+                    servletHost.addServletMapping(endpointURL, servlet);
+                } else if (endpointURL.startsWith("jms")) {
+                    logger.log(Level.INFO,"Axis2 JMS URL=" + endpointURL);
+                    
+                    jmsListener = new JMSListener();
+                    jmsSender = new JMSSender();
+                    ListenerManager listenerManager = configContext.getListenerManager();
+                    TransportInDescription trsIn = configContext.getAxisConfiguration().getTransportIn(Constants.TRANSPORT_JMS);
+                                    
+                    // get JMS transport parameters from the computed URL
+                    Map<String, String> jmsProps = JMSUtils.getProperties(endpointURL);
+
+                    // collect the parameters used to configure the JMS transport
+                    OMFactory fac = OMAbstractFactory.getOMFactory();
+                    OMElement parms = fac.createOMElement(DEFAULT_QUEUE_CONNECTION_FACTORY, null);                    
+
+                    for ( String key : jmsProps.keySet() ) {
+                        OMElement param = fac.createOMElement("parameter", null);
+                        param.addAttribute( "name", key, null );
+                        param.addChild(fac.createOMText(param, jmsProps.get(key)));
+                        parms.addChild(param);
+                    }
+                    
+                    Parameter queueConnectionFactory = new Parameter(DEFAULT_QUEUE_CONNECTION_FACTORY, parms);
+                    trsIn.addParameter( queueConnectionFactory );
+                    
+                    trsIn.setReceiver(jmsListener);
+
+                    configContext.getAxisConfiguration().addTransportIn( trsIn );
+                    TransportOutDescription trsOut = configContext.getAxisConfiguration().getTransportOut(Constants.TRANSPORT_JMS);
+                    //configContext.getAxisConfiguration().addTransportOut( trsOut );
+                    trsOut.setSender(jmsSender);
+
+                    if (listenerManager == null) {
+                        listenerManager = new ListenerManager();
+                        listenerManager.init(configContext);
+                    }
+                    listenerManager.addListener(trsIn, true);
+                    jmsSender.init(configContext, trsOut);
+                    jmsListener.init(configContext, trsIn);
+                    jmsListener.start();
+                }
+            }
+        } catch (AxisFault e) {
+            throw new RuntimeException(e);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void stop() {
+        if ( jmsListener != null ) {
+            jmsListener.stop();
+            jmsListener.destroy();
+        }
+        else {
+            for (String endpointURL : urlMap.keySet()) {
+                servletHost.removeServletMapping(endpointURL);
+            }
+        }
+
+        if ( jmsSender != null )
+            jmsSender.stop();
+
+        try {
+            for (String endpointURL : urlMap.keySet()) {
+                // get the path to the service
+                URI uriPath = new URI(endpointURL);
+                String stringURIPath = uriPath.getPath();
+            
+                /* [nash] Need a leading slash for WSDL imports to work with ?wsdl
+                // remove any "/" from the start of the path
+                if (stringURIPath.startsWith("/")) {
+                    stringURIPath = stringURIPath.substring(1, stringURIPath.length());
+                }
+                */
+            
+                configContext.getAxisConfiguration().removeService(stringURIPath);
+            }
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        } catch (AxisFault e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AxisService createAxisService(String endpointURL, Port port) throws AxisFault {
+        AxisService axisService;
+        if (wsBinding.getWSDLDocument() != null) {
+            axisService = createWSDLAxisService(endpointURL, port);
+        } else {
+            axisService = createJavaAxisService(endpointURL);
+        }
+        initAxisOperations(axisService);
+        return axisService;
+    }
+
+    /**
+     * Create an AxisService from the interface class from the SCA service interface
+     */
+    protected AxisService createJavaAxisService(String endpointURL) throws AxisFault {
+        AxisService axisService = new AxisService();
+        String path = URI.create(endpointURL).getPath();
+        axisService.setName(path);
+        axisService.setServiceDescription("Tuscany configured AxisService for service: " + endpointURL);
+        axisService.setClientSide(false);
+        Parameter classParam =
+            new Parameter(Constants.SERVICE_CLASS, ((JavaInterface)contract.getInterfaceContract().getInterface())
+                .getJavaClass().getName());
+        axisService.addParameter(classParam);
+        try {
+            Utils.fillAxisService(axisService, configContext.getAxisConfiguration(), null, null);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return axisService;
+    }
+    
+    /**
+     * Workaround for https://issues.apache.org/jira/browse/AXIS2-3205
+     * @param definition
+     * @param serviceName
+     * @return
+     */
+    private static Definition getDefinition(Definition definition, QName serviceName) {
+        
+        if (serviceName == null){
+            return definition;
+        }
+        
+        if (definition == null) {
+            return null;
+        }
+        Object service = definition.getServices().get(serviceName);
+        if (service != null) {
+            return definition;
+        }
+        for (Object i : definition.getImports().values()) {
+            List<Import> imports = (List<Import>)i;
+            for (Import imp : imports) {
+                Definition d = getDefinition(imp.getDefinition(), serviceName);
+                if (d != null) {
+                    return d;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create an AxisService from the WSDL doc used by ws binding
+     */
+    protected AxisService createWSDLAxisService(String endpointURL, Port port) throws AxisFault {
+
+        Definition definition = wsBinding.getWSDLDocument();
+        QName serviceQName = wsBinding.getService().getQName();
+        Definition def = getDefinition(definition, serviceQName);
+
+        final WSDLToAxisServiceBuilder builder = new WSDL11ToAxisServiceBuilder(def, serviceQName, port.getName());
+        builder.setServerSide(true);
+        // [rfeng] Add a custom resolver to work around WSCOMMONS-228
+        builder.setCustomResolver(new URIResolverImpl(def));
+        builder.setBaseUri(def.getDocumentBaseURI());
+        // [rfeng]        
+        // AxisService axisService = builder.populateService();
+        // Allow privileged access to read properties. Requires PropertiesPermission read in
+        // security policy.
+        AxisService axisService;
+        try {
+            axisService = AccessController.doPrivileged(new PrivilegedExceptionAction<AxisService>() {
+                public AxisService run() throws AxisFault {
+                    return builder.populateService();
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            throw (AxisFault)e.getException();
+        }
+
+        String name = URI.create(endpointURL).getPath();
+        //[nash] HTTP endpoints need a leading slash for WSDL imports to work with ?wsdl
+        if (endpointURL.startsWith("jms")) {
+            name = name.startsWith("/") ? name.substring(1) : name;
+        }
+        axisService.setName(name);
+        axisService.setEndpointURL(endpointURL);
+        axisService.setDocumentation("Tuscany configured AxisService for service: " + endpointURL);
+        for ( Iterator i = axisService.getEndpoints().values().iterator(); i.hasNext(); ) {
+            AxisEndpoint ae = (AxisEndpoint)i.next();
+            if (endpointURL.startsWith("jms") ) {
+                Parameter qcf = new Parameter(JMSConstants.CONFAC_PARAM, null);
+                qcf.setValue(DEFAULT_QUEUE_CONNECTION_FACTORY);
+                axisService.addParameter(qcf);
+                break;
+            }
+        }
+
+        // Add schema information to the AxisService (needed for "?xsd=" support)
+        addSchemas(wsBinding.getWSDLDefinition(), axisService);
+
+        // Use the existing WSDL
+        Parameter wsdlParam = new Parameter(WSDLConstants.WSDL_4_J_DEFINITION, null);
+        wsdlParam.setValue(definition);
+        axisService.addParameter(wsdlParam);
+        Parameter userWSDL = new Parameter("useOriginalwsdl", "true");
+        axisService.addParameter(userWSDL);
+
+        // Modify schema imports and includes to add "servicename?xsd=" prefix.
+        // Axis2 does this for schema extensibility elements, but Tuscany has
+        // overriden the WSDl4J deserializer to create UnknownExtensibilityElement
+        // elements in place of these.
+        modifySchemaImportsAndIncludes(definition, name);
+
+        // Axis2 1.3 has a bug with returning incorrect values for the port
+        // addresses.  To work around this, compute the values here.
+        Parameter modifyAddr = new Parameter("modifyUserWSDLPortAddress", "false");
+        axisService.addParameter(modifyAddr);
+
+        return axisService;
+    }
+
+    private void addSchemas(WSDLDefinition wsdlDef, AxisService axisService) {
+        for (XSDefinition xsDef : wsdlDef.getXmlSchemas()) {
+            if (xsDef.getSchema() != null) {
+                axisService.addSchema(xsDef.getSchema());
+                updateSchemaRefs(xsDef.getSchema(), axisService.getName());
+            }
+        }
+        for (WSDLDefinition impDef : wsdlDef.getImportedDefinitions()) {
+            addSchemas(impDef, axisService);
+        }
+    }
+
+    private void updateSchemaRefs(XmlSchema parentSchema, String name) {
+        for (Iterator iter = parentSchema.getIncludes().getIterator(); iter.hasNext();) {
+            Object obj = iter.next();
+            if (obj instanceof XmlSchemaExternal) {
+                XmlSchemaExternal extSchema = (XmlSchemaExternal)obj;
+                String location = extSchema.getSchemaLocation();
+                if (location.length() > 0 && location.indexOf(":/") < 0 && location.indexOf("?xsd=") < 0) {
+                    extSchema.setSchemaLocation(name + "?xsd=" + location);
+                }
+                if (extSchema.getSchema() != null) {
+                    updateSchemaRefs(extSchema.getSchema(), name);
+                }
+            }
+        }
+    }
+
+    private void modifySchemaImportsAndIncludes(Definition definition, String name){
+        // adjust the schema locations in types section
+        Types types = definition.getTypes();
+        if (types != null) {
+            for (Iterator iter = types.getExtensibilityElements().iterator(); iter.hasNext();) {
+                Object ext = iter.next();
+                if (ext instanceof UnknownExtensibilityElement &&
+                    XSD_QNAME_LIST.contains(((UnknownExtensibilityElement)ext).getElementType())) {
+                    changeLocations(((UnknownExtensibilityElement)ext).getElement(), name);
+                }
+            }
+        }
+        for (Iterator iter = definition.getImports().values().iterator(); iter.hasNext();) {
+            Vector values = (Vector)iter.next();
+            for (Iterator valuesIter = values.iterator(); valuesIter.hasNext();) {
+                Import wsdlImport = (Import)valuesIter.next();
+                modifySchemaImportsAndIncludes(wsdlImport.getDefinition(), name);
+            }
+        }
+    }
+
+    private void changeLocations(Element element, String name) {
+        NodeList nodeList = element.getChildNodes();
+        for (int i = 0; i < nodeList.getLength(); i++) {
+            String tagName = nodeList.item(i).getLocalName();
+            if (IMPORT_TAG.equals(tagName) || INCLUDE_TAG.equals(tagName)) {
+                processImport(nodeList.item(i), name);
+            }
+        }
+    }
+
+    private void processImport(Node importNode, String name) {
+        NamedNodeMap nodeMap = importNode.getAttributes();
+        for (int i = 0; i < nodeMap.getLength(); i++) {
+            Node attribute = nodeMap.item(i);
+            if (attribute.getNodeName().equals("schemaLocation")) {
+                String location = attribute.getNodeValue();
+                if (location.indexOf(":/") < 0 & location.indexOf("?xsd=") < 0) {
+                    attribute.setNodeValue(name + "?xsd=" + location);
+                }
+            }
+        }
+    }
+
+    protected void initAxisOperations(AxisService axisService) {
+        for (Iterator<?> i = axisService.getOperations(); i.hasNext();) {
+            AxisOperation axisOp = (AxisOperation)i.next();
+            Operation op = getOperation(axisOp);
+            if (op != null) {
+
+                if (op.isNonBlocking()) {
+                    axisOp.setMessageExchangePattern(WSDL2Constants.MEP_URI_IN_ONLY);
+                } else {
+                    axisOp.setMessageExchangePattern(WSDL2Constants.MEP_URI_IN_OUT);
+                }
+
+                MessageReceiver msgrec = null;
+                if (op.isNonBlocking()) {
+                    msgrec = new Axis2ServiceInMessageReceiver(this, op, policyHandlerList);
+                } else {
+                    msgrec = new Axis2ServiceInOutSyncMessageReceiver(this, op, policyHandlerList);
+                }
+                axisOp.setMessageReceiver(msgrec);
+            }
+        }
+    }
+
+    protected Operation getOperation(AxisOperation axisOp) {
+        String operationName = axisOp.getName().getLocalPart();
+        Interface iface = wsBinding.getBindingInterfaceContract().getInterface();
+        for (Operation op : iface.getOperations()) {
+            if (op.getName().equalsIgnoreCase(operationName)) {
+                return op;
+            }
+        }
+        return null;
+    }
+
+    // methods for Axis2 message receivers
+
+    public Object invokeTarget(Operation op, Object[] args, MessageContext inMC) throws InvocationTargetException {
+        String callbackAddress = null;
+        String callbackID = null;
+        Object conversationID = null;
+
+        //FIXME: can we use the Axis2 addressing support for this?
+        SOAPHeader header = inMC.getEnvelope().getHeader();
+        if (header != null) {
+            OMElement from = header.getFirstChildWithName(QNAME_WSA_FROM);
+            if (from != null) {
+                OMElement callbackAddrElement = from.getFirstChildWithName(QNAME_WSA_ADDRESS);
+                if (callbackAddrElement != null) {
+                    if (contract.getInterfaceContract().getCallbackInterface() != null) {
+                        callbackAddress = callbackAddrElement.getText();
+                    }
+                }
+                OMElement params = from.getFirstChildWithName(QNAME_WSA_REFERENCE_PARAMETERS);
+                if (params != null) {
+                    OMElement convIDElement =
+                        params.getFirstChildWithName(Axis2BindingInvoker.CONVERSATION_ID_REFPARM_QN);
+                    if (convIDElement != null) {
+                        if (isConversational()) {
+                            conversationID = convIDElement.getText();
+                        }
+                    }
+                    OMElement callbackIDElement =
+                        params.getFirstChildWithName(Axis2BindingInvoker.CALLBACK_ID_REFPARM_QN);
+                    if (callbackIDElement != null) {
+                        callbackID = callbackIDElement.getText();
+                    }
+                }
+            }
+        }
+
+        // create a message object and set the args as its body
+        Message msg = messageFactory.createMessage();
+        msg.setBody(args);
+        msg.setOperation(op);
+        
+        //fill message with QoS context info 
+        fillQoSContext(msg, inMC);
+        
+        // if reference parameters are needed, create a new "From" EPR to hold them
+        EndpointReference from = null;
+        ReferenceParameters parameters = null;
+        if (callbackAddress != null ||
+            callbackID != null ||
+            conversationID != null) {
+            from = new EndpointReferenceImpl(null);
+            parameters = from.getReferenceParameters();
+            msg.setFrom(from);
+        }
+
+        // set the reference parameters into the "From" EPR
+        if (callbackAddress != null) {
+            parameters.setCallbackReference(new EndpointReferenceImpl(callbackAddress));
+        }
+        if (callbackID != null) {
+            parameters.setCallbackID(callbackID);
+        }
+        if (conversationID != null) {
+            parameters.setConversationID(conversationID);
+        }
+
+        // find the runtime wire and invoke it with the message
+        RuntimeWire wire = ((RuntimeComponentService)contract).getRuntimeWire(getBinding());
+        return wire.invoke(op, msg);
+    }
+
+    public boolean isConversational() {
+        return wsBinding.getBindingInterfaceContract().getInterface().isConversational();
+    }
+
+    /**
+     * Return the binding for this provider as a primitive binding type
+     * For use when looking up wires registered against the binding.
+     * 
+     * @return the binding
+     */
+    protected Binding getBinding() {
+        return wsBinding;
+    }
+    
+    private void setupPolicyHandlers(List<PolicyHandler> policyHandlers, ConfigurationContext configContext)  {
+        for ( PolicyHandler aHandler : policyHandlers ) {
+            aHandler.setUp(configContext);
+        }
+    }
+    
+    private void createPolicyHandlers() throws IllegalAccessException,
+                                               InstantiationException, 
+                                               ClassNotFoundException {
+        if (wsBinding instanceof PolicySetAttachPoint) {
+            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)wsBinding;
+            PolicyHandler policyHandler = null;
+            for (PolicySet policySet : policiedBinding.getPolicySets()) {
+                policyHandler =
+                    PolicyHandlerUtils.findPolicyHandler(policySet, policyHandlerClassnames);
+                if (policyHandler != null) {
+                    policyHandler.setApplicablePolicySet(policySet);
+                    policyHandlerList.add(policyHandler);
+                }
+            }
+        }
+    }
+     
+    
+    private void fillQoSContext(Message message, MessageContext axis2MsgCtx) {
+        if ( axis2MsgCtx.getProperty(WSHandlerConstants.RECV_RESULTS) != null &&
+            axis2MsgCtx.getProperty(WSHandlerConstants.RECV_RESULTS) instanceof Vector ) {
+            Vector recvResults = (Vector)axis2MsgCtx.getProperty(WSHandlerConstants.RECV_RESULTS);
+            for ( int count1 = 0 ; count1 < recvResults.size() ; ++count1 ) {
+                if ( recvResults.elementAt(count1) instanceof WSHandlerResult ) {
+                    WSHandlerResult wshr = (WSHandlerResult)recvResults.elementAt(count1);
+                    Vector results = wshr.getResults();
+                    for ( int count2 = 0 ; count2 < results.size() ; ++count2 ) {
+                        if ( results.elementAt(count2) instanceof WSSecurityEngineResult ) {
+                            WSSecurityEngineResult securityResult = 
+                                (WSSecurityEngineResult)wshr.getResults().elementAt(count2);
+                            if ( securityResult.get("principal") != null ) {
+                                message.getQoSContext().put(Message.QOS_CTX_SECURITY_PRINCIPAL, securityResult.get("principal"));
+                            }
+                        }
+                    }
+                }
+            }
+            
+        }
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
new file mode 100644
index 0000000000..4ef71fafe6
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
@@ -0,0 +1,294 @@
+/*
+ * 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.ws.axis2;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.transport.http.AxisServlet;
+import org.apache.axis2.transport.http.ListingAgent;
+import org.apache.axis2.transport.http.server.HttpUtils;
+
+/**
+ * This overrides the Servlet init of the AxisServlet so Tuscany can use
+ * a single Axis2 ConfigurationContext instance shared between AxisServlet 
+ * instances for each SCA service with a ws binding. 
+ * TODO: need to review if thats really what we want to be doing
+ *
+ * @version $Rev$ $Date$
+ */
+public class Axis2ServiceServlet extends AxisServlet {
+
+    protected TuscanyListingAgent agent;
+
+    private static final long serialVersionUID = 1L;
+    private static final ServletConfig DUMMY_CONFIG = createDummyServletConfig();
+    
+//JIRA TUSCANY-1561 Port to Axis2 1.3    
+    private ConfigurationContext tmpconfigContext;
+
+    public void init(ConfigurationContext configContext) {
+        this.tmpconfigContext = configContext;
+        try {
+            super.init(DUMMY_CONFIG);
+        } catch (ServletException e) {
+            throw new RuntimeException(e);
+        }
+        agent = new TuscanyListingAgent(configContext);
+    }
+
+    /**
+     * Override Axis2 Servlet method to avoid loop when init 
+     * is called after servletConfig already initialized by
+     * this classes init(ConfigurationContext) method.
+     */
+    @Override
+    public void init() throws ServletException {
+    }
+
+    public void init(ServletConfig config) throws ServletException {
+        ServletContext servletContext = config.getServletContext();
+        servletContext.setAttribute(CONFIGURATION_CONTEXT, tmpconfigContext);
+        super.init(config);
+    }
+
+    /**
+     * We've setup the Servlet by passing in a ConfigurationContext on our init method 
+     * override this method to just return that
+     */
+    @Override
+    protected ConfigurationContext initConfigContext(ServletConfig config) throws ServletException {
+        return this.tmpconfigContext;
+    }
+    
+    @Override
+    public ServletConfig getServletConfig() {
+        return DUMMY_CONFIG;
+    }
+    
+    @Override
+    public String getServletName() {
+        return "TuscanyAxis2Servlet";
+    }
+
+    /**
+     * The AxisServlet gets NPE during init without a ServletConfig so this is a mocked up one to prevent that.
+     */
+    private static ServletConfig createDummyServletConfig() {
+        ServletConfig sc = new ServletConfig() {
+
+            public String getServletName() {
+                return "TuscanyAxis2DummyServlet";
+            }
+
+            public ServletContext getServletContext() {
+                return new ServletContext() {
+
+                    public ServletContext getContext(String uripath) {
+                        return null;
+                    }
+
+                    @SuppressWarnings("unused") // it's on the Servlet 2.5 API so we need it
+                    public String getContextPath() {
+                        return null;
+                    }
+
+                    public int getMajorVersion() {
+                        return 0;
+                    }
+
+                    public int getMinorVersion() {
+                        return 0;
+                    }
+
+                    public String getMimeType(String file) {
+                        return null;
+                    }
+
+                    public Set<?> getResourcePaths(String path) {
+                        return Collections.emptySet();
+                    }
+
+                    public URL getResource(String path) throws MalformedURLException {
+                        if("/".equals(path)) {
+                            // HACK: To avoid NPE
+                            return new URL("/axis2");
+                        }
+                        return null;
+                    }
+
+                    public InputStream getResourceAsStream(String path) {
+                        return null;
+                    }
+
+                    public RequestDispatcher getRequestDispatcher(String path) {
+                        return null;
+                    }
+
+                    public RequestDispatcher getNamedDispatcher(String arg0) {
+                        return null;
+                    }
+
+                    public Servlet getServlet(String arg0) throws ServletException {
+                        return null;
+                    }
+
+                    public Enumeration getServlets() {
+                        return null;
+                    }
+
+                    public Enumeration getServletNames() {
+                        return null;
+                    }
+
+                    public void log(String arg0) {
+                    }
+
+                    public void log(Exception arg0, String arg1) {
+                    }
+
+                    public void log(String arg0, Throwable arg1) {
+                    }
+
+                    public String getRealPath(String arg0) {
+                        return null;
+                    }
+
+                    public String getServerInfo() {
+                        return null;
+                    }
+
+                    public String getInitParameter(String arg0) {
+                        return null;
+                    }
+
+                    public Enumeration getInitParameterNames() {
+                        return null;
+                    }
+
+                    public Object getAttribute(String arg0) {
+                        return null;
+                    }
+
+                    public Enumeration getAttributeNames() {
+                        return null;
+                    }
+
+                    public void setAttribute(String arg0, Object arg1) {
+                    }
+
+                    public void removeAttribute(String arg0) {
+                    }
+
+                    public String getServletContextName() {
+                        return null;
+                    }
+                };
+            }
+
+            public String getInitParameter(String arg0) {
+                return null;
+            }
+
+            public Enumeration getInitParameterNames() {
+                return new Vector().elements();
+            }
+        };
+        return sc;
+    }
+
+    @Override
+    public void destroy() {
+        try {
+            super.destroy();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Override the AxisServlet doGet to use the TuscanyListingAgent for ?wsdl 
+     */
+    @Override
+    protected void doGet(HttpServletRequest request,
+                         HttpServletResponse response) throws ServletException, IOException {
+
+        initContextRoot(request);
+
+        String query = request.getQueryString();
+        if ((query != null) && (query.indexOf("wsdl2") >= 0 ||
+                query.indexOf("wsdl") >= 0 || query.indexOf("xsd") >= 0 ||
+                query.indexOf("policy") >= 0)) {
+            agent.processListService(request, response);
+        } else {
+            super.doGet(request, response);
+        }
+    }
+    
+    /**
+
+    /**
+     * Override the AxisServlet method so as to not add "/services" into the URL
+     * and to work with Tuscany service names. can go once moved to Axis2 1.3
+     */
+    @Override
+    public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault {
+        //RUNNING_PORT
+        String port = (String) configContext.getProperty(ListingAgent.RUNNING_PORT);
+        if (port == null) {
+            port = "8080";
+        }
+        if (ip == null) {
+            try {
+                ip = HttpUtils.getIpAddress();
+                if (ip == null) {
+                    ip = "localhost";
+                }
+            } catch (SocketException e) {
+//TUSCANY-1561 Port to Axis2 1.3                 
+//                throw new AxisFault.(e);
+                throw AxisFault.makeFault(e);
+            }
+        }
+
+        URI epURI = URI.create("http://" + ip + ":" + port + "/" + serviceName).normalize();
+
+        return new EndpointReference[]{new EndpointReference(epURI.toString())};
+    }
+    
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
new file mode 100644
index 0000000000..1f389b422f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
@@ -0,0 +1,79 @@
+/*
+ * 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.ws.axis2;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class AxisPolicyHelper {
+
+    public static final String XMLNS_SCA_1_0 = "http://www.osoa.org/xmlns/sca/1.0";
+    public static final QName AUTHENTICATION_INTENT = new QName(XMLNS_SCA_1_0, "authentication");
+    public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_1_0, "confidentiality");
+    public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_1_0, "integrity");
+    public static final QName MTOM_INTENT = new QName(XMLNS_SCA_1_0, "MTOM");
+    public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_1_0, "SOAP12");
+
+    public static PolicySet getPolicySet(Binding wsBinding, QName intentName) {
+        PolicySet returnPolicySet = null;
+
+        if (wsBinding instanceof PolicySetAttachPoint) {
+            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)wsBinding;
+            for (PolicySet policySet : policiedBinding.getPolicySets()) {
+                for (Intent intent : policySet.getProvidedIntents()) {
+                    if (intent.getName().equals(intentName)) {
+                        returnPolicySet = policySet;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return returnPolicySet;
+    }
+
+    public static boolean isIntentRequired(Binding wsBinding, QName intent) {
+        if (wsBinding instanceof IntentAttachPoint) {
+            List<Intent> intents = ((IntentAttachPoint)wsBinding).getRequiredIntents();
+            for (Intent i : intents) {
+                if (intent.equals(i.getName())) {
+                    return true;
+                }
+            }
+        }
+        return getPolicySet(wsBinding, intent) != null;
+    }
+
+    public static boolean isRampartRequired(Binding wsBinding) {
+        return isIntentRequired(wsBinding, AUTHENTICATION_INTENT) || isIntentRequired(wsBinding, INTEGRITY_INTENT)
+            || isIntentRequired(wsBinding, CONFIDENTIALITY_INTENT);
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
new file mode 100644
index 0000000000..8b3a5122d9
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
@@ -0,0 +1,206 @@
+/*
+ * 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.ws.axis2;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.deployment.DeploymentErrorMsgs;
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.deployment.ModuleBuilder;
+import org.apache.axis2.deployment.URLBasedAxisConfigurator;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.AxisConfigurator;
+import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.util.Loader;
+
+/**
+ * Helps configure Axis2 from a resource in binding.ws.axis2 instead of Axis2.xml 
+ * <p/> TODO: Review: should there be a single global Axis ConfigurationContext
+ *
+ * @version $Rev$ $Date$
+ */
+public class TuscanyAxisConfigurator extends URLBasedAxisConfigurator implements AxisConfigurator {
+    
+    /* these two fields are part of a temporary fix to solve problems that Maven has with including
+     * rampart-1.3.mar into the classpath and also at the time of Release 1.0 rampart-1.3.mar seems
+     * to pull in a SNAPSHOT version of rampart-project pom.  Hence rampart.mar has been excluded
+     * as a Maven dependency and has been packed with this module 
+     */
+    /************start of fix *********************************************************************/
+    private URL axis2_xml = 
+        getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml");
+    private URL axis2_repository = null;
+    private URL rampart_mar_url =
+        getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar");
+    /************** end of fix *************************************************************/
+    
+    private boolean isRampartRequired;
+    
+    public TuscanyAxisConfigurator(boolean isRampartRequired) throws AxisFault {
+        //super(TuscanyAxisConfigurator.class.getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml"), 
+        //      TuscanyAxisConfigurator.class.getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart.mar"));
+        super(getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml"), 
+                    null);
+        this.isRampartRequired = isRampartRequired;
+    }
+    
+    private static URL getResource(final String name) {
+        return AccessController.doPrivileged(new PrivilegedAction<URL>() {
+            public URL run() {
+                return TuscanyAxisConfigurator.class.getResource(name);
+            }
+        });
+    }
+
+    public ConfigurationContext getConfigurationContext() throws AxisFault {
+        if (configContext == null) {
+            configContext = ConfigurationContextFactory.createConfigurationContext(this);
+        }
+        return configContext;
+    }
+    
+    /* these three methods are part of a temporary fix to solve problems that Maven has with including
+     * rampart-1.3.mar into the classpath and also at the time of Release 1.0 rampart-1.3.mar seems
+     * to pull in a SNAPSHOT version of rampart-project pom.  Hence rampart.mar has been excluded
+     * as a Maven dependency and has been packed with this module 
+     */
+    /************start of fix *********************************************************************/
+    public AxisConfiguration getAxisConfiguration() throws AxisFault {
+        InputStream axis2xmlStream;
+        try {
+            if (axis2_xml == null) {
+                axis2xmlStream =
+                        Loader.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
+            } else {
+                axis2xmlStream = axis2_xml.openStream();
+            }
+            axisConfig = populateAxisConfiguration(axis2xmlStream);
+            if (isRampartRequired) {
+                axisConfig.addGlobalModuleRef("rampart");
+            }   
+            if (axis2_repository == null) {
+                Parameter axis2repoPara = axisConfig.getParameter(DeploymentConstants.AXIS2_REPO);
+                if (axis2repoPara != null) {
+                    String repoValue = (String) axis2repoPara.getValue();
+                    if (repoValue != null && !"".equals(repoValue.trim())) {
+                        if (repoValue.startsWith("file:/")) {
+                            // we treat this case specially , by assuming file is
+                            // located in the local machine
+                            loadRepository(repoValue);
+                        } else {
+                            loadRepositoryFromURL(new URL(repoValue));
+                        }
+                    }
+                } else {
+                    //log.info("No repository found , module will be loaded from classpath");
+                    try {
+                        loadFromClassPath(); 
+                    } catch ( Exception e ) {
+                        if (isRampartRequired) {
+                            loadRampartModule();
+                        }
+                    }
+                }
+                
+            } else {
+                loadRepositoryFromURL(axis2_repository);
+            }
+
+        } catch (IOException e) {
+            throw new AxisFault(e.getMessage());
+        }
+        axisConfig.setConfigurator(this);
+        return axisConfig;
+    }
+    
+    public void loadRampartModule() throws DeploymentException {
+        try {
+            ClassLoader deploymentClassLoader =
+                    org.apache.axis2.deployment.util.Utils.createClassLoader(
+                            new URL[]{rampart_mar_url},
+                            axisConfig.getModuleClassLoader(),
+                            true,
+                            (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+            final AxisModule module = new AxisModule();
+            module.setModuleClassLoader(deploymentClassLoader);
+            module.setParent(axisConfig);
+            //String moduleFile = fileUrl.substring(0, fileUrl.indexOf(".mar"));
+            if (module.getName() == null) {
+                module.setName(org.apache.axis2.util.Utils.getModuleName("rampart-1.3"));
+                module.setVersion(org.apache.axis2.util.Utils.getModuleVersion("rampart-1.3"));
+            }
+            populateModule(module, rampart_mar_url);
+            module.setFileName(rampart_mar_url);
+            // Allow privileged access to read properties. Requires PropertiesPermission read in
+            // security policy.
+            try {
+                AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+                    public Object run() throws IOException {
+                        addNewModule(module, axisConfig);
+                        return null;
+                    }
+                });
+            } catch (PrivilegedActionException e) {
+                throw (AxisFault)e.getException();
+            }            
+           
+            org.apache.axis2.util.Utils.
+                    calculateDefaultModuleVersion(axisConfig.getModules(), axisConfig);
+            axisConfig.validateSystemPredefinedPhases();
+        } catch (IOException e) {
+            throw new DeploymentException(e);
+        }
+    }
+    
+    private void populateModule(AxisModule module, URL moduleUrl) throws DeploymentException {
+        try {
+            ClassLoader classLoader = module.getModuleClassLoader();
+            InputStream moduleStream = classLoader.getResourceAsStream("META-INF/module.xml");
+            if (moduleStream == null) {
+                moduleStream = classLoader.getResourceAsStream("meta-inf/module.xml");
+            }
+            if (moduleStream == null) {
+                throw new DeploymentException(
+                        Messages.getMessage(
+                                DeploymentErrorMsgs.MODULE_XML_MISSING, moduleUrl.toString()));
+            }
+            ModuleBuilder moduleBuilder = new ModuleBuilder(moduleStream, module, axisConfig);
+            moduleBuilder.populateModule();
+        } catch (IOException e) {
+            throw new DeploymentException(e);
+        }
+    }
+    
+    /************** end of fix *************************************************************/
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
new file mode 100644
index 0000000000..34899a4af0
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
@@ -0,0 +1,105 @@
+/*
+ * 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.ws.axis2;
+
+import java.net.URI;
+import java.util.HashMap;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.RequestURIBasedDispatcher;
+import org.apache.axis2.util.JavaUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A Tuscany specific Axis2 Dispatcher that enables using services
+ * exposed at the SCA defined service URI instead of /services/<serviceName> 
+ *
+ * @version $Rev$ $Date$
+ */
+public class TuscanyDispatcher extends RequestURIBasedDispatcher {
+
+    public static final String NAME = "TuscanyDispatcher";
+    private static final Log log = LogFactory.getLog(RequestURIBasedDispatcher.class);
+    private static final boolean isDebugEnabled = log.isDebugEnabled();
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
+     */
+    @Override
+    public AxisService findService(MessageContext messageContext) throws AxisFault {
+        EndpointReference toEPR = messageContext.getTo();
+
+        if (toEPR != null) {
+            if(isDebugEnabled){
+                log.debug("Checking for Service using target endpoint address : " + toEPR.getAddress());
+            }
+
+            String path = URI.create(toEPR.getAddress()).getPath();
+            
+            ConfigurationContext configurationContext = messageContext.getConfigurationContext();
+            AxisConfiguration registry = configurationContext.getAxisConfiguration();
+
+            String serviceName = findAxisServiceName(registry, path);
+            return registry.getService(serviceName);
+
+        } else {
+            if(isDebugEnabled){
+                log.debug("Attempted to check for Service using null target endpoint URI");
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public void initDispatcher() {
+        init(new HandlerDescription(NAME));
+    }
+
+    protected String findAxisServiceName(AxisConfiguration registry, String path) {
+        HashMap services = registry.getServices();
+        if (services == null) {
+            return null;
+        }
+        String[] parts = JavaUtils.split(path, '/');
+        String serviceName = "";
+        for (int i=parts.length-1; i>=0; i--) {
+            serviceName = parts[i] + serviceName;
+            if (services.containsKey(serviceName)) {
+                return serviceName;
+            }
+            serviceName = "/" + serviceName;
+            if (services.containsKey(serviceName)) {
+                return serviceName;
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
new file mode 100644
index 0000000000..21fef3e5d8
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.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.ws.axis2;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axiom.attachments.utils.IOUtils;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.PolicyInclude;
+import org.apache.axis2.transport.http.ListingAgent;
+import org.apache.axis2.transport.http.server.HttpUtils;
+import org.apache.axis2.util.ExternalPolicySerializer;
+import org.apache.axis2.util.JavaUtils;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyRegistry;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaExternal;
+
+/**
+ * A Tuscany specific Axis2 ListingAgent as the Axis2 one does not work
+ * with the Tuscany service names which include slash ('/') characters.
+ * Unfortunately it ends up having  to copy a fair amount of Axis2 code to do this. 
+ *
+ * @version $Rev$ $Date$
+ */
+public class TuscanyListingAgent extends ListingAgent {
+
+    private static final String LIST_SINGLE_SERVICE_JSP_NAME =
+        "listSingleService.jsp";
+    
+    public TuscanyListingAgent(ConfigurationContext aConfigContext) {
+        super(aConfigContext);
+    }
+
+    /**
+     * This method overrides the Axis2 listing agent's computation of the
+     * service name.
+     */
+    @Override
+    public String extractServiceName(String urlString) {
+        String serviceName = findAxisServiceName(urlString);
+        setContextRoot(urlString, serviceName);
+        return serviceName;
+    }
+
+    /**
+     * Override ?xsd processing so that WSDL documents with XSD imports
+     * and includes work correctly.  When we move to Axis2 1.4, we may
+     * be able to use SchemaSupplier to do this in a cleaner way.  Also
+     * ensure that the correct IP address and port are returned by ?wsdl.
+     */
+    @Override
+    public void processListService(HttpServletRequest req,
+                                   HttpServletResponse res)
+            throws IOException, ServletException {
+
+        String url = req.getRequestURL().toString();
+        String query = req.getQueryString();
+
+        // for ?wsdl requests, need to update the WSDL with correct IPaddr and port 
+        int wsdl = query.indexOf("wsdl");
+        if (wsdl >= 0) {
+            String serviceName = extractServiceName(url);
+            HashMap services = configContext.getAxisConfiguration().getServices();
+            if ((services != null) && !services.isEmpty()) {
+                AxisService axisService = (AxisService)services.get(serviceName);
+                Parameter wsld4jdefinition = axisService.getParameter(WSDLConstants.WSDL_4_J_DEFINITION);
+                Definition definition = (Definition)wsld4jdefinition.getValue();
+                for (Object s : definition.getServices().values()) {
+                    for (Object p : ((Service)s).getPorts().values()) {
+                        String endpointURL = Axis2ServiceProvider.getPortAddress((Port)p);
+                        String modifiedURL = setIPAddress(endpointURL, url);
+                        Axis2ServiceProvider.setPortAddress((Port)p, modifiedURL);
+                    }
+                }
+            }
+        }
+
+        // handle ?xsd requests here
+        int xsd = query.indexOf("xsd");
+        if (xsd >= 0) {
+            String serviceName = extractServiceName(url);
+            HashMap services = configContext.getAxisConfiguration().getServices();
+            if ((services != null) && !services.isEmpty()) {
+                Object serviceObj = services.get(serviceName);
+                if (serviceObj != null) {
+                    String xsds = req.getParameter("xsd");
+                    if (xsds != null && !"".equals(xsds)) {
+                        // a schema name (perhaps with path) is present
+                        AxisService axisService = (AxisService)serviceObj;
+                        ArrayList schemas = axisService.getSchema();
+                        for (Object rootSchema : axisService.getSchema()) {
+                            XmlSchema schema = getSchema(((XmlSchema)rootSchema), xsds);
+                            if (schema != null) {
+                                // found the schema
+                                res.setContentType("text/xml");
+                                OutputStream out = res.getOutputStream();
+                                schema.write(new OutputStreamWriter(out, "UTF8"));
+                                out.flush();
+                                out.close();
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // in all other cases, delegate to the Axis2 code
+        super.processListService(req, res);
+    }
+
+    private XmlSchema getSchema(XmlSchema parentSchema, String name) {
+        for (Iterator iter = parentSchema.getIncludes().getIterator(); iter.hasNext();) {
+            Object obj = iter.next();
+            if (obj instanceof XmlSchemaExternal) {
+                XmlSchemaExternal extSchema = (XmlSchemaExternal)obj;
+                if (extSchema.getSchemaLocation().endsWith(name)) {
+                    return extSchema.getSchema();
+                } else {
+                    XmlSchema schema = getSchema(extSchema.getSchema(), name);
+                    if (schema != null) {
+                        return schema;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private String findAxisServiceName(String path) {
+        HashMap services = configContext.getAxisConfiguration().getServices();
+        if (services == null) {
+            return null;
+        }
+        String[] parts = JavaUtils.split(path, '/');
+        String serviceName = "";
+        for (int i=parts.length-1; i>=0; i--) {
+            serviceName = parts[i] + serviceName;
+            if (services.containsKey(serviceName)) {
+                return serviceName;
+            }
+            serviceName = "/" + serviceName;
+            if (services.containsKey(serviceName)) {
+                return serviceName;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Hack for Tuscany to get ?wsdl working with Tuscany service names
+     * Can go once moved up to Axis2 1.3
+     */
+    private void setContextRoot(String filePart, String serviceName) {
+        String contextRoot = configContext.getContextRoot();
+        if (contextRoot != null && contextRoot.length() > 0) {
+            if (contextRoot.equals("/")) {
+                configContext.setServicePath("/");
+            } else {
+                int i = filePart.indexOf(contextRoot) + contextRoot.length();
+                int j = filePart.lastIndexOf(serviceName);
+                if (i>=j || (i+1 == j)) {
+                    configContext.setServicePath("/");
+                } else {
+                    String mapping = filePart.substring(i+1, j);
+                    configContext.setServicePath(mapping);
+                }
+            }
+            configContext.setContextRoot(contextRoot);
+        }
+    }
+
+    private static String setIPAddress(String wsdlURI, String requestURI) {
+        try {
+            URI wsdlURIObj = new URI(wsdlURI);
+            String wsdlHost = wsdlURIObj.getHost();
+            int wsdlPort = wsdlURIObj.getPort();
+            String wsdlAddr = wsdlHost + (wsdlPort != -1 ? ":" + Integer.toString(wsdlPort) : "");
+            URI requestURIObj = new URI(requestURI);
+            String ipAddr = HttpUtils.getIpAddress();
+            int requestPort = requestURIObj.getPort();
+            String newAddr = ipAddr + (requestPort != -1 ? ":" + Integer.toString(requestPort) : "");
+            return wsdlURI.replace(wsdlAddr, newAddr);
+        } catch (Exception e) {
+            // URI string not in expected format, so return the WSDL URI unmodified
+            return wsdlURI;
+        }
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
new file mode 100644
index 0000000000..5254a5716c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
@@ -0,0 +1,66 @@
+/*
+ * 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.ws.axis2;
+
+import java.net.URI;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
+
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
+import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
+
+/**
+ * Provider for Policy Intents and PolicySet definitions related to security
+ *
+ * @version $Rev$ $Date$
+ */
+public class WSBindingDefinitionsProvider implements SCADefinitionsProvider {
+    private String definitionsFile = "org/apache/tuscany/sca/binding/ws/axis2/definitions.xml";
+    URLArtifactProcessor urlArtifactProcessor = null;
+    
+    public WSBindingDefinitionsProvider(ExtensionPointRegistry registry) {
+        URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
+        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
+    }
+
+    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
+        final URL definitionsFileUrl = getClass().getClassLoader().getResource(definitionsFile);
+        SCADefinitions scaDefn = null;
+        try {
+            final URI uri = new URI(definitionsFile);
+            // Allow bindings to read properties. Requires PropertyPermission read in security policy. 
+            scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<SCADefinitions>() {
+                public SCADefinitions run() throws ContributionReadException {
+                    return (SCADefinitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
+                }
+            });
+        } catch (Exception e) {
+            throw new SCADefinitionsProviderException(e);
+        }
+        return scaDefn;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
new file mode 100644
index 0000000000..a48ff54c77
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/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.ws.axis2.Axis2BindingProviderFactory;model=org.apache.tuscany.sca.binding.ws.WebServiceBinding

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
new file mode 100644
index 0000000000..370b83f87b
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
@@ -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 SCA Definitions Providers
+org.apache.tuscany.sca.binding.ws.axis2.WSBindingDefinitionsProvider
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
new file mode 100644
index 0000000000..b11059df15
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
@@ -0,0 +1,54 @@
+<?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.    

+-->

+

+<!-- $Rev$ $Date$ -->

+

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

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

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

+            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

+            

+    <sca:bindingType type="sca:binding.ws"  mayProvide="SOAP SOAP.1_1 SOAP.1_2" alwaysProvides=""/>

+

+    <!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 -->

+    <sca:intent name="SOAP" constrains="sca:binding.ws">

+        <sca:description>

+            Communication through this binding requires SOAP

+        </sca:description>

+    </sca:intent>

+    

+    <sca:intent name="SOAP.1_1">

+        <sca:description>

+            Communication through this binding requires SOAP 1.1

+        </sca:description>

+    </sca:intent>

+    

+    <sca:intent name="SOAP.1_2">

+        <sca:description>

+            Communication through this binding requires SOAP 1.2

+        </sca:description>

+    </sca:intent>

+    

+    <sca:intent name="MTOM" constrains="sca:binding.ws">

+        <sca:description>

+            Communication through this binding requires MTOM support

+        </sca:description>

+    </sca:intent>

+ </sca:definitions>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
new file mode 100644
index 0000000000..4d7a34d73d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
@@ -0,0 +1,503 @@
+<?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.
+  -->
+
+<axisconfig name="AxisJava2.0">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="enableSwA">false</parameter>
+    
+    <!-- Customized by Tuscany -->
+    <!-- parameter name="OutflowSecurity">
+		<action>
+			<items>Timestamp</items>
+		</action>
+	</parameter-->
+
+    <!--Uncomment if you want to enable file caching for attachments -->
+    <!--parameter name="cacheAttachments">true</parameter>
+    <parameter name="attachmentDIR"></parameter>
+    <parameter name="sizeThreshold">4000</parameter-->
+
+    <!--This will give out the timout of the configuration contexts, in milliseconds-->
+    <parameter name="ConfigContextTimeoutInterval">30000</parameter>
+
+    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+    <!--that behavior.-->
+
+    <!-- Customized by Tuscany -->
+    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
+
+    <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
+    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+    <!--is set, then Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
+
+    <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
+    <!--ServicesDirectory only works on the following cases-->
+    <!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
+    <!---When creating URL Based configurator with URL “file://”  -->
+    <!--- War based configurator with expanded case , -->
+
+    <!--All the other scenarios it will be ignored.-->
+    <!--<parameter name="ServicesDirectory">service</parameter>-->
+    <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
+    <!--<parameter name="ModulesDirectory">modules</parameter>-->
+
+
+
+    <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
+    <!--root which can configured using the following contextRoot parameter-->
+    <!--<parameter name="contextRoot">axis2</parameter>-->
+
+    <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguiush those endpoints-->
+    <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
+    <!--context path to proper Axis2 servlets-->
+
+    <!-- Customized by Tuscany -->
+    <parameter name="servicePath">/</parameter>
+
+    <!--<parameter name="restPath">rest</parameter>-->
+
+    <!-- Following parameter will completely disable REST handling in Axis2-->
+
+    <parameter name="disableREST" locked="true">false</parameter>
+
+    <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
+    <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
+
+    <!-- Following parameter will set the host name for the epr-->
+    <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
+
+    <!-- If you have a frontend host which exposes this webservice using a different public URL  -->
+    <!-- use this parameter to override autodetected url -->
+    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
+
+
+    <!--    The way of adding listener to the system-->
+    <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
+    <!--    </listener>-->
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the deafult MessageReceiver for the system , if you want to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+    <!--any operation -->
+    <!--Note : You can ovrride this for a particular service by adding the same element with your requirement-->
+    <messageReceivers>
+
+       <!-- Added by Tuscany -->
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInMessageReceiver"/>
+
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+
+       <!-- Added by Tuscany -->
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInOutSyncMessageReceiver"/>
+
+       <!-- Added by Tuscany -->
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
+                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInMessageReceiver"/>
+
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+
+       <!-- Added by Tuscany -->
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
+                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInOutSyncMessageReceiver"/>
+
+    </messageReceivers>
+    <!-- ================================================= -->
+    <!-- Message Formatter -->
+    <!-- ================================================= -->
+    <!--Following content type to message formatter mapping can be used to implement support for different message -->
+    <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
+    <messageFormatters>
+        <messageFormatter contentType="application/x-www-form-urlencoded"
+                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+        <messageFormatter contentType="multipart/form-data"
+                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+        <messageFormatter contentType="application/xml"
+                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+    </messageFormatters>
+
+    <!-- ================================================= -->
+    <!-- Message Builders -->
+    <!-- ================================================= -->
+    <!--Following content type to builder mapping can be used to implement support for different message -->
+    <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
+    <messageBuilders>
+        <messageBuilder contentType="application/xml"
+                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+        <messageBuilder contentType="application/x-www-form-urlencoded"
+                         class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+        <messageBuilder contentType="multipart/form-data"
+                         class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
+    </messageBuilders>
+
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+    <transportReceiver name="http"
+                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
+
+        <!-- Customized by Tuscany -->
+        <parameter name="port" locked="false">6060</parameter>
+
+        <!-- Here is the complete list of supported parameters (see example settings further below):
+            port: the port to listen on (default 6060)
+            hostname:  if non-null, url prefix used in reply-to endpoint references                                 (default null)
+            originServer:  value of http Server header in outgoing messages                                         (default "Simple-Server/1.1")
+            requestTimeout:  value in millis of time that requests can wait for data                                (default 20000)
+            requestTcpNoDelay:  true to maximize performance and minimize latency                                   (default true)
+                                false to minimize bandwidth consumption by combining segments
+            requestCoreThreadPoolSize:  number of threads available for request processing (unless queue fills up)  (default 25)
+            requestMaxThreadPoolSize:  number of threads available for request processing if queue fills up         (default 150)
+                                       note that default queue never fills up:  see HttpFactory
+            threadKeepAliveTime:  time to keep threads in excess of core size alive while inactive                  (default 180)
+                                  note that no such threads can exist with default unbounded request queue
+            threadKeepAliveTimeUnit:  TimeUnit of value in threadKeepAliveTime (default SECONDS)                    (default SECONDS)
+        -->
+        <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> -->
+        <!-- <parameter name="originServer">My-Server/1.1</parameter>           -->
+        <!-- <parameter name="requestTimeout">10000</parameter>                   -->
+        <!-- <parameter name="requestTcpNoDelay">false</parameter>                   -->
+        <!-- <parameter name="requestCoreThreadPoolSize">50</parameter>                      -->
+        <!-- <parameter name="RequestMaxThreadPoolSize">100</parameter>                     -->
+        <!-- <parameter name="threadKeepAliveTime">240000</parameter>                  -->
+        <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
+    </transportReceiver>
+    
+     <!-- Added by Tuscany -->
+     <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+        <!--  These configuation parameters now come from the binding.ws uri
+              or from a policy set
+        <parameter name="myTopicConnectionFactory">
+            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+            <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+            <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
+        </parameter>
+
+        <parameter name="myQueueConnectionFactory">
+            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+            <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+            <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+        </parameter>
+
+        <parameter name="default">
+            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+            <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+            <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+        </parameter>
+        -->
+     </transportReceiver>
+
+    <!-- ================================================= -->
+    <!-- Non-blocking http/s Transport Listener  -->
+
+    <!-- the non blocking http transport based on HttpCore + NIO extensions
+    <transportReceiver name="http" class="org.apache.axis2.transport.nhttp.HttpCoreNIOListener">
+    	<parameter name="port" locked="false">9000</parameter>
+    	<parameter name="non-blocking" locked="false">true</parameter>
+    </transportReceiver>-->
+
+    <!-- the non blocking https transport based on HttpCore + SSL-NIO extensions
+    <transportReceiver name="https" class="org.apache.axis2.transport.nhttp.HttpCoreNIOSSLListener">
+    	<parameter name="port" locked="false">9002</parameter>
+    	<parameter name="non-blocking" locked="false">true</parameter>
+        <parameter name="keystore" locked="false">
+            <KeyStore>
+                <Location>identity.jks</Location>
+                <Type>JKS</Type>
+                <Password>password</Password>
+                <KeyPassword>password</KeyPassword>
+            </KeyStore>
+        </parameter>
+        <parameter name="truststore" locked="false">
+            <TrustStore>
+                <Location>trust.jks</Location>
+                <Type>JKS</Type>
+                <Password>password</Password>
+            </TrustStore>
+        </parameter>-->
+        <!--<parameter name="SSLVerifyClient">require</parameter>
+            supports optional|require or defaults to none -->
+    <!--</transportReceiver>-->
+
+    <!-- ================================================= -->
+    <!-- Mail Transport Listener  -->
+    <!-- This is a sample configuration. It assumes a mail server running in localhost.
+         Listener pops  messages that comes to the email address red@localhost. Users
+         password is red. Listener connect to the server every 3000 milliseconds.
+         Parameters with "transport." prefix is Axis2 specific. Others are all from Java Mail API. 
+         http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
+     -->
+    <!-- ================================================= -->
+    <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.SimpleMailListener">
+        <parameter name="mail.pop3.host">localhost</parameter>
+        <parameter name="mail.pop3.user">red</parameter>
+        <parameter name="mail.store.protocol">pop3</parameter>
+        <parameter name="transport.mail.pop3.password">red</parameter>
+        <parameter name="transport.mail.replyToAddress">red@localhost</parameter>
+        <parameter name="transport.listener.interval">3000</parameter>
+    </transportReceiver>-->
+
+	<!--Uncomment if you want to have TCP transport support-->
+    <!--transportReceiver name="tcp"
+                       class="org.apache.axis2.transport.tcp.TCPServer">
+        <parameter name="port">6060</parameter-->>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncomment the following paramter , and set it as you required.-->
+        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
+    <!-- /transportReceiver -->
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <transportSender name="tcp"
+                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+    <transportSender name="local"
+                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
+    <transportSender name="http"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
+
+        <!-- If following is set to 'true', optional action part of the Content-Type will not be added to the SOAP 1.2 messages -->
+        <!--  <parameter name="OmitSOAP12Action">true</parameter>  -->
+    </transportSender>
+    
+    <transportSender name="https"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
+    </transportSender>
+    <transportSender name="jms"
+                     class="org.apache.axis2.transport.jms.JMSSender"/>
+     
+    <!-- ================================================= -->
+    <!-- Non-blocking http/s Transport Sender  -->
+
+    <!-- the non-blocking http transport sender based on HttpCore + NIO extensions
+    <transportSender name="http"  class="org.apache.axis2.transport.nhttp.HttpCoreNIOSender">
+        <parameter name="non-blocking" locked="false">true</parameter>
+    </transportSender>-->
+
+    <!-- the non-blocking https transport sender based on HttpCore + NIO SSL extensions
+    <transportSender name="https" class="org.apache.axis2.transport.nhttp.HttpCoreNIOSSLSender">
+        <parameter name="non-blocking" locked="false">true</parameter>
+        <parameter name="keystore" locked="false">
+            <KeyStore>
+                <Location>identity.jks</Location>
+                <Type>JKS</Type>
+                <Password>password</Password>
+                <KeyPassword>password</KeyPassword>
+            </KeyStore>
+        </parameter>
+        <parameter name="truststore" locked="false">
+            <TrustStore>
+                <Location>trust.jks</Location>
+                <Type>JKS</Type>
+                <Password>password</Password>
+            </TrustStore>
+        </parameter>-->
+        <!--<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter>
+            supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
+    <!--</transportSender>-->
+
+    <!-- ================================================= -->
+    <!-- Mail Transport Sender  -->
+    <!--Only need to uncomment the sender. Configuration is achieved with every client.
+        At any instant mail host should be given. Sample configuration has been given.
+        http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
+        -->
+    <!-- ================================================= -->
+   <!--<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
+        <parameter name="mail.smtp.host">localhost</parameter>
+    </transportSender>-->
+
+    <!-- ================================================= -->
+    <!-- Global Modules  -->
+    <!-- ================================================= -->
+    <!-- Comment this to disable Addressing -->
+
+    <!--  Commented out by Tuscany
+    <module ref="addressing"/>
+    -->
+
+	<!-- Added by Tuscany -->
+    <!-- 
+    <module ref="rampart"/>
+     -->
+    
+    <!-- wsp:Policy wsu:Id="UTOverTransport" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+		  <wsp:All>
+ 		 	<sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<wsp:Policy>
+					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
+				</wsp:Policy>
+			</sp:SignedSupportingTokens>
+			
+			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+				<ramp:user>TuscanyWsUser</ramp:user>
+				<ramp:passwordType>PasswordText</ramp:passwordType>
+				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.ClientPWCBHandler</ramp:passwordCallbackClass>
+			</ramp:RampartConfig>
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy-->
+
+    <!--Configuring module , providing parameters for modules whether they refer or not-->
+    <!--<moduleConfig name="addressing">-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
+    <!--</moduleConfig>-->
+
+    <!-- ================================================= -->
+    <!-- Clustering  -->
+    <!-- ================================================= -->
+    <!-- Configure and uncomment following for preparing Axis2 to a clustered environment -->
+    <!--
+    <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager">
+        <parameter name="param1">value1</parameter>
+        <parameter name="domain">apache.axis2.domain</parameter>
+    	<configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager">
+    	    <listener class="org.apache.axis2.cluster.configuration.DefaultConfigurationManagerListener"/>
+    	</configurationManager>
+    	<contextManager class="org.apache.axis2.cluster.context.TribesContextManager">
+    	    <listener class="org.apache.axis2.cluster.context.DefaultContextManagerListener"/>
+    	</contextManager>
+    </cluster>
+    -->
+
+    <!-- ================================================= -->
+    <!-- Phases  -->
+    <!-- ================================================= -->
+    <phaseOrder type="InFlow">
+        <!--  System pre defined phases       -->
+        <phase name="Transport">
+
+            <!-- Added by Tuscany -->
+            <handler name="TuscanyDispatcher"
+                     class="org.apache.tuscany.sca.binding.ws.axis2.TuscanyDispatcher">
+                <order phase="Transport"/>
+            </handler>
+
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+                <order phase="Transport"/>
+            </handler>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport"/>
+            </handler>
+        </phase>
+        <phase name="Addressing">
+             <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                 <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+<!--
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+-->					 
+        </phase>
+        <phase name="RMPhase"/>
+        <!--  System pre defined phases       -->
+        <!--   After Postdispatch phase module author or service author can add any phase he want      -->
+        <phase name="OperationInPhase"/>
+	<phase name="soapmonitorPhase"/>
+    </phaseOrder>
+    <phaseOrder type="OutFlow">
+        <!--      user can add his own phases to this area  -->
+	<phase name="soapmonitorPhase"/>
+        <phase name="OperationOutPhase"/>
+        <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
+        <phase name="RMPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+    </phaseOrder>
+    <phaseOrder type="InFaultFlow">
+        <phase name="Addressing">
+             <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                 <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+<!--
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+-->					 
+        </phase>
+        <phase name="RMPhase"/>
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationInFaultPhase"/>
+        <phase name="soapmonitorPhase"/>
+    </phaseOrder>
+    <phaseOrder type="OutFaultFlow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="soapmonitorPhase"/>
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="RMPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+</axisconfig>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
new file mode 100644
index 0000000000..1641457d28
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
@@ -0,0 +1 @@
+rampart-1.3.mar
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
new file mode 100644
index 0000000000..af3c45aa93
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
new file mode 100644
index 0000000000..2ce23bf2c4
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
@@ -0,0 +1,83 @@
+/*
+ * 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.ws.axis2;
+
+import junit.framework.TestCase;
+
+public class Axis2ReferenceTestCase extends TestCase {
+
+    public void testInvokeService() throws Exception {
+//        Axis2ReferenceBinding axis2Reference = createAxis2Reference("testWebAppName", "testServiceName");
+//        ServiceContract contract = new JavaServiceContract();
+//        Operation operation = new Operation<Type>("sayHi", null, null, null, false, null, NO_CONVERSATION);
+//        TargetInvoker targetInvoker = axis2Reference.createTargetInvoker(contract, operation);
+//        assertNotNull(targetInvoker);
+//        assertFalse(targetInvoker instanceof Axis2AsyncTargetInvoker);
+    }
+
+    public void testAsyncTargetInvoker() throws Exception {
+//        Axis2ReferenceBinding axis2Reference = createAxis2Reference("testWebAppName", "testServiceName");
+//        //Create a mocked InboundWire, make the call of ServiceBindingExtension.getInterface() returns a Class
+//        Wire inboundWire = EasyMock.createNiceMock(Wire.class);
+//        JavaServiceContract contract = new JavaServiceContract(Greeter.class);
+//        contract.setCallbackName("");
+//        contract.setCallbackClass(GreetingCallback.class);
+//        Operation<Type> callbackOp =
+//            new Operation<Type>("sayHiCallback", null, null, null, true, null, NO_CONVERSATION);
+//        HashMap<String, Operation<Type>> callbackOps = new HashMap<String, Operation<Type>>();
+//        callbackOps.put("sayHiCallback", callbackOp);
+//        contract.setCallbackOperations(callbackOps);
+//        EasyMock.expect(inboundWire.getTargetContract()).andReturn(contract).anyTimes();
+//        EasyMock.replay(inboundWire);
+//
+//        axis2Reference.setWire(inboundWire);
+//        Operation operation = new Operation<Type>("sayHi", null, null, null, true, null, NO_CONVERSATION);
+//        TargetInvoker asyncTargetInvoker = axis2Reference.createTargetInvoker(contract, operation);
+//        assertNotNull(asyncTargetInvoker);
+//        assertTrue(asyncTargetInvoker instanceof Axis2AsyncTargetInvoker);
+    }
+
+//    @SuppressWarnings("unchecked")
+//    private Axis2ReferenceBinding createAxis2Reference(String webAppName, String serviceName) throws Exception {
+//        //Create WebServiceBindingDefinition
+//        String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";
+//        URL url = getClass().getResource(wsdlLocation);
+//        assertNotNull("Could not find wsdl " + url.toString(), url);
+//
+//        WSDLFactory factory = WSDLFactory.newInstance();
+//        WSDLReader reader = factory.newWSDLReader();
+//        reader.setFeature("javax.wsdl.verbose", false);
+//        InputSource input = new InputSource(url.openStream());
+//        Definition wsdlDef = reader.readWSDL(url.toString(), input);
+//        Service wsdlService = wsdlDef.getService(new QName("http://objectweb.org/hello_world_soap_http",
+//            "SOAPService"));
+//        Port port = wsdlService.getPort("SoapPort");
+//        WebServiceBindingDefinition wsBinding =
+//            new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
+//        //Create a mocked WireService, make the call of ServiceBindingExtension.getServiceInstance() returns a proxy instance.
+//        // TODO figure out what to do with the service contract
+//        ServiceContract<?> contract = new WSDLServiceContract();
+//        contract.setInterfaceClass(Greeter.class);
+//        return new Axis2ReferenceBinding(URI.create(serviceName),
+//            wsBinding,
+//            contract,
+//            null,
+//            null);
+//    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
new file mode 100644
index 0000000000..d4d20414e5
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
@@ -0,0 +1,104 @@
+/*
+ * 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.ws.axis2;
+
+import junit.framework.TestCase;
+
+public class Axis2ServiceTestCase extends TestCase {
+
+    public void testInvokeService() throws Exception {
+//        TestServletHost tomcatHost = new TestServletHost();
+//        Axis2ServiceBinding axis2Service = createAxis2Service("testServiceName", tomcatHost, false);
+//        axis2Service.start();
+//
+//        if (true) return;
+//        Servlet servlet = tomcatHost.getMapping("testWebAppName/serviceBindings/testServiceName");
+//        assertNotNull(servlet);
+//
+//        //Create mocked HttpRequest and HttpResponse object to test the Axis2Servlet
+//        //To be done:
+
+    }
+
+    public void testAsyncMessageReceiver() throws Exception {
+
+//        TestServletHost tomcatHost = new TestServletHost();
+//        Axis2ServiceBinding axis2Service = createAxis2Service("testServiceName", tomcatHost, true);
+//        axis2Service.start();
+    }
+
+//    @SuppressWarnings("unchecked")
+//    private Axis2ServiceBinding createAxis2Service(String serviceName, ServletHost tomcatHost, boolean callback)
+//        throws Exception {
+//        //Create WebServiceBindingDefinition
+//        String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";
+//        URL url = getClass().getResource(wsdlLocation);
+//        assertNotNull("Could not find wsdl " + url.toString(), url);
+//
+//        WSDLFactory factory = WSDLFactory.newInstance();
+//        WSDLReader reader = factory.newWSDLReader();
+//        reader.setFeature("javax.wsdl.verbose", false);
+//        InputSource input = new InputSource(url.openStream());
+//        Definition wsdlDef = reader.readWSDL(url.toString(), input);
+//        Service wsdlService = wsdlDef.getService(new QName("http://objectweb.org/hello_world_soap_http",
+//            "SOAPService"));
+//        Port port = wsdlService.getPort("SoapPort");
+//        WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
+//
+//        //Create a mocked WireService, make the call of ServiceBindingExtension.getServiceInstance() returns a proxy instance.
+////        WireService wireService = EasyMock.createNiceMock(WireService.class);
+////        wireService.createProxy(EasyMock.isA(Class.class), EasyMock.isA(Wire.class));
+////        EasyMock.expectLastCall().andReturn(null);
+////        EasyMock.replay(wireService);
+//
+//        //Create a mocked InboundWire, make the call of ServiceBindingExtension.getInterface() returns a Class
+//        Wire inboundWire = EasyMock.createNiceMock(Wire.class);
+//        JavaServiceContract contract = new JavaServiceContract(Greeter.class);
+//        Map<String, Operation<Type>> opMap = new HashMap<String, Operation<Type>>();
+//        for (Method m : Greeter.class.getMethods()) {
+//            opMap.put(m.getName(), new Operation<Type>(m.getName(), null, null, null));
+//        }
+//        contract.setOperations(opMap);
+//        EasyMock.expect(inboundWire.getTargetContract()).andReturn(contract).anyTimes();
+//        if (callback) {
+//            contract.setCallbackName("");
+//        }
+//        EasyMock.replay(inboundWire);
+//
+//        Wire outboundWire = EasyMock.createNiceMock(Wire.class);
+//        Map<Operation<?>, InvocationChain> map = new HashMap<Operation<?>, InvocationChain>();
+//        EasyMock.expect(outboundWire.getInvocationChains()).andReturn(map).once();
+//        EasyMock.replay(outboundWire);
+//
+//        TuscanyAxisConfigurator tuscanyAxisConfigurator = new TuscanyAxisConfigurator();
+//        ConfigurationContext configurationContext = tuscanyAxisConfigurator.getConfigurationContext();
+//        Axis2ServiceBinding axis2Service =
+//            new Axis2ServiceBinding(URI.create(serviceName),
+//                contract,
+//                null,
+//                wsBinding,
+//                tomcatHost,
+//                configurationContext, null);
+//        axis2Service.setWire(inboundWire);
+////        axis2Service.setOutboundWire(outboundWire);
+//
+//        return axis2Service;
+//    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
new file mode 100644
index 0000000000..767f59646f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.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.ws.axis2;
+
+public interface Greeter {
+
+    String sayHi();
+
+    String greetMe(String requestType);
+
+    void greetMeOneWay(String requestType);
+
+    void greetMeWithCallback(String requestType);
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
new file mode 100644
index 0000000000..e5e76af0b7
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
@@ -0,0 +1,24 @@
+/*
+ * 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.ws.axis2;
+
+public interface GreetingCallback {
+
+    void greetMeCallback(String greetMeResponse);
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
new file mode 100644
index 0000000000..4e7c1b0539
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
@@ -0,0 +1,34 @@
+/*

+ * 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.ws.axis2.itests;

+

+import org.osoa.sca.annotations.Remotable;

+

+/**

+ * Test ?wsdl works and that the returned WSDL has the correct endpoint

+ *

+ * @version $Rev$ $Date$

+ */

+@Remotable

+public interface Account {

+    

+    CustomerProfileData getCustomerProfile(String loginID);

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
new file mode 100644
index 0000000000..5edb4ddc5a
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
@@ -0,0 +1,33 @@
+/*

+ * 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.ws.axis2.itests;

+

+/**

+ * Test ?wsdl works and that the returned WSDL has the correct endpoint

+ *

+ * @version $Rev$ $Date$

+ */

+public class AccountService implements Account {

+

+    public CustomerProfileData getCustomerProfile(String loginID) {

+        return new CustomerProfileData(loginID);

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
new file mode 100644
index 0000000000..2dc7d8dee4
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
@@ -0,0 +1,58 @@
+/*
+ * 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.ws.axis2.itests;
+
+import java.io.Serializable;
+
+public class Bar implements Serializable {
+    private static final long serialVersionUID = 1249963611910502668L;
+    
+    private String s;
+    private int x;
+    private Integer y;
+    
+    private Boolean b;
+    
+    public Boolean getB() {
+        return b;
+    }
+    public void setB(Boolean b) {
+        this.b = b;
+    }
+    public String getS() {
+        return s;
+    }
+    public void setS(String s) {
+        this.s = s;
+    }
+    public int getX() {
+        return x;
+    }
+    public void setX(int x) {
+        this.x = x;
+    }
+    public Integer getY() {
+        return y;
+    }
+    public void setY(Integer y) {
+        this.y = y;
+    }
+    
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
new file mode 100644
index 0000000000..5c1ee6a435
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
@@ -0,0 +1,103 @@
+/*

+ * 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.ws.axis2.itests;

+

+/**

+ * Test ?wsdl works and that the returned WSDL has the correct endpoint

+ *

+ * @version $Rev$ $Date$

+ */

+public class CustomerProfileData {

+    

+    private String firstName;

+    private String lastName;

+    private String address;

+    private String email;

+    private String loginID;

+    private String password;

+    private int id;

+

+    public CustomerProfileData(String loginID) {

+        firstName = "John";

+        lastName = "Doe";

+        address = "345 Main Street";

+        email = "john@doe.org";

+        this.loginID = loginID;

+        password = "hello";

+        id = 1234;

+    }

+

+    public String getFirstName() {

+        return firstName;

+    }

+

+    public void setFirstName(String firstName) {

+        this.firstName = firstName;

+    }

+

+    public String getLastName() {

+        return lastName;

+    }

+

+    public void setLastName(String firstName) {

+        this.lastName = lastName;

+    }

+

+    public String getAddress() {

+        return address;

+    }

+

+    public void setAddress(String address) {

+        this.address = address;

+    }

+

+    public String getEmail() {

+        return email;

+    }

+

+    public void setEmail(String email) {

+        this.email = email;

+    }

+

+    public String getLoginID() {

+        return loginID;

+    }

+

+    public void setLoginID(String loginID) {

+        this.loginID = loginID;

+    }

+

+    public String getPassword() {

+        return password;

+    }

+

+    public void setPassword(String password) {

+        this.password = password;

+    }

+

+    public int getId() {

+        return id;

+    }

+

+    public void setId(int id) {

+        this.id = id;

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
new file mode 100644
index 0000000000..6fccbcfd00
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2.itests;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Echo {
+    
+    Foo echoFoo(Foo foo);
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
new file mode 100644
index 0000000000..5e1a4cf259
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
@@ -0,0 +1,33 @@
+/*
+ * 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.ws.axis2.itests;
+
+import org.osoa.sca.annotations.Reference;
+
+public class EchoComponent implements Echo {
+
+    @Reference
+    public Echo echoWS;
+
+    public Foo echoFoo(Foo foo) {
+        return echoWS.echoFoo(foo);
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
new file mode 100644
index 0000000000..d028ced69e
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2.itests;
+
+
+public class EchoImpl implements Echo {
+
+    public Foo echoFoo(Foo foo) {
+        return foo;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
new file mode 100644
index 0000000000..c7b503af17
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
@@ -0,0 +1,36 @@
+/*
+ * 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.ws.axis2.itests;
+
+import java.io.Serializable;
+
+public class Foo implements Serializable {
+    private static final long serialVersionUID = 4879476066850018458L;
+    
+    private Bar[] bars;
+
+    public Bar[] getBars() {
+        return bars;
+    }
+
+    public void setBars(Bar[] bars) {
+        this.bars = bars;
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
new file mode 100644
index 0000000000..f474c12af3
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2.itests;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface HelloWorld {
+    
+    String getGreetings(String s);
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
new file mode 100644
index 0000000000..88705c1a95
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
@@ -0,0 +1,33 @@
+/*
+ * 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.ws.axis2.itests;
+
+import org.osoa.sca.annotations.Reference;
+
+public class HelloWorldComponent implements HelloWorld {
+
+    @Reference
+    public HelloWorld helloWorldWS;
+    
+    public String getGreetings(String s) {
+        return helloWorldWS.getGreetings(s);
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
new file mode 100644
index 0000000000..f30286feea
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
@@ -0,0 +1,51 @@
+/*
+ * 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.ws.axis2.itests;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+
+public class HelloWorldMultiService implements HelloWorldOM, HelloWorldOM2 {
+
+    public OMElement getGreetings(OMElement requestOM) {
+        String name = requestOM.getFirstElement().getText();
+
+        OMFactory omFactory = OMAbstractFactory.getOMFactory();
+        OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld");
+        OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld");
+        responseOM.addChild(param);
+        param.addChild(omFactory.createOMText("Hello " + name));
+        
+        return  responseOM;
+    }
+
+    public OMElement getGreetings2(OMElement requestOM) {
+        String name = requestOM.getFirstElement().getText();
+
+        OMFactory omFactory = OMAbstractFactory.getOMFactory();
+        OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld");
+        OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld");
+        responseOM.addChild(param);
+        param.addChild(omFactory.createOMText("Hello2 " + name));
+        
+        return  responseOM;
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
new file mode 100644
index 0000000000..7ee48d4451
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
@@ -0,0 +1,77 @@
+/*
+ * 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.ws.axis2.itests ;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class HelloWorldNoWSDLTestCase extends TestCase {
+
+    private SCADomain domain;
+
+    public void testHelloWorld() throws Exception {
+        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldComponent");
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+    }
+
+    /**
+     * Test a a WS call with a complex type
+     */
+    public void testEchoFoo() throws Exception {
+        Echo echo = domain.getService(Echo.class, "EchoComponent");
+       
+        Foo f = new Foo();
+        Bar b1 = new Bar();
+        b1.setS("petra");
+        b1.setX(1);
+        b1.setY(new Integer(2));
+        b1.setB(Boolean.TRUE);
+        Bar b2 = new Bar();
+        b2.setS("beate");
+        b2.setX(3);
+        b2.setY(new Integer(4));
+        b2.setB(Boolean.FALSE);
+        f.setBars(new Bar[] { b1, b2} );
+       
+        Foo f2 = echo.echoFoo(f);
+
+        assertEquals("petra", f2.getBars()[0].getS());
+        assertEquals(1, f2.getBars()[0].getX());
+        assertEquals(2, f2.getBars()[0].getY().intValue());
+        assertTrue(f2.getBars()[0].getB().booleanValue());
+        assertEquals("beate", f2.getBars()[1].getS());
+        assertEquals(3, f2.getBars()[1].getX());
+        assertEquals(4, f2.getBars()[1].getY().intValue());
+        assertFalse(f2.getBars()[1].getB().booleanValue());
+       
+    }
+   
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite");
+    }
+   
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
new file mode 100644
index 0000000000..274f6c8d28
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2.itests;
+
+import org.apache.axiom.om.OMElement;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface HelloWorldOM {
+    
+    OMElement getGreetings(OMElement parmE);
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
new file mode 100644
index 0000000000..bf371430a1
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2.itests;
+
+import org.apache.axiom.om.OMElement;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface HelloWorldOM2 {
+    
+    OMElement getGreetings2(OMElement parmE);
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
new file mode 100644
index 0000000000..d1cbfb88fd
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
@@ -0,0 +1,34 @@
+/*
+ * 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.ws.axis2.itests;
+
+import org.apache.axiom.om.OMElement;
+import org.osoa.sca.annotations.Reference;
+
+public class HelloWorldOMComponent implements HelloWorldOM {
+
+    @Reference
+    public HelloWorldOM helloWorldWS;
+    
+    public OMElement getGreetings(OMElement om) {
+        return helloWorldWS.getGreetings(om);
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
new file mode 100644
index 0000000000..71d7bf68fb
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
@@ -0,0 +1,41 @@
+/*
+ * 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.ws.axis2.itests;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+
+public class HelloWorldOMService implements HelloWorldOM {
+
+    public OMElement getGreetings(OMElement requestOM) {
+        System.out.println(" **** getGreetings **** ");
+        String name = requestOM.getFirstElement().getText();
+
+        OMFactory omFactory = OMAbstractFactory.getOMFactory();
+        OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld");
+        OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld");
+        responseOM.addChild(param);
+        param.addChild(omFactory.createOMText("Hello " + name));
+        
+        return  responseOM;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
new file mode 100644
index 0000000000..e7511027c2
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
@@ -0,0 +1,58 @@
+/*
+ * 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.ws.axis2.itests;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMText;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class HelloWorldOMTestCase extends TestCase {
+
+    private SCADomain domain;
+    private HelloWorldOM helloWorld;
+
+    public void testHelloWorld() throws Exception {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");
+        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");
+        requestOM.addChild(parmE);
+        parmE.addChild(fac.createOMText("petra"));
+        OMElement responseOM = helloWorld.getGreetings(requestOM);
+        OMElement child = (OMElement)responseOM.getFirstElement();
+        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite");
+        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
new file mode 100644
index 0000000000..017d9bb478
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2.itests;
+
+public class HelloWorldService implements HelloWorld {
+
+    public String getGreetings(String s) {
+        return "Hello " + s;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
new file mode 100644
index 0000000000..a3a43d032f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
@@ -0,0 +1,46 @@
+/*
+ * 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.ws.axis2.itests;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class HelloWorldTestCase extends TestCase {
+
+    private SCADomain domain;
+    private HelloWorld helloWorld;
+
+    public void testCalculator() throws Exception {
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite");
+        helloWorld = domain.getService(HelloWorld.class, "HelloWorldComponent");
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
new file mode 100644
index 0000000000..8e17b89f33
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
@@ -0,0 +1,58 @@
+/*

+ * 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.ws.axis2.itests;

+

+import junit.framework.Assert;

+import junit.framework.TestCase;

+

+import org.apache.axiom.om.OMAbstractFactory;

+import org.apache.axiom.om.OMElement;

+import org.apache.axiom.om.OMFactory;

+import org.apache.axiom.om.OMText;

+import org.apache.tuscany.sca.host.embedded.SCADomain;

+

+public class HelloWorldWSDLMergedTestCase extends TestCase {

+

+    private SCADomain domain;

+    private HelloWorldOM helloWorld;

+

+    public void testHelloWorld() throws Exception {

+        OMFactory fac = OMAbstractFactory.getOMFactory();

+        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

+        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

+        requestOM.addChild(parmE);

+        parmE.addChild(fac.createOMText("petra"));

+        OMElement responseOM = helloWorld.getGreetings(requestOM);

+        OMElement child = (OMElement)responseOM.getFirstElement();

+        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

+    }

+

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite");

+        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldWSDLMergedComponent");

+    }

+    

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
new file mode 100644
index 0000000000..b276d8210f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
@@ -0,0 +1,96 @@
+/*

+ * 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.ws.axis2.itests;

+

+import java.io.BufferedReader;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.net.URL;

+import java.util.List;

+

+import javax.wsdl.Definition;

+import javax.wsdl.Port;

+import javax.wsdl.Service;

+import javax.wsdl.extensions.soap.SOAPAddress;

+import javax.wsdl.factory.WSDLFactory;

+import javax.wsdl.xml.WSDLReader;

+import javax.xml.namespace.QName;

+

+import junit.framework.TestCase;

+

+import org.apache.axis2.transport.http.server.HttpUtils;

+import org.apache.tuscany.sca.host.embedded.SCADomain;

+

+/**

+ * Test ?wsdl works and that the returned WSDL has the correct endpoint

+ *

+ * @version $Rev$ $Date$

+ */

+public class QuestionMarkWSDLImportTestCase extends TestCase {

+

+    private SCADomain domain;

+

+    /**

+     * Tests ?wsdl works and returns the correct port endpoint from the WSDL

+     */

+    public void testWSDLImportPortEndpoint() throws Exception {

+        InputStream inp = new URL("http://localhost:8086/AccountService?wsdl").openStream();

+        BufferedReader br = new BufferedReader(new InputStreamReader(inp));

+        String line;

+        while((line = br.readLine()) != null) {

+            System.out.println(line);

+        }

+        br.close();

+

+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();

+        wsdlReader.setFeature("javax.wsdl.verbose", false);

+        wsdlReader.setFeature("javax.wsdl.importDocuments", true);

+

+        Definition definition = wsdlReader.readWSDL("http://localhost:8086/AccountService?wsdl");

+        assertNotNull(definition);

+        Service service = definition.getService(new QName("http://account2/AccountService/$promoted$ep1", "AccountService"));

+        Port port = service.getPort("AccountSoapPort");

+

+        String endpoint = getEndpoint(port);

+        String ip = HttpUtils.getIpAddress();

+        assertEquals("http://" + ip + ":8086/AccountService", endpoint);

+    }

+

+    private String getEndpoint(Port port) {

+        List wsdlPortExtensions = port.getExtensibilityElements();

+        for (final Object extension : wsdlPortExtensions) {

+            if (extension instanceof SOAPAddress) {

+                return ((SOAPAddress) extension).getLocationURI();

+            }

+        }

+        throw new RuntimeException("no SOAPAddress");

+    }

+

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite");

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
new file mode 100644
index 0000000000..59eb6164fa
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
@@ -0,0 +1,96 @@
+/*

+ * 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.ws.axis2.itests;

+

+import java.io.BufferedReader;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.net.URL;

+import java.util.List;

+

+import javax.wsdl.Definition;

+import javax.wsdl.Port;

+import javax.wsdl.Service;

+import javax.wsdl.extensions.soap.SOAPAddress;

+import javax.wsdl.factory.WSDLFactory;

+import javax.wsdl.xml.WSDLReader;

+import javax.xml.namespace.QName;

+

+import junit.framework.TestCase;

+

+import org.apache.axis2.transport.http.server.HttpUtils;

+import org.apache.tuscany.sca.host.embedded.SCADomain;

+

+/**

+ * Test ?wsdl works and that the returned WSDL has the correct endpoint

+ *

+ * @version $Rev: 660340 $ $Date: 2008-05-27 01:08:32 +0100 (Tue, 27 May 2008) $

+ */

+public class QuestionMarkWSDLIncludeTestCase extends TestCase {

+

+    private SCADomain domain;

+

+    /**

+     * Tests ?wsdl works and returns the correct port endpoint from the WSDL

+     */

+    public void testWSDLIncludePortEndpoint() throws Exception {

+        InputStream inp = new URL("http://localhost:8085/AccountService?wsdl").openStream();

+        BufferedReader br = new BufferedReader(new InputStreamReader(inp));

+        String line;

+        while((line = br.readLine()) != null) {

+            System.out.println(line);

+        }

+        br.close();

+

+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();

+        wsdlReader.setFeature("javax.wsdl.verbose", false);

+        wsdlReader.setFeature("javax.wsdl.importDocuments", true);

+

+        Definition definition = wsdlReader.readWSDL("http://localhost:8085/AccountService?wsdl");

+        assertNotNull(definition);

+        Service service = definition.getService(new QName("http://accounts/AccountService/$promoted$ep1", "AccountService"));

+        Port port = service.getPort("AccountSoapPort");

+

+        String endpoint = getEndpoint(port);

+        String ip = HttpUtils.getIpAddress();

+        assertEquals("http://" + ip + ":8085/AccountService", endpoint);

+    }

+

+    private String getEndpoint(Port port) {

+        List wsdlPortExtensions = port.getExtensibilityElements();

+        for (final Object extension : wsdlPortExtensions) {

+            if (extension instanceof SOAPAddress) {

+                return ((SOAPAddress) extension).getLocationURI();

+            }

+        }

+        throw new RuntimeException("no SOAPAddress");

+    }

+

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite");

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
new file mode 100644
index 0000000000..0508f28e11
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
@@ -0,0 +1,124 @@
+/*
+ * 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.ws.axis2.itests;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.axis2.transport.http.server.HttpUtils;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * Test ?wsdl works and that the returned WSDL has the correct endpoint
+ *
+ * @version $Rev$ $Date$
+ */
+public class QuestionMarkWSDLTestCase extends TestCase {
+
+    private SCADomain domain;
+
+    /**
+     * Tests ?wsdl works and returns the correct port endpoint from the WSDL
+     */
+    public void testWSDLPortEndpoint() throws Exception {
+        InputStream inp = new URL("http://localhost:8085/services/HelloWorldWebService?wsdl").openStream();
+        BufferedReader br = new BufferedReader(new InputStreamReader(inp));
+        String line;
+        while((line = br.readLine()) != null) {
+            System.out.println(line);
+        }
+        br.close();
+
+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+        wsdlReader.setFeature("javax.wsdl.verbose",false);
+        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
+
+        Definition definition = wsdlReader.readWSDL("http://localhost:8085/services/HelloWorldWebService?wsdl");
+        assertNotNull(definition);
+        Service service = definition.getService(new QName("http://helloworld/HelloWorldService/$promoted$ep1",
+                                                          "HelloWorldService"));
+        Port port = service.getPort("HelloWorldSoapPort");
+
+        String endpoint = getEndpoint(port);
+        String ip = HttpUtils.getIpAddress();
+        assertEquals("http://" + ip + ":8085/services/HelloWorldWebService", endpoint);
+    }
+
+    /**
+     * Tests ?wsdl works and returns the correct port endpoint from binding.ws with a custom URI
+     */
+    public void testCustomEndpoint() throws Exception {
+        InputStream inp = new URL("http://localhost:8085/foo/bar?wsdl").openStream();
+        BufferedReader br = new BufferedReader(new InputStreamReader(inp));
+        String line;
+        while((line = br.readLine()) != null) {
+            System.out.println(line);
+        }
+        br.close();
+
+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+        wsdlReader.setFeature("javax.wsdl.verbose",false);
+        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
+
+        Definition definition = wsdlReader.readWSDL("http://localhost:8085/foo/bar?wsdl");
+        assertNotNull(definition);
+        Service service = definition.getService(new QName("http://itests.axis2.ws.binding.sca.tuscany.apache.org/",
+                                                          "HelloWorldService"));
+        Port port = service.getPort("HelloWorldPort");
+
+        String endpoint = getEndpoint(port);
+        String ip = HttpUtils.getIpAddress();
+        assertEquals("http://" + ip + ":8085/foo/bar", endpoint);
+    }
+
+    protected String getEndpoint(Port port) {
+        List wsdlPortExtensions = port.getExtensibilityElements();
+        for (final Object extension : wsdlPortExtensions) {
+            if (extension instanceof SOAPAddress) {
+                return ((SOAPAddress) extension).getLocationURI();
+            }
+        }
+        throw new RuntimeException("no SOAPAddress");
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite");
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
new file mode 100644
index 0000000000..5efbedba4c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.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.ws.axis2.itests;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMText;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.osoa.sca.ServiceRuntimeException;
+
+/**
+ * This test verifies that the Endpoint URI specified in the wsdl takes precedence over the URI specified
+ * in binding.  Ref: WS Binding Specification V1.00 - Section 2.1.1
+ * 
+ * @version $Rev$ $Date$
+ */
+public class UriPrecedenceTestCase extends TestCase {
+
+    private SCADomain domain;
+    private HelloWorldOM helloWorld;
+
+    public void testUriPrecedence() throws Exception {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-prec", "helloworld");
+        OMElement parmE = fac.createOMElement("name", "http://helloworld-prec", "helloworld");
+        requestOM.addChild(parmE);
+        parmE.addChild(fac.createOMText("petra"));
+        try {
+            OMElement responseOM = helloWorld.getGreetings(requestOM);
+            OMElement child = (OMElement)responseOM.getFirstElement();
+            Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
+        } catch (ServiceRuntimeException e) {
+            fail("Endpoint URI from wsdl did not take precedence over URI in binding.");
+        }
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite");
+        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
new file mode 100644
index 0000000000..56d0537a44
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * 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.ws.axis2.itests.endpoints;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMText;
+import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public abstract class AbstractHelloWorldOMTestCase extends TestCase {
+
+    private SCADomain domain;
+    private HelloWorldOM helloWorld;
+
+    public void testCalculator() throws Exception {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");
+        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");
+        requestOM.addChild(parmE);
+        parmE.addChild(fac.createOMText("petra"));
+        OMElement responseOM = helloWorld.getGreetings(requestOM);
+        OMElement child = (OMElement)responseOM.getFirstElement();
+        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance(getCompositeName());
+        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+    
+    protected String getCompositeName() {
+        String className = this.getClass().getName();
+        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
new file mode 100644
index 0000000000..661afdddad
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
@@ -0,0 +1,24 @@
+/*
+ * 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.ws.axis2.itests.endpoints;
+
+public class DefaultMultiServiceTestCase extends AbstractHelloWorldOMTestCase {
+    // super class does it all getting composite based on this class name
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
new file mode 100644
index 0000000000..9b2e0eafa0
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
@@ -0,0 +1,24 @@
+/*
+ * 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.ws.axis2.itests.endpoints;
+
+public class DefaultSingleServiceTestCase extends AbstractHelloWorldOMTestCase {
+    // super class does it all getting composite based on this class name
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
new file mode 100644
index 0000000000..98d9a73926
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
@@ -0,0 +1,24 @@
+/*
+ * 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.ws.axis2.itests.endpoints;
+
+public class WSDLExplicitURITestCase extends AbstractHelloWorldOMTestCase {
+    // super class does it all getting composite based on this class name
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
new file mode 100644
index 0000000000..201d11a79f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
@@ -0,0 +1,24 @@
+/*
+ * 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.ws.axis2.itests.endpoints;
+
+public class WSDLRelativeURITestCase extends AbstractHelloWorldOMTestCase {
+    // super class does it all getting composite based on this class name
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
new file mode 100644
index 0000000000..f5d87cdcee
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
@@ -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.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2.itests.epr;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class HelloWorldTestCase extends TestCase {
+
+    private SCADomain domain;
+    private HelloWorld helloWorld;
+
+    public void testCalculator() throws Exception {
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite");
+        helloWorld = domain.getService(HelloWorld.class, "HelloWorldComponent");
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
new file mode 100644
index 0000000000..6cdb12c221
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
@@ -0,0 +1,64 @@
+/*

+ * 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.ws.axis2.itests.policy.configparams;

+

+import junit.framework.Assert;

+import junit.framework.TestCase;

+

+import org.apache.axiom.om.OMAbstractFactory;

+import org.apache.axiom.om.OMElement;

+import org.apache.axiom.om.OMFactory;

+import org.apache.axiom.om.OMText;

+import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;

+import org.apache.tuscany.sca.host.embedded.SCADomain;

+

+public abstract class AbstractHelloWorldOMTestCase extends TestCase {

+

+    private SCADomain domain;

+    private HelloWorldOM helloWorld;

+

+    public void testHelloWorld() throws Exception {

+        OMFactory fac = OMAbstractFactory.getOMFactory();

+        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

+        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

+        requestOM.addChild(parmE);

+        parmE.addChild(fac.createOMText("petra"));

+        OMElement responseOM = helloWorld.getGreetings(requestOM);

+        OMElement child = (OMElement)responseOM.getFirstElement();

+        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

+    }

+

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance(getCompositeName());

+        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");

+    }

+    

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+    

+    protected String getCompositeName() {

+        String className = this.getClass().getName();

+        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
new file mode 100644
index 0000000000..67d6f1c56e
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.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.ws.axis2.itests.policy.configparams;

+

+import java.io.IOException;

+

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+import org.apache.ws.security.WSPasswordCallback;

+

+/**

+ * Sample userid passwd generation class

+ *

+ * @version $Rev$ $Date$

+ */

+public class ClientPWCBHandler implements CallbackHandler {

+

+    public void handle(Callback[] callbacks) throws IOException,

+            UnsupportedCallbackException {

+        for (int i = 0; i < callbacks.length; i++) {

+        	System.out.println("*** Calling Client UserId/Password Handler .... ");

+            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

+            pwcb.setPassword("TuscanyWsUserPasswd");

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
new file mode 100644
index 0000000000..45c5472100
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.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.ws.axis2.itests.policy.configparams;

+

+import java.io.IOException;

+

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+import org.apache.ws.security.WSPasswordCallback;

+

+/**

+ * Sample userid passwd generation class

+ *

+ * @version $Rev$ $Date$

+ */

+public class IntegrityPWCBHandler implements CallbackHandler {

+

+    public void handle(Callback[] callbacks) throws IOException,

+            UnsupportedCallbackException {

+        for (int i = 0; i < callbacks.length; i++) {

+        	System.out.println("*** Calling Integrity Password Handler .... ");

+            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

+            pwcb.setPassword("TuscanyWsUserPasswd");

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
new file mode 100644
index 0000000000..7a4b50cc2c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.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.ws.axis2.itests.policy.configparams;

+

+import java.io.IOException;

+

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+import org.apache.ws.security.WSPasswordCallback;

+

+/**

+ * Sample userid passwd generation class 

+ *

+ * @version $Rev$ $Date$

+ */

+public class ServerPWCBHandler implements CallbackHandler {

+

+    public void handle(Callback[] callbacks) throws IOException,

+            UnsupportedCallbackException {

+    	for (int i = 0; i < callbacks.length; i++) {

+    		System.out.println("*** Calling Server User/Passwd Handler....");

+    		WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

+            pwcb.setPassword("TuscanyWsUserPasswd");

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
new file mode 100644
index 0000000000..18a713a243
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
@@ -0,0 +1,24 @@
+/*

+ * 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.ws.axis2.itests.policy.configparams;

+

+public class WSSecurityAuthenticationTestCaseFIXME extends AbstractHelloWorldOMTestCase {

+    // super class does it all getting composite based on this class name

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
new file mode 100644
index 0000000000..1fd1b8d48e
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
@@ -0,0 +1,42 @@
+/*

+ * 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.ws.axis2.itests.policy.configparams;

+

+import java.security.Provider;

+import java.security.Security;

+

+public class WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue extends AbstractHelloWorldOMTestCase {

+

+    /**

+     * @see org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.AbstractHelloWorldOMTestCase#setUp()

+     */

+    @Override

+    protected void setUp() throws Exception {

+        // Workaround an issue with IBM JDK

+        Provider jce = Security.getProvider("IBMJCE");

+        if (jce != null) {

+            // Make sure IBMJCE is used first

+            Security.removeProvider("IBMJCE");

+            Security.insertProviderAt(jce, 1);

+        }

+        super.setUp();

+    }

+    // super class does it all getting composite based on this class name

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
new file mode 100644
index 0000000000..824132161c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
@@ -0,0 +1,24 @@
+/*

+ * 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.ws.axis2.itests.policy.configparams;

+

+public class WSSecurityIntegrityTestCase extends AbstractHelloWorldOMTestCase {

+    // super class does it all getting composite based on this class name

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
new file mode 100644
index 0000000000..395cfe28d6
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * 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.ws.axis2.itests.policy.mixed;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMText;
+import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public abstract class AbstractHelloWorldOMTestCase extends TestCase {
+
+    private SCADomain domain;
+    private HelloWorldOM helloWorld;
+
+    public void testHelloWorld() throws Exception {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");
+        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");
+        requestOM.addChild(parmE);
+        parmE.addChild(fac.createOMText("petra"));
+        OMElement responseOM = helloWorld.getGreetings(requestOM);
+        OMElement child = (OMElement)responseOM.getFirstElement();
+        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance(getCompositeName());
+        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+    
+    protected String getCompositeName() {
+        String className = this.getClass().getName();
+        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
new file mode 100644
index 0000000000..88fc0d63fa
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
@@ -0,0 +1,50 @@
+/*
+ * 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.ws.axis2.itests.policy.mixed;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ * Sample userid passwd generation class
+ *
+ * @version $Rev$ $Date$
+ */
+public class ClientPWCBHandler implements CallbackHandler {
+
+    public void handle(Callback[] callbacks) throws IOException,
+            UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+        	System.out.println("*** Calling Client UserId/Password Handler .... ");
+            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
+
+            System.out.println(" **** 1. UserId : " + pwcb.getIdentifer());
+            System.out.println(" **** 2. Passwd : " + pwcb.getPassword());
+            System.out.println(" **** 3. Usage  : " + pwcb.getUsage());
+            
+            pwcb.setPassword("TuscanyWsUserPasswd");
+        }
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
new file mode 100644
index 0000000000..0d8914156f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
@@ -0,0 +1,50 @@
+/*
+ * 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.ws.axis2.itests.policy.mixed;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ * Sample userid passwd generation class
+ *
+ * @version $Rev$ $Date$
+ */
+public class IntegrityPWCBHandler implements CallbackHandler {
+
+    public void handle(Callback[] callbacks) throws IOException,
+            UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+        	System.out.println("*** Calling Integrity Password Handler .... ");
+            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
+            
+            System.out.println(" **** 1. UserId : " + pwcb.getIdentifer());
+            System.out.println(" **** 2. Passwd : " + pwcb.getPassword());
+            System.out.println(" **** 3. Usage  : " + pwcb.getUsage());
+            
+            pwcb.setPassword("TuscanyWsUserPasswd");
+        }
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
new file mode 100644
index 0000000000..5840f71057
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
@@ -0,0 +1,49 @@
+/*
+ * 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.ws.axis2.itests.policy.mixed;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ * Sample userid passwd generation class 
+ *
+ * @version $Rev$ $Date$
+ */
+public class ServerPWCBHandler implements CallbackHandler {
+
+    public void handle(Callback[] callbacks) throws IOException,
+            UnsupportedCallbackException {
+    	for (int i = 0; i < callbacks.length; i++) {
+    		System.out.println("*** Calling Server User/Passwd Handler....");
+            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
+            System.out.println(" **** 1. UserId : " + pwcb.getIdentifer());
+            System.out.println(" **** 2. Passwd : " + pwcb.getPassword());
+            System.out.println(" **** 3. Usage  : " + pwcb.getUsage());
+            
+            pwcb.setPassword("TuscanyWsUserPasswd");
+        }
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
new file mode 100644
index 0000000000..db5b88f9ac
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
@@ -0,0 +1,24 @@
+/*
+ * 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.ws.axis2.itests.policy.mixed;
+
+public class WSSecurityMixedTestCase extends AbstractHelloWorldOMTestCase {
+    // super class does it all getting composite based on this class name
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
new file mode 100644
index 0000000000..04de589fb1
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
@@ -0,0 +1,64 @@
+/*

+ * 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.ws.axis2.itests.policy.wspolicy;

+

+import junit.framework.Assert;

+import junit.framework.TestCase;

+

+import org.apache.axiom.om.OMAbstractFactory;

+import org.apache.axiom.om.OMElement;

+import org.apache.axiom.om.OMFactory;

+import org.apache.axiom.om.OMText;

+import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;

+import org.apache.tuscany.sca.host.embedded.SCADomain;

+

+public abstract class AbstractHelloWorldOMTestCase extends TestCase {

+

+    private SCADomain domain;

+    private HelloWorldOM helloWorld;

+

+    public void testHelloWorld() throws Exception {

+        OMFactory fac = OMAbstractFactory.getOMFactory();

+        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

+        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

+        requestOM.addChild(parmE);

+        parmE.addChild(fac.createOMText("petra"));

+        OMElement responseOM = helloWorld.getGreetings(requestOM);

+        OMElement child = (OMElement)responseOM.getFirstElement();

+        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

+    }

+

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance(getCompositeName());

+        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");

+    }

+    

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+    

+    protected String getCompositeName() {

+        String className = this.getClass().getName();

+        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
new file mode 100644
index 0000000000..cf342653c7
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.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.ws.axis2.itests.policy.wspolicy;

+

+import java.io.IOException;

+

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+import org.apache.ws.security.WSPasswordCallback;

+

+/**

+ * Sample userid passwd generation class

+ *

+ * @version $Rev$ $Date$

+ */

+public class ClientPWCBHandler implements CallbackHandler {

+

+    public void handle(Callback[] callbacks) throws IOException,

+            UnsupportedCallbackException {

+        for (int i = 0; i < callbacks.length; i++) {

+        	System.out.println("*** Calling Client UserId/Password Handler .... ");

+            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

+            pwcb.setPassword("TuscanyWsUserPasswd");

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
new file mode 100644
index 0000000000..84b64d3902
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.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.ws.axis2.itests.policy.wspolicy;

+

+import java.io.IOException;

+

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+import org.apache.ws.security.WSPasswordCallback;

+

+/**

+ * Sample userid passwd generation class

+ *

+ * @version $Rev$ $Date$

+ */

+public class IntegrityPWCBHandler implements CallbackHandler {

+

+    public void handle(Callback[] callbacks) throws IOException,

+            UnsupportedCallbackException {

+        for (int i = 0; i < callbacks.length; i++) {

+        	System.out.println("*** Calling Integrity Password Handler .... ");

+            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

+            pwcb.setPassword("TuscanyWsUserPasswd");

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
new file mode 100644
index 0000000000..04825b6b56
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.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.ws.axis2.itests.policy.wspolicy;

+

+import java.io.IOException;

+

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+import org.apache.ws.security.WSPasswordCallback;

+

+/**

+ * Sample userid passwd generation class 

+ *

+ * @version $Rev$ $Date$

+ */

+public class ServerPWCBHandler implements CallbackHandler {

+

+    public void handle(Callback[] callbacks) throws IOException,

+            UnsupportedCallbackException {

+    	for (int i = 0; i < callbacks.length; i++) {

+    		System.out.println("*** Calling Server User/Passwd Handler....");

+    		WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

+            pwcb.setPassword("TuscanyWsUserPasswd");

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
new file mode 100644
index 0000000000..a439ff4c8f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
@@ -0,0 +1,24 @@
+/*

+ * 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.ws.axis2.itests.policy.wspolicy;

+

+public class WSSecurityAuthenticationTestCase extends AbstractHelloWorldOMTestCase {

+    // super class does it all getting composite based on this class name

+} 

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
new file mode 100644
index 0000000000..f37a8deeb7
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
@@ -0,0 +1,42 @@
+/*

+ * 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.ws.axis2.itests.policy.wspolicy;

+

+import java.security.Provider;

+import java.security.Security;

+

+public class WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue extends AbstractHelloWorldOMTestCase {

+

+    /**

+     * @see org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.AbstractHelloWorldOMTestCase#setUp()

+     */

+    @Override

+    protected void setUp() throws Exception {

+        // Workaround an issue with IBM JDK

+        Provider jce = Security.getProvider("IBMJCE");

+        if (jce != null) {

+            // Make sure IBMJCE is used first

+            Security.removeProvider("IBMJCE");

+            Security.insertProviderAt(jce, 1);

+        }

+        super.setUp();

+    }

+    // super class does it all getting composite based on this class name

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
new file mode 100644
index 0000000000..18bbf98628
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
@@ -0,0 +1,24 @@
+/*

+ * 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.ws.axis2.itests.policy.wspolicy;

+

+public class WSSecurityIntegrityTestCase extends AbstractHelloWorldOMTestCase {

+    // super class does it all getting composite based on this class name

+}

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
new file mode 100644
index 0000000000..b2ccd7f97d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
@@ -0,0 +1,58 @@
+/*
+ * 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.ws.axis2.itests.soap12 ;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class HelloWorldSOAP12TestCase extends TestCase {
+
+    private SCADomain domain;
+
+    public void testHelloWorld() throws Exception {
+        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClient");
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+    }
+    public void testHelloWorldSOAP() throws Exception {
+        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClientSOAP");
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+    }
+    public void testHelloWorldSOAP11() throws Exception {
+        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClientSOAP11");
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+    }
+    public void testHelloWorldSOAP12() throws Exception {
+        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClientSOAP12");
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite");
+    }
+   
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
new file mode 100644
index 0000000000..8d378565d4
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
@@ -0,0 +1,138 @@
+/*
+ * 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.ws.axis2.itests.soap12;
+
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.axis2.transport.http.server.HttpUtils;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * Test ?wsdl works and that the returned WSDL has the correct endpoint
+ *
+ * @version $Rev$ $Date$
+ */
+public class QuestionMarkWSDLTestCase extends TestCase {
+
+    private static boolean newGenerator = true;
+    private SCADomain domain;
+
+    /**
+     * Tests ?wsdl returns a soap 1.1 port by default
+     */
+    public void testSOAPDefault() throws Exception {
+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+        wsdlReader.setFeature("javax.wsdl.verbose",false);
+        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
+
+        Definition definition = wsdlReader.readWSDL("http://localhost:8085/ep1?wsdl");
+        assertNotNull(definition);
+        Service service = definition.getService(new QName(
+                              "http://itests.axis2.ws.binding.sca.tuscany.apache.org" + (newGenerator ? "/" : ""),
+                              newGenerator ? "HelloWorldService" : "HelloWorld"));
+        Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP11port_http");
+
+        String endpoint = getSOAP11Endpoint(port);
+        String ip = HttpUtils.getIpAddress();
+        assertEquals("http://" + ip + ":8085/ep1", endpoint);
+    }
+
+    /**
+     * Tests ?wsdl returns a soap 1.1 port when binding uses requires="SOAP.1_1"
+     */
+    public void testSOAP11Endpoint() throws Exception {
+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+        wsdlReader.setFeature("javax.wsdl.verbose",false);
+        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
+
+        Definition definition = wsdlReader.readWSDL("http://localhost:8085/ep2?wsdl");
+        assertNotNull(definition);
+        Service service = definition.getService(new QName(
+                              "http://itests.axis2.ws.binding.sca.tuscany.apache.org" + (newGenerator ? "/" : ""),
+                              newGenerator ? "HelloWorldService" : "HelloWorld"));
+        Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP11port_http");
+
+        String endpoint = getSOAP11Endpoint(port);
+        String ip = HttpUtils.getIpAddress();
+        assertEquals("http://" + ip + ":8085/ep2", endpoint);
+    }
+
+    /**
+     * Tests ?wsdl returns a soap 1.2 port when binding uses requires="SOAP.1_2"
+     */
+    public void testSOAP12Endpoint() throws Exception {
+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+        wsdlReader.setFeature("javax.wsdl.verbose",false);
+        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
+
+        Definition definition = wsdlReader.readWSDL("http://localhost:8085/ep3?wsdl");
+        assertNotNull(definition);
+        Service service = definition.getService(new QName(
+                              "http://itests.axis2.ws.binding.sca.tuscany.apache.org" + (newGenerator ? "/" : ""),
+                              newGenerator ? "HelloWorldService" : "HelloWorld"));
+        Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP12port_http");
+
+        String endpoint = getSOAP12Endpoint(port);
+        String ip = HttpUtils.getIpAddress();
+        assertEquals("http://" + ip + ":8085/ep3", endpoint);
+    }
+
+    protected String getSOAP11Endpoint(Port port) {
+        List wsdlPortExtensions = port.getExtensibilityElements();
+        for (final Object extension : wsdlPortExtensions) {
+            if (extension instanceof SOAPAddress) {
+                return ((SOAPAddress) extension).getLocationURI();
+            }
+        }
+        throw new RuntimeException("no SOAPAddress");
+    }
+
+    protected String getSOAP12Endpoint(Port port) {
+        List wsdlPortExtensions = port.getExtensibilityElements();
+        for (final Object extension : wsdlPortExtensions) {
+            if (extension instanceof SOAP12Address) {
+                return ((SOAP12Address) extension).getLocationURI();
+            }
+        }
+        throw new RuntimeException("no SOAPAddress");
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite");
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
new file mode 100644
index 0000000000..32b042402b
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
@@ -0,0 +1,20 @@
+# 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.

+# 

+# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

+# handler classname;qname=<policy intent addressed>;model=<policy model class>

+org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#wsAuthentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
new file mode 100644
index 0000000000..5cea469e3d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
@@ -0,0 +1,50 @@
+<?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"

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

+           name="HelloWorld">

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

+        <!-- interface.java interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

+        <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)">

+           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

+              <wsa:Address>http://localhost:8085/services/HelloWorldWebService</wsa:Address>

+           </wsa:EndpointReference>

+        </binding.ws>

+        

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

+        <!-- interface.java interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
new file mode 100644
index 0000000000..b11c50b00c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
@@ -0,0 +1,61 @@
+<?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"

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

+           name="HelloWorldNoWSDL">

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <!-- interface.java interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

+        <binding.ws uri="http://localhost:8085/helloWorld"/>

+    </service>

+

+    <component name="HelloWorldService">

+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->

+        <!-- interface.java interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

+        <binding.ws uri="http://localhost:8085/helloWorld"/>

+    </reference>

+

+    <service name="Echo" promote="EchoService">

+        <binding.ws uri="http://localhost:8085/Echo"/>

+    </service>

+

+    <component name="EchoService">

+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.EchoImpl"/>

+    </component>

+

+    <component name="EchoComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.EchoComponent"/>

+        <reference name="echoWS" />

+    </component>

+

+    <reference name="echoWS" promote="EchoComponent/echoWS">

+        <binding.ws uri="http://localhost:8085/Echo"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
new file mode 100644
index 0000000000..f09ed09b6a
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
@@ -0,0 +1,36 @@
+<?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.    

+-->

+<xsd:schema elementFormDefault="qualified"

+            targetNamespace="http://accounts"

+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+

+    <xsd:complexType name="CustomerProfileData">

+        <xsd:sequence>

+            <xsd:element name="firstName" type="xsd:string" />

+            <xsd:element name="lastName" type="xsd:string" />

+            <xsd:element name="address" type="xsd:string" />

+            <xsd:element name="email" type="xsd:string" />

+            <xsd:element name="loginID" type="xsd:string" />

+            <xsd:element name="password" type="xsd:string" />

+            <xsd:element name="id" type="xsd:int" />

+        </xsd:sequence>

+    </xsd:complexType>

+    

+</xsd:schema>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
new file mode 100644
index 0000000000..ec67b84851
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
@@ -0,0 +1,27 @@
+<?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.    

+-->

+<xsd:schema elementFormDefault="qualified"

+            targetNamespace="http://accounts"

+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+

+    <xsd:include schemaLocation="customerdata.xsd" />

+    <xsd:include schemaLocation="/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd" />

+    

+</xsd:schema>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
new file mode 100644
index 0000000000..7c903c6394
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
@@ -0,0 +1,31 @@
+<?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.    

+-->

+<xsd:schema elementFormDefault="qualified"

+            targetNamespace="http://accounts"

+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+

+    <xsd:complexType name="CustomerProfileInfo">

+        <xsd:sequence>

+            <xsd:element name="firstName" type="xsd:string" />

+            <xsd:element name="lastName" type="xsd:string" />

+        </xsd:sequence>

+    </xsd:complexType>

+    

+</xsd:schema>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
new file mode 100644
index 0000000000..394bf05506
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
@@ -0,0 +1,51 @@
+<?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"

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

+           name="endpoint1">

+           

+    <!-- 

+    exposing a component which has multiple services with a WS binding,

+    endpoint should be <componentURI>/<serviceName> so for this composite:

+    http://localhost:8085/HelloWorldService/service1 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService/HelloWorldOM">

+        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

+        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"
+			wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldMultiService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/HelloWorldService/helloWorld"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
new file mode 100644
index 0000000000..c7081b9a72
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
@@ -0,0 +1,51 @@
+<?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"

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

+           name="endpoint1">

+           

+    <!-- 

+    exposing a component with a WS binding, endpoint should be <componentURI>/<serviceName>

+    unless the component has just a single service in which case its just <componentURI>

+    so for this composite: http://localhost:8085/HelloWorldService 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

+        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"
+			wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/HelloWorldService/helloWorld"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
new file mode 100644
index 0000000000..7d3e1d1327
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
@@ -0,0 +1,49 @@
+<?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"

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

+           name="endpoint3">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with an explicit URL

+    so for this composite the service is: http://localhost:8085/myExplicitURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/myExplicitURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
new file mode 100644
index 0000000000..c2cd598508
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
@@ -0,0 +1,49 @@
+<?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"

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

+           name="endpoint4">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with a relative URL

+    so for this composite the service is: http://localhost:8085/HelloWorldService/myRelativeURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <interface.wsdl interface="http://helloworld-om-relative-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-relative-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld-om-relative-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-relative-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/HelloWorldService/helloWorld/myRelativeURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
new file mode 100644
index 0000000000..fe68755c47
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
@@ -0,0 +1,78 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld-om-relative-uri" xmlns:tns="http://helloworld-om-relative-uri" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="helloworld-om">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-relative-uri" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService/helloWorld/myRelativeURI"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
new file mode 100644
index 0000000000..38a7c045be
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
@@ -0,0 +1,50 @@
+<?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"

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

+           name="HelloWorld">

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

+        <binding.ws>

+           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

+              <wsa:Address>http://localhost:8085/myService</wsa:Address>

+           </wsa:EndpointReference>

+        </binding.ws>

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <binding.ws>

+           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

+              <wsa:Address>http://localhost:8085/myService</wsa:Address>

+           </wsa:EndpointReference>

+        </binding.ws>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
new file mode 100644
index 0000000000..7bf47bc412
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
@@ -0,0 +1,45 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld-om-merged" xmlns:tns="http://helloworld-om-merged" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="helloworld-om-bindings">
+
+    <wsdl:import namespace="http://helloworld-om-merged"
+		location="helloworld-om-porttype.wsdl"/>  
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://endpoint.not.used"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
new file mode 100644
index 0000000000..dee0effd99
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
@@ -0,0 +1,42 @@
+<?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"

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

+           name="HelloWorldOM-Merged">

+

+    <service name="helloWorld" promote="HelloWorldMergedService">

+        <interface.wsdl interface="http://helloworld-om-merged#wsdl.interface(HelloWorld)" />

+        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/>

+    </service>

+

+    <component name="HelloWorldMergedService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldWSDLMergedComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+    </component>

+ 

+    <reference name="mergedHelloWorldWS" promote="HelloWorldWSDLMergedComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld-om-merged#wsdl.interface(HelloWorld)" />

+        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld" />

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
new file mode 100644
index 0000000000..c66fa51c34
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
@@ -0,0 +1,59 @@
+<?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.    

+-->

+<wsdl:definitions targetNamespace="http://helloworld-om-merged" xmlns:tns="http://helloworld-om-merged" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+	name="helloworld-om-porttype">

+

+    <wsdl:types>

+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-merged" xmlns="http://www.w3.org/2001/XMLSchema">

+

+            <element name="getGreetings">

+                <complexType>

+                    <sequence>

+                        <element name="name" type="xsd:string"/>

+                    </sequence>

+                </complexType>

+            </element>

+

+            <element name="getGreetingsResponse">

+                <complexType>

+                    <sequence>

+                        <element name="getGreetingsReturn" type="xsd:string"/>

+                    </sequence>

+                </complexType>

+            </element>

+        </schema>

+    </wsdl:types>

+

+    <wsdl:message name="getGreetingsRequest">

+        <wsdl:part element="tns:getGreetings" name="parameters"/>

+    </wsdl:message>

+

+    <wsdl:message name="getGreetingsResponse">

+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

+    </wsdl:message>

+

+    <wsdl:portType name="HelloWorld">

+        <wsdl:operation name="getGreetings">

+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

+        </wsdl:operation>

+    </wsdl:portType>

+  

+</wsdl:definitions>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
new file mode 100644
index 0000000000..baa223f41c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
@@ -0,0 +1,78 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld-om-uri" xmlns:tns="http://helloworld-om-uri" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="helloworld-om">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-uri" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/myExplicitURI"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
new file mode 100644
index 0000000000..8fcbdef33d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
@@ -0,0 +1,43 @@
+<?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"

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

+           name="HelloWorldOM">

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

+        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/>

+    </service>

+    

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+    

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+    

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

+        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld" />

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
new file mode 100644
index 0000000000..73ca02246d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
@@ -0,0 +1,78 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld-om" xmlns:tns="http://helloworld-om" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="helloworld-om">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://endpoint.not.used"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
new file mode 100644
index 0000000000..c506b09bb2
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
@@ -0,0 +1,47 @@
+<?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.    

+-->

+

+<!-- $Rev$ $Date$ -->

+

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

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

+           name="HelloWorldPrec">

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <interface.wsdl interface="http://helloworld-prec#wsdl.interface(HelloWorld)" />

+        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/>

+    </service>

+    

+    <component name="HelloWorldService">

+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+    

+    <component name="HelloWorldComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+    

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

+        <interface.wsdl interface="http://helloworld-prec#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-prec#wsdl.port(HelloWorldService/HelloWorldSoapPort)"

+                    uri="http://INVALID.END.POINT" />

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
new file mode 100644
index 0000000000..5908c43e7d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
@@ -0,0 +1,81 @@
+<?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.    
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<wsdl:definitions targetNamespace="http://helloworld-prec" xmlns:tns="http://helloworld-prec" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    name="helloworld-prec">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-prec" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService/helloWorld"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
new file mode 100644
index 0000000000..1a2272d7ee
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
@@ -0,0 +1,86 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="helloworld">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/>
+        </wsdl:port>
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2">
+            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/>
+        </wsdl:port>
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3">
+            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
new file mode 100644
index 0000000000..da5bab45e8
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
@@ -0,0 +1,50 @@
+<?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"

+			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

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

+           name="endpoint3">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with an explicit URL

+    so for this composite the service is: http://localhost:8085/myExplicitURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService" requires="authentication">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="tuscany:wsClientAuthenticationPolicy">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/myExplicitURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
new file mode 100644
index 0000000000..13e002be1b
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
@@ -0,0 +1,49 @@
+<?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"

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

+           name="endpoint3">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with an explicit URL

+    so for this composite the service is: http://localhost:8085/myExplicitURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService" requires="confidentiality">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" requires="confidentiality">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/myExplicitURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
new file mode 100644
index 0000000000..2f6fab0d07
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
@@ -0,0 +1,49 @@
+<?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"

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

+           name="endpoint3">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with an explicit URL

+    so for this composite the service is: http://localhost:8085/myExplicitURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService" requires="integrity">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" requires="integrity">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/myExplicitURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
new file mode 100644
index 0000000000..9ff02b3a6b
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ASCII"?>

+<!--

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

+-->

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

+ 			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"

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

+ 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

+

+ <sca:intent name="wsAuthentication" 

+ 			 constrains="sca:binding.ws">

+ 			 <description>

+ 			 Communitcation thro this binding required Authentication.

+ 			 </description>

+ </sca:intent>	

+ 

+ <!-- WS Security POLICY SETS -->

+  <sca:policySet name="wsAuthenticationPolicy"

+ 	provides="sca:authentication"

+ 	appliesTo="//sca:binding.ws"

+ 	>

+ 	<tuscany:wsConfigParam>

+ 		<parameter name="InflowSecurity">

+ 			<action>

+ 				<items>UsernameToken</items>

+ 				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.ServerPWCBHandler</passwordCallbackClass>

+       		</action>

+      	</parameter>

+ 	</tuscany:wsConfigParam>

+ </sca:policySet>

+ 

+ <sca:policySet name="wsClientAuthenticationPolicy"

+ 	provides="tuscany:wsAuthentication"

+ 	appliesTo="//sca:binding.ws">

+ 	<tuscany:wsConfigParam>

+ 		<parameter name="OutflowSecurity">

+ 			<action>

+ 				<items>UsernameToken</items>

+ 				<user>TuscanyWsUser</user>

+				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.ClientPWCBHandler</passwordCallbackClass>" +

+                <passwordType>PasswordText</passwordType>

+               </action>

+    	</parameter>

+ 	</tuscany:wsConfigParam>

+ </sca:policySet>

+ 

+ <sca:policySet name="wsIntegrityPolicy"

+ 	provides="sca:integrity"

+ 	appliesTo="//sca:binding.ws">

+ 	<tuscany:wsConfigParam>

+ 		<parameter name="InflowSecurity">

+		    <action>

+		        <items>Timestamp Signature</items>

+		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

+		    </action>

+		</parameter>

+ 		<parameter name="OutflowSecurity">

+      		<action>

+        		<items>Timestamp Signature</items>

+        		<user>TuscanyWsUser</user>

+        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

+        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>" +

+        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>

+      		</action>

+    	</parameter>

+ 	</tuscany:wsConfigParam>

+ </sca:policySet>

+

+ <sca:policySet name="wsConfidentialityPolicy"

+ 	provides="sca:confidentiality"

+ 	appliesTo="//sca:binding.ws">

+ 	<tuscany:wsConfigParam>

+ 		<parameter name="InflowSecurity">

+      		<action>

+        		<items>Timestamp Signature Encrypt</items>

+        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>

+        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

+      		</action>

+    	</parameter>

+ 		<parameter name="OutflowSecurity">

+      		<action>

+        		<items>Timestamp Signature Encrypt</items>

+        		<user>TuscanyWsUser</user>

+        		<encryptionUser>TuscanyWsUser</encryptionUser>

+        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>

+        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

+      			<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>

+      			<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>

+	      </action>

+    	</parameter>

+ 	</tuscany:wsConfigParam>

+ </sca:policySet>

+ </sca:definitions>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
new file mode 100644
index 0000000000..592edf183b
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
@@ -0,0 +1,20 @@
+## ---------------------------------------------------------------------------

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

+## ---------------------------------------------------------------------------

+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin

+org.apache.ws.security.crypto.merlin.keystore.type=jks

+org.apache.ws.security.crypto.merlin.keystore.password=TuscanyWsUserPasswd

+org.apache.ws.security.crypto.merlin.file=org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
new file mode 100644
index 0000000000..307edb9b37
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
new file mode 100644
index 0000000000..12b2b18e55
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
@@ -0,0 +1,52 @@
+<?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"
+			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+           name="endpoint3">
+           
+    <!-- 
+    exposing a component with a WS binding using a WSDL port with an explicit URL
+    so for this composite the service is: http://localhost:8085/myExplicitURI 
+    -->      
+
+    <service name="helloWorld" promote="HelloWorldService" 
+    	policySets="tuscany:serverWsPolicyForAuthentication">
+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />
+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />
+    </service>
+
+    <component name="HelloWorldService">
+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>
+    </component>
+
+    <component name="HelloWorldComponent">
+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>
+        <reference name="helloWorldWS" />
+    </component>
+
+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" 
+    	policySets="tuscany:clientWsPolicyForAuthentication">
+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />
+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"
+                    uri="http://localhost:8085/myExplicitURI"/>
+    </reference>
+
+</composite>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
new file mode 100644
index 0000000000..75d0dc717c
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.    
+-->
+<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ 			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+ 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+
+ <!-- WS Security POLICY SETS -->
+ <!-- A policyset that uses WS Policy -->
+ <sca:intent name="wsAuthentication" 
+ 			 constrains="sca:binding.ws">
+ 			 <description>
+ 			 Communitcation thro this binding required Authentication.
+ 			 </description>
+ </sca:intent>	
+ 
+ <!-- WS Security POLICY SETS -->
+  <sca:policySet name="wsAuthenticationPolicy"
+ 	provides="sca:authentication"
+ 	appliesTo="//sca:binding.ws"
+ 	>
+ 	<tuscany:wsConfigParam>
+ 		<parameter name="InflowSecurity">
+ 			<action>
+ 				<items>UsernameToken</items>
+ 				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</passwordCallbackClass>
+       		</action>
+      	</parameter>
+ 	</tuscany:wsConfigParam>
+ </sca:policySet>
+ 
+ <sca:policySet name="wsClientAuthenticationPolicy"
+ 	provides="tuscany:wsAuthentication"
+ 	appliesTo="//sca:binding.ws">
+ 	<tuscany:wsConfigParam>
+ 		<parameter name="OutflowSecurity">
+ 			<action>
+ 				<items>UsernameToken</items>
+ 				<user>TuscanyWsUser</user>
+				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ClientPWCBHandler</passwordCallbackClass>" +
+                <passwordType>PasswordText</passwordType>
+               </action>
+    	</parameter>
+ 	</tuscany:wsConfigParam>
+ </sca:policySet>
+ 
+ <sca:policySet name="wsMixedReceiverIntegrityPolicy"
+ 	provides="sca:integrity"
+ 	appliesTo="//sca:binding.ws">
+ 	<tuscany:wsConfigParam>
+ 		<parameter name="InflowSecurity">
+		    <action>
+		        <items>Signature</items>
+		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
+		    </action>
+		</parameter>
+ 	</tuscany:wsConfigParam>
+ </sca:policySet>
+ 
+ <sca:policySet name="wsMixedSenderIntegrityPolicy"
+ 	provides="sca:integrity"
+ 	appliesTo="//sca:binding.ws">
+ 	<tuscany:wsConfigParam>
+ 		<parameter name="OutflowSecurity">
+      		<action>
+        		<items>Signature</items>
+        		<user>TuscanyWsUser</user>
+        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
+        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.IntegrityPWCBHandler</passwordCallbackClass>
+        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
+      		</action>
+    	</parameter>
+ 	</tuscany:wsConfigParam>
+ </sca:policySet>
+ 
+ <sca:policySet name="wsServerAuthenticationIntegrityPolicy"
+ 	provides="sca:authentication sca:integrity"
+ 	appliesTo="//sca:binding.ws"
+ 	>
+ 	<tuscany:wsConfigParam>
+ 		<parameter name="InflowSecurity">
+ 			<action>
+ 				<items>UsernameToken Signature</items>
+ 				<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
+ 				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</passwordCallbackClass>
+       		</action>
+      	</parameter>
+      	<parameter name="OutflowSecurity">
+      		<action>
+        		<items>Signature</items>
+        		<user>TuscanyWsUser</user>
+        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
+        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</passwordCallbackClass>
+        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
+      		</action>
+  		</parameter>
+ 	</tuscany:wsConfigParam>
+ </sca:policySet>
+ 
+ <sca:policySet name="wsClientAuthenticationIntegrityPolicy"
+ 	provides="tuscany:wsAuthentication"
+ 	appliesTo="//sca:binding.ws">
+ 	<tuscany:wsConfigParam>
+ 		<parameter name="InflowSecurity">
+		    <action>
+		        <items>Signature</items>
+		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
+		    </action>
+		</parameter>
+ 		<parameter name="OutflowSecurity">
+ 			<action>
+ 				<items>UsernameToken Signature</items>
+ 				<user>TuscanyWsUser</user>
+				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ClientPWCBHandler</passwordCallbackClass>" +
+				<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
+                <passwordType>PasswordText</passwordType>
+                <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
+            </action>
+    	</parameter>
+ 	</tuscany:wsConfigParam>
+ </sca:policySet>
+ 
+ <sca:policySet name="clientWsPolicyForAuthentication"
+ 	provides="sca:authentication"
+ 	appliesTo="//sca:binding.ws"
+ 	>
+ 	<wsp:Policy wsu:Id="UTOverTransport" 
+ 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
+ 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+		  <wsp:All>
+ 		 	<sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<wsp:Policy>
+					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
+				</wsp:Policy>
+			</sp:SignedSupportingTokens>
+			
+			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+				<ramp:user>TuscanyWsUser</ramp:user>
+				<!-- ramp:passwordType>PasswordText</ramp:passwordType-->
+				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ClientPWCBHandler</ramp:passwordCallbackClass>
+			</ramp:RampartConfig>
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
+ </sca:policySet>
+ 
+ <sca:policySet name="serverWsPolicyForAuthentication"
+ 	provides="sca:authentication"
+ 	appliesTo="//sca:binding.ws"
+ 	>
+ 	<wsp:Policy wsu:Id="UTOverTransport" 
+ 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
+ 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+		  <wsp:All>
+ 		 	<sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<wsp:Policy>
+					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
+				</wsp:Policy>
+			</sp:SignedSupportingTokens>
+			
+			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</ramp:passwordCallbackClass>
+			</ramp:RampartConfig>
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
+ </sca:policySet>
+ 
+  <!-- A policyset that uses WS Policy --> 
+ <sca:policySet name="serverWsPolicyForIntegrity"
+ 	provides="sca:integrity"
+ 	appliesTo="//sca:binding.ws">
+ 	<wsp:Policy wsu:Id="SignOnly" 
+ 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
+ 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+			<wsp:All>
+				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:InitiatorToken>
+							<wsp:Policy>
+								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+									<wsp:Policy>
+										<sp:WssX509V3Token10/>
+									</wsp:Policy>
+								</sp:X509Token>
+							</wsp:Policy>
+						</sp:InitiatorToken>
+						<sp:RecipientToken>
+							<wsp:Policy>
+								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+									<wsp:Policy>
+										<sp:WssX509V3Token10/>
+									</wsp:Policy>
+								</sp:X509Token>
+							</wsp:Policy>
+						</sp:RecipientToken>
+						<sp:AlgorithmSuite>
+							<wsp:Policy>
+								<sp:TripleDesRsa15/>
+							</wsp:Policy>
+						</sp:AlgorithmSuite>
+						<sp:Layout>
+							<wsp:Policy>
+								<sp:Strict/>
+							</wsp:Policy>
+						</sp:Layout>
+						<sp:IncludeTimestamp/>
+						<sp:OnlySignEntireHeadersAndBody/>
+					</wsp:Policy>
+				</sp:AsymmetricBinding>
+				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:MustSupportRefKeyIdentifier/>
+						<sp:MustSupportRefIssuerSerial/>
+					</wsp:Policy>
+				</sp:Wss10>
+				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<sp:Body/>
+				</sp:SignedParts>
+	
+				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+					<ramp:user>TuscanyWsUser</ramp:user>
+					<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>
+					<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.IntegrityPWCBHandler</ramp:passwordCallbackClass>
+					
+					<ramp:signatureCrypto>
+						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+							<ramp:property name="org.apache.ws.security.crypto.merlin.file">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks</ramp:property>
+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>
+						</ramp:crypto>
+					</ramp:signatureCrypto>
+				</ramp:RampartConfig>
+	
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
+ </sca:policySet>
+ 
+ 
+ <!-- A policyset that uses WS Policy --> 
+ <!-- sca:policySet name="tuscany:wsSecurityPolicyForIntegritys"
+ 	provides="sca:integrity"
+ 	appliesTo="sca:binding.ws">
+ 	<wsp:Policy wsu:Id="SignOnly" 
+ 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
+ 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+			<wsp:All>
+				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:InitiatorToken>
+							<wsp:Policy>
+								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+									<wsp:Policy>
+										<sp:WssX509V3Token10/>
+									</wsp:Policy>
+								</sp:X509Token>
+							</wsp:Policy>
+						</sp:InitiatorToken>
+						<sp:RecipientToken>
+							<wsp:Policy>
+								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+									<wsp:Policy>
+										<sp:WssX509V3Token10/>
+									</wsp:Policy>
+								</sp:X509Token>
+							</wsp:Policy>
+						</sp:RecipientToken>
+						<sp:AlgorithmSuite>
+							<wsp:Policy>
+								<sp:TripleDesRsa15/>
+							</wsp:Policy>
+						</sp:AlgorithmSuite>
+						<sp:Layout>
+							<wsp:Policy>
+								<sp:Strict/>
+							</wsp:Policy>
+						</sp:Layout>
+						<sp:IncludeTimestamp/>
+						<sp:OnlySignEntireHeadersAndBody/>
+					</wsp:Policy>
+				</sp:AsymmetricBinding>
+				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:MustSupportRefKeyIdentifier/>
+						<sp:MustSupportRefIssuerSerial/>
+					</wsp:Policy>
+				</sp:Wss10>
+				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<sp:Body/>
+				</sp:SignedParts>
+	
+				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+					<ramp:user>TuscanyWsUser</ramp:user>
+					<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>
+					<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.IntegrityPWCBHandler</ramp:passwordCallbackClass>
+					
+					<ramp:signatureCrypto>
+						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+							<ramp:property name="org.apache.ws.security.crypto.merlin.file">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks</ramp:property>
+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>
+						</ramp:crypto>
+					</ramp:signatureCrypto>
+				</ramp:RampartConfig>
+	
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
+ </sca:policySet-->
+ </sca:definitions>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
new file mode 100644
index 0000000000..cb188e6676
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
@@ -0,0 +1,20 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=TuscanyWsUserPasswd
+org.apache.ws.security.crypto.merlin.file=org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
new file mode 100644
index 0000000000..307edb9b37
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
new file mode 100644
index 0000000000..2a22a0905d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
@@ -0,0 +1,50 @@
+<?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"

+			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

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

+           name="endpoint3">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with an explicit URL

+    so for this composite the service is: http://localhost:8085/myExplicitURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService" policySets="tuscany:wsSecurityPolicyForAuthentication">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="tuscany:wsSecurityPolicyForAuthentication">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/myExplicitURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
new file mode 100644
index 0000000000..e6f999aad7
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
@@ -0,0 +1,49 @@
+<?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"

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

+           name="endpoint3">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with an explicit URL

+    so for this composite the service is: http://localhost:8085/myExplicitURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService" policySets="wsSecurityPolicyForConfidentiality">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="wsSecurityPolicyForConfidentiality">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/myExplicitURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
new file mode 100644
index 0000000000..d9e889768b
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
@@ -0,0 +1,50 @@
+<?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"

+			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

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

+           name="endpoint3">

+           

+    <!-- 

+    exposing a component with a WS binding using a WSDL port with an explicit URL

+    so for this composite the service is: http://localhost:8085/myExplicitURI 

+    -->      

+

+    <service name="helloWorld" promote="HelloWorldService" policySets="tuscany:wsSecurityPolicyForIntegrity">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="tuscany:wsSecurityPolicyForIntegrity">

+        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

+        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

+                    uri="http://localhost:8085/myExplicitURI"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
new file mode 100644
index 0000000000..200400f0b5
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="ASCII"?>

+<!--

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

+-->

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

+ 			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"

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

+ 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

+

+ <sca:intent name="wsAuthentication" 

+ 			 constrains="sca:binding.ws">

+ 			 <description>

+ 			 Communitcation thro this binding required Authentication.

+ 			 </description>

+ </sca:intent>	

+ 

+ <!-- WS Security POLICY SETS -->

+ <!-- A policyset that uses WS Policy -->

+ <sca:policySet name="wsSecurityPolicyForAuthentication"

+ 	provides="sca:authentication"

+ 	appliesTo="sca:binding.ws"

+ 	>

+ 	<wsp:Policy wsu:Id="UTOverTransport" 

+ 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

+ 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+		<wsp:ExactlyOne>

+		  <wsp:All>

+ 		 	<sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+				<wsp:Policy>

+					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />

+				</wsp:Policy>

+			</sp:SignedSupportingTokens>

+			

+			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

+				<ramp:user>TuscanyWsUser</ramp:user>

+				<ramp:passwordType>PasswordText</ramp:passwordType>

+				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.ClientPWCBHandler</ramp:passwordCallbackClass>

+			</ramp:RampartConfig>

+			</wsp:All>

+		</wsp:ExactlyOne>

+	</wsp:Policy>

+ </sca:policySet>

+ 

+  <!-- A policyset that uses WS Policy --> 

+ <sca:policySet name="wsSecurityPolicyForIntegrity"

+ 	provides="sca:integrity"

+ 	appliesTo="sca:binding.ws">

+ 	<wsp:Policy wsu:Id="SignOnly" 

+ 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

+ 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+		<wsp:ExactlyOne>

+			<wsp:All>

+				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+					<wsp:Policy>

+						<sp:InitiatorToken>

+							<wsp:Policy>

+								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">

+									<wsp:Policy>

+										<sp:WssX509V3Token10/>

+									</wsp:Policy>

+								</sp:X509Token>

+							</wsp:Policy>

+						</sp:InitiatorToken>

+						<sp:RecipientToken>

+							<wsp:Policy>

+								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">

+									<wsp:Policy>

+										<sp:WssX509V3Token10/>

+									</wsp:Policy>

+								</sp:X509Token>

+							</wsp:Policy>

+						</sp:RecipientToken>

+						<sp:AlgorithmSuite>

+							<wsp:Policy>

+								<sp:TripleDesRsa15/>

+							</wsp:Policy>

+						</sp:AlgorithmSuite>

+						<sp:Layout>

+							<wsp:Policy>

+								<sp:Strict/>

+							</wsp:Policy>

+						</sp:Layout>

+						<sp:IncludeTimestamp/>

+						<sp:OnlySignEntireHeadersAndBody/>

+					</wsp:Policy>

+				</sp:AsymmetricBinding>

+				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+					<wsp:Policy>

+						<sp:MustSupportRefKeyIdentifier/>

+						<sp:MustSupportRefIssuerSerial/>

+					</wsp:Policy>

+				</sp:Wss10>

+				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+					<sp:Body/>

+				</sp:SignedParts>

+	

+				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

+					<ramp:user>TuscanyWsUser</ramp:user>

+					<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>

+					<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.IntegrityPWCBHandler</ramp:passwordCallbackClass>

+					

+					<ramp:signatureCrypto>

+						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

+							<ramp:property name="org.apache.ws.security.crypto.merlin.file">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks</ramp:property>

+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

+						</ramp:crypto>

+					</ramp:signatureCrypto>

+				</ramp:RampartConfig>

+	

+			</wsp:All>

+		</wsp:ExactlyOne>

+	</wsp:Policy>

+ </sca:policySet>

+ 

+ <!-- A policyset that uses WS Policy -->

+ <sca:policySet name="wsSecurityPolicyForConfidentiality"

+ 	provides="sca:confidentiality"

+ 	appliesTo="sca:binding.ws">

+ 	<wsp:Policy wsu:Id="SigEncr" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+	<wsp:ExactlyOne>

+		<wsp:All>

+			<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+				<wsp:Policy>

+					<sp:InitiatorToken>

+						<wsp:Policy>

+							<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">

+								<wsp:Policy>

+									<sp:WssX509V3Token10/>

+								</wsp:Policy>

+							</sp:X509Token>

+						</wsp:Policy>

+					</sp:InitiatorToken>

+					<sp:RecipientToken>

+						<wsp:Policy>

+							<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">

+								<wsp:Policy>

+									<sp:WssX509V3Token10/>

+								</wsp:Policy>

+							</sp:X509Token>

+						</wsp:Policy>

+					</sp:RecipientToken>

+					<sp:AlgorithmSuite>

+						<wsp:Policy>

+							<sp:TripleDesRsa15/>

+						</wsp:Policy>

+					</sp:AlgorithmSuite>

+					<sp:Layout>

+						<wsp:Policy>

+							<sp:Strict/>

+						</wsp:Policy>

+					</sp:Layout>

+					<sp:IncludeTimestamp/>

+					<sp:OnlySignEntireHeadersAndBody/>

+				</wsp:Policy>

+			</sp:AsymmetricBinding>

+			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+				<wsp:Policy>

+					<sp:MustSupportRefKeyIdentifier/>

+					<sp:MustSupportRefIssuerSerial/>

+				</wsp:Policy>

+			</sp:Wss10>

+			<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+				<sp:Body/>

+			</sp:SignedParts>

+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

+				<sp:Body/>

+			</sp:EncryptedParts>

+

+			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

+				<ramp:user>TuscanyWsUser</ramp:user>

+				<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>

+				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.IntegrityPWCBHandler</ramp:passwordCallbackClass>

+				<ramp:signatureCrypto>

+					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

+						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks</ramp:property>

+						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

+					</ramp:crypto>

+				</ramp:signatureCrypto>

+				

+				<ramp:encryptionCypto>

+					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

+						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks</ramp:property>

+						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

+					</ramp:crypto>

+				</ramp:encryptionCypto>

+			</ramp:RampartConfig>

+

+		</wsp:All>

+	</wsp:ExactlyOne>

+</wsp:Policy>

+ </sca:policySet>

+ 

+ </sca:definitions>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
new file mode 100644
index 0000000000..307edb9b37
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
new file mode 100644
index 0000000000..41a491361f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
@@ -0,0 +1,70 @@
+<?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.    

+-->

+<wsdl:definitions targetNamespace="http://account3"

+                  xmlns:tns="http://account3"

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

+                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+	              name="questionmark-import-nested">

+

+    <wsdl:types>

+        <xsd:schema elementFormDefault="qualified"

+                    targetNamespace="http://account3"

+                    xmlns:account="http://accounts"

+                    xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+

+            <xsd:import namespace="http://accounts" schemaLocation="customerdefs.xsd" />

+

+            <xsd:element name="getCustomerProfile">

+                <xsd:complexType>

+                    <xsd:sequence>

+                        <xsd:element name="loginID" type="xsd:string" />

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+

+            <xsd:element name="getCustomerProfileResponse">

+                <xsd:complexType>

+                    <xsd:sequence>

+                        <xsd:element name="customerProfile"

+                            type="account:CustomerProfileData" />

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+            

+        </xsd:schema>

+    </wsdl:types>

+

+    <wsdl:message name="getCustomerProfileRequest">

+        <wsdl:part element="tns:getCustomerProfile" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:message name="getCustomerProfileResponse">

+        <wsdl:part element="tns:getCustomerProfileResponse" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:portType name="Account">

+        <wsdl:operation name="getCustomerProfile">

+            <wsdl:input message="tns:getCustomerProfileRequest" name="getCustomerProfileRequest" />

+            <wsdl:output message="tns:getCustomerProfileResponse" name="getCustomerProfileResponse" />

+        </wsdl:operation>

+    </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
new file mode 100644
index 0000000000..99a8c6d81d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
@@ -0,0 +1,49 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://account2"
+                  xmlns:tns="http://account2"
+                  xmlns:account3="http://account3"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	              name="questionmark-import">
+
+    <wsdl:import namespace="http://account3" location="/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl" />
+
+    <wsdl:binding name="AccountSoapBinding" type="account3:Account">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="getCustomerProfile">
+            <wsdlsoap:operation soapAction="" />
+            <wsdl:input name="getCustomerProfileRequest">
+                <wsdlsoap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output name="getCustomerProfileResponse">
+                <wsdlsoap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="AccountService">
+        <wsdl:port binding="tns:AccountSoapBinding" name="AccountSoapPort">
+            <wsdlsoap:address location="http://localhost:8086/AccountService" />
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
new file mode 100644
index 0000000000..80e4b62801
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
@@ -0,0 +1,94 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://accounts"
+                  xmlns:tns="http://accounts"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	              name="questionmark-include">
+
+    <wsdl:types>
+        <xsd:schema elementFormDefault="qualified"
+                    targetNamespace="http://accounts"
+                    xmlns:account="http://accounts"
+                    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:include schemaLocation="/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd" />
+
+            <xsd:element name="getCustomerProfile">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="loginID" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="getCustomerProfileResponse">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="customerProfile"
+                            type="xsd:string" />
+                        <!--
+                        <xsd:element name="customerProfile"
+                            type="account:CustomerProfileData" />
+                        -->
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            
+        </xsd:schema>
+    </wsdl:types>
+
+    <wsdl:message name="getCustomerProfileRequest">
+        <wsdl:part element="tns:getCustomerProfile" name="parameters" />
+    </wsdl:message>
+
+    <wsdl:message name="getCustomerProfileResponse">
+        <wsdl:part element="tns:getCustomerProfileResponse" name="parameters" />
+    </wsdl:message>
+
+    <wsdl:portType name="Account">
+        <wsdl:operation name="getCustomerProfile">
+            <wsdl:input message="tns:getCustomerProfileRequest" name="getCustomerProfileRequest" />
+            <wsdl:output message="tns:getCustomerProfileResponse" name="getCustomerProfileResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="AccountSoapBinding" type="tns:Account">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="getCustomerProfile">
+            <wsdlsoap:operation soapAction="" />
+            <wsdl:input name="getCustomerProfileRequest">
+                <wsdlsoap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output name="getCustomerProfileResponse">
+                <wsdlsoap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="AccountService">
+        <wsdl:port binding="tns:AccountSoapBinding" name="AccountSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/AccountService" />
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
new file mode 100644
index 0000000000..008d42d03d
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
@@ -0,0 +1,31 @@
+<?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="QuestionMarkWSDLImport">

+

+    <service name="ep1" promote="AccountService">

+        <binding.ws wsdlElement="http://account2#wsdl.port(AccountService/AccountSoapPort)" />

+    </service>

+

+    <component name="AccountService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.AccountService" />

+    </component>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
new file mode 100644
index 0000000000..7fff56377b
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
@@ -0,0 +1,31 @@
+<?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="QuestionMarkWSDLInclude">

+

+    <service name="ep1" promote="AccountService">

+        <binding.ws wsdlElement="http://accounts#wsdl.port(AccountService/AccountSoapPort)" />

+    </service>

+

+    <component name="AccountService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.AccountService" />

+    </component>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
new file mode 100644
index 0000000000..c042ae5675
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
@@ -0,0 +1,39 @@
+<?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"
+			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+           name="QuestionMarkWSDLTests">
+
+    <service name="ep1" promote="HelloWorldService">
+        <binding.ws wsdlElement="http://helloworld#wsdl.service(HelloWorldService)"/>
+        <!--
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+        -->
+    </service>
+
+    <service name="ep2" promote="HelloWorldService">
+        <binding.ws uri="http://localhost:8085/foo/bar"  />
+    </service>
+
+    <component name="HelloWorldService">
+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>
+    </component>
+
+</composite>
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
new file mode 100644
index 0000000000..fbd4c66c45
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
@@ -0,0 +1,71 @@
+<?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"

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

+           name="HelloWorld">

+

+    <service name="helloWorld" promote="HelloWorldService">

+        <binding.ws uri="http://localhost:8085/helloWorld"/>

+    </service>

+    <service name="helloWorldSOAP" promote="HelloWorldService">

+        <binding.ws requires="SOAP" uri="http://localhost:8085/helloWorldSOAP"/>

+    </service>

+    <service name="helloWorldSOAP11" promote="HelloWorldService">

+        <binding.ws requires="SOAP.1_1" uri="http://localhost:8085/helloWorldSOAP11"/>

+    </service>

+    <service name="helloWorldSOAP12" promote="HelloWorldService">

+        <binding.ws requires="SOAP.1_2" uri="http://localhost:8085/helloWorldSOAP12"/>

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

+    </component>

+

+    <component name="HelloWorldClient">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+    <component name="HelloWorldClientSOAP">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+    <component name="HelloWorldClientSOAP11">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+    <component name="HelloWorldClientSOAP12">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

+        <reference name="helloWorldWS" />

+    </component>

+

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

+        <binding.ws uri="http://localhost:8085/helloWorld"/>

+    </reference>

+    <reference name="helloWorldWS" promote="HelloWorldClientSOAP/helloWorldWS">

+        <binding.ws uri="http://localhost:8085/helloWorldSOAP" requires="SOAP"/>

+    </reference>

+    <reference name="helloWorldWS" promote="HelloWorldClientSOAP11/helloWorldWS">

+        <binding.ws uri="http://localhost:8085/helloWorldSOAP11" requires="SOAP.1_1"/>

+    </reference>

+    <reference name="helloWorldWS" promote="HelloWorldClientSOAP12/helloWorldWS">

+        <binding.ws uri="http://localhost:8085/helloWorldSOAP12" requires="SOAP.1_2"/>

+    </reference>

+

+</composite>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
new file mode 100644
index 0000000000..033a77eea6
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
@@ -0,0 +1,40 @@
+<?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"

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

+           name="QuestionMarkWSDLTests">

+

+    <service name="ep1" promote="HelloWorldService">

+        <binding.ws uri="http://localhost:8085/ep1"/>

+    </service>

+

+    <service name="ep2" promote="HelloWorldService">

+        <binding.ws requires="SOAP.1_1"  uri="http://localhost:8085/ep2"/>

+    </service>

+

+    <service name="ep3" promote="HelloWorldService">

+        <binding.ws requires="SOAP.1_2"  uri="http://localhost:8085/ep3"/>

+    </service>

+

+    <component name="HelloWorldService">

+		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

+    </component>

+

+</composite>