Removed more modules as in Oscar's TUSCANY-2440 reduced-set patch. Also removed newer modules added since r643746 and are not required to run the minimum set that we are porting to android. Set svn ignore properties to ignore Manifest files produced by the build.

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

25 files changed, 0 insertions, 3577 deletions

diff --git a/branches/sca-android/modules/interface-java-jaxws/LICENSE b/branches/sca-android/modules/interface-java-jaxws/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-
diff --git a/branches/sca-android/modules/interface-java-jaxws/META-INF/README b/branches/sca-android/modules/interface-java-jaxws/META-INF/README
deleted file mode 100644
index 009570154d..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/META-INF/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/interface-java-jaxws/NOTICE b/branches/sca-android/modules/interface-java-jaxws/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-android/modules/interface-java-jaxws/pom.xml b/branches/sca-android/modules/interface-java-jaxws/pom.xml
deleted file mode 100644
index 1a738e0f16..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/pom.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface-java-jaxws</artifactId>
-    <name>Apache Tuscany Java Interface for JAXWS</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <id>wsimport</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.example.stock</packageName>
-                            <wsdlDirectory>${basedir}/src/test/resources/wsdl</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>StockExceptionTest.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-
-                    <!-- 
-                    <execution>
-                        <id>wsgen</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>wsgen-test</goal>
-                        </goals>
-                        <configuration>
-                            <sei>org.apache.tuscany.sca.interfacedef.java.jaxws.MyServiceImpl</sei>
-                            <genWsdl>true</genWsdl>
-                            <keep>true</keep>
-                            <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        </configuration>
-                    </execution>
-                    -->
-                </executions>
-
-            </plugin>
-
-            <!-- 
-            wsimport cannot handle WSDL files without a service/binding element.
-            CXF wsdl2java plugin does support that. I had to override the default 
-            value of wsdlRoot/testWsdlRoot to a non-existent file to avoid NPE -->
-            <!-- 
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-
-                        <configuration>
-                            <sourceRoot>${basedir}/target/jaxws-source</sourceRoot>
-                            <wsdlRoot>NONE</wsdlRoot>
-                            <testWsdlRoot>NONE</testWsdlRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl/Stock.wsdl</wsdl>
-                                    <outputDir>${basedir}/target/jaxws-source</outputDir>
-                                    <packagenames>
-                                        <packagename>com.example.stock.cxf</packagename>
-                                    </packagenames>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-             -->
-
-            <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.interface.java.jaxws</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.java.jaxws*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>default-tools.jar</id>
-            <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>Sun Microsystems Inc.</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun</groupId>
-                    <artifactId>tools</artifactId>
-                    <version>1.5.0</version>
-                    <scope>system</scope>
-                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
deleted file mode 100644
index 4cf56fed0c..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import javax.xml.bind.annotation.XmlAttachmentRef;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.ws.Holder;
-
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-public abstract class BaseBeanGenerator implements Opcodes {
-    private static final Map<String, String> COLLECTION_CLASSES = new HashMap<String, String>();
-    static {
-        COLLECTION_CLASSES.put("Ljava/util/Collection;", "java/util/ArrayList");
-        COLLECTION_CLASSES.put("Ljava/util/List;", "java/util/ArrayList");
-        COLLECTION_CLASSES.put("Ljava/util/Set;", "java/util/HashSet");
-        COLLECTION_CLASSES.put("Ljava/util/Queue;", "java/util/LinkedList");
-    }
-    private final static Class[] KNOWN_JAXB_ANNOTATIONS =
-        {XmlAttachmentRef.class, XmlMimeType.class, XmlJavaTypeAdapter.class, XmlList.class};
-    private static final Map<String, String> JAVA_KEYWORDS = new HashMap<String, String>();
-
-    static {
-        JAVA_KEYWORDS.put("abstract", "_abstract");
-        JAVA_KEYWORDS.put("assert", "_assert");
-        JAVA_KEYWORDS.put("boolean", "_boolean");
-        JAVA_KEYWORDS.put("break", "_break");
-        JAVA_KEYWORDS.put("byte", "_byte");
-        JAVA_KEYWORDS.put("case", "_case");
-        JAVA_KEYWORDS.put("catch", "_catch");
-        JAVA_KEYWORDS.put("char", "_char");
-        JAVA_KEYWORDS.put("class", "_class");
-        JAVA_KEYWORDS.put("const", "_const");
-        JAVA_KEYWORDS.put("continue", "_continue");
-        JAVA_KEYWORDS.put("default", "_default");
-        JAVA_KEYWORDS.put("do", "_do");
-        JAVA_KEYWORDS.put("double", "_double");
-        JAVA_KEYWORDS.put("else", "_else");
-        JAVA_KEYWORDS.put("extends", "_extends");
-        JAVA_KEYWORDS.put("false", "_false");
-        JAVA_KEYWORDS.put("final", "_final");
-        JAVA_KEYWORDS.put("finally", "_finally");
-        JAVA_KEYWORDS.put("float", "_float");
-        JAVA_KEYWORDS.put("for", "_for");
-        JAVA_KEYWORDS.put("goto", "_goto");
-        JAVA_KEYWORDS.put("if", "_if");
-        JAVA_KEYWORDS.put("implements", "_implements");
-        JAVA_KEYWORDS.put("import", "_import");
-        JAVA_KEYWORDS.put("instanceof", "_instanceof");
-        JAVA_KEYWORDS.put("int", "_int");
-        JAVA_KEYWORDS.put("interface", "_interface");
-        JAVA_KEYWORDS.put("long", "_long");
-        JAVA_KEYWORDS.put("native", "_native");
-        JAVA_KEYWORDS.put("new", "_new");
-        JAVA_KEYWORDS.put("null", "_null");
-        JAVA_KEYWORDS.put("package", "_package");
-        JAVA_KEYWORDS.put("private", "_private");
-        JAVA_KEYWORDS.put("protected", "_protected");
-        JAVA_KEYWORDS.put("public", "_public");
-        JAVA_KEYWORDS.put("return", "_return");
-        JAVA_KEYWORDS.put("short", "_short");
-        JAVA_KEYWORDS.put("static", "_static");
-        JAVA_KEYWORDS.put("strictfp", "_strictfp");
-        JAVA_KEYWORDS.put("super", "_super");
-        JAVA_KEYWORDS.put("switch", "_switch");
-        JAVA_KEYWORDS.put("synchronized", "_synchronized");
-        JAVA_KEYWORDS.put("this", "_this");
-        JAVA_KEYWORDS.put("throw", "_throw");
-        JAVA_KEYWORDS.put("throws", "_throws");
-        JAVA_KEYWORDS.put("transient", "_transient");
-        JAVA_KEYWORDS.put("true", "_true");
-        JAVA_KEYWORDS.put("try", "_try");
-        JAVA_KEYWORDS.put("void", "_void");
-        JAVA_KEYWORDS.put("volatile", "_volatile");
-        JAVA_KEYWORDS.put("while", "_while");
-        JAVA_KEYWORDS.put("enum", "_enum");
-    }
-
-    protected static final Map<Object, Class<?>> generatedClasses =
-        Collections.synchronizedMap(new WeakHashMap<Object, Class<?>>());
-
-    protected XMLAdapterExtensionPoint xmlAdapters;
-
-    public byte[] defineClass(ClassWriter cw,
-                              String classDescriptor,
-                              String classSignature,
-                              String namespace,
-                              String name,
-                              BeanProperty[] properties) {
-        // Declare the class
-        declareClass(cw, classDescriptor);
-
-        // Compute the propOrder
-        String[] propOrder = null;
-        if (properties != null && properties.length > 0) {
-            int size = properties.length;
-            propOrder = new String[size];
-            for (int i = 0; i < size; i++) {
-                propOrder[i] = getFieldName(properties[i].getName());
-            }
-        }
-        // Annotate the class
-        annotateClass(cw, name, namespace, propOrder);
-
-        // Decalre the default constructor
-        declareConstructor(cw, classSignature);
-        if (properties != null) {
-            for (BeanProperty p : properties) {
-                boolean isElement = p.isElement() && (!Map.class.isAssignableFrom(p.getType()));
-                String xmlAdapterClassSignature = null;
-                if (xmlAdapters != null) {
-                    Class<?> adapterClass = xmlAdapters.getAdapter(p.getType());
-                    if (adapterClass != null) {
-                        xmlAdapterClassSignature = CodeGenerationHelper.getSignature(adapterClass);
-                    }
-                }
-                declareProperty(cw, classDescriptor, classSignature, p.getName(), p.getSignature(), p
-                    .getGenericSignature(), isElement, p.isNillable(), xmlAdapterClassSignature, p.getJaxbAnnotaions());
-            }
-        }
-
-        // Close the generation
-        cw.visitEnd();
-        return cw.toByteArray();
-    }
-
-    protected static boolean isHolder(java.lang.reflect.Type type) {
-        if (type instanceof ParameterizedType) {
-            Class<?> cls = CodeGenerationHelper.getErasure(type);
-            return cls == Holder.class;
-        }
-        return false;
-    }
-
-    protected static java.lang.reflect.Type getHolderValueType(java.lang.reflect.Type paramType) {
-        if (paramType instanceof ParameterizedType) {
-            ParameterizedType p = (ParameterizedType)paramType;
-            Class<?> cls = CodeGenerationHelper.getErasure(p);
-            if (cls == Holder.class) {
-                return p.getActualTypeArguments()[0];
-            }
-        }
-        return paramType;
-    }
-
-    protected void declareProperty(ClassWriter cw,
-                                   String classDescriptor,
-                                   String classSignature,
-                                   String propName,
-                                   String propClassSignature,
-                                   String propTypeSignature,
-                                   boolean isElement,
-                                   boolean isNillable,
-                                   String xmlAdapterClassSignature,
-                                   List<Annotation> jaxbAnnotations) {
-        if (propClassSignature.equals(propTypeSignature)) {
-            propTypeSignature = null;
-        }
-        declareField(cw,
-                     propName,
-                     propClassSignature,
-                     propTypeSignature,
-                     isElement,
-                     isNillable,
-                     xmlAdapterClassSignature,
-                     jaxbAnnotations);
-        decalreGetter(cw, classDescriptor, classSignature, propName, propClassSignature, propTypeSignature);
-        declareSetter(cw, classDescriptor, classSignature, propName, propClassSignature, propTypeSignature);
-    }
-
-    protected String getFieldName(String propName) {
-        String name = JAVA_KEYWORDS.get(propName);
-        return name != null ? name : propName;
-    }
-
-    protected void declareField(ClassWriter cw,
-                                String propName,
-                                String propClassSignature,
-                                String propTypeSignature,
-                                boolean isElement,
-                                boolean isNillable,
-                                String xmlAdapterClassSignature,
-                                List<Annotation> jaxbAnnotations) {
-        FieldVisitor fv;
-        AnnotationVisitor av0;
-        fv = cw.visitField(ACC_PROTECTED, getFieldName(propName), propClassSignature, propTypeSignature, null);
-
-        // For Map property, we cannot have the XmlElement annotation
-        if (isElement) {
-            av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlElement;", true);
-            av0.visit("name", propName);
-            av0.visit("namespace", "");
-            if (isNillable) {
-                av0.visit("nillable", Boolean.TRUE);
-            }
-            // FIXME:
-            // av0.visit("required", Boolean.FALSE);
-            av0.visitEnd();
-        }
-
-        if (xmlAdapterClassSignature != null) {
-            av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;", true);
-            av0.visit("value", org.objectweb.asm.Type.getType(xmlAdapterClassSignature));
-            av0.visitEnd();
-        }
-
-        for (Annotation ann : jaxbAnnotations) {
-            if (ann instanceof XmlMimeType) {
-                AnnotationVisitor mime = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlMimeType;", true);
-                mime.visit("value", ((XmlMimeType)ann).value());
-                mime.visitEnd();
-            } else if (ann instanceof XmlJavaTypeAdapter) {
-                AnnotationVisitor ada = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlJavaTypeAdapter;", true);
-                ada.visit("value", ((XmlJavaTypeAdapter)ann).value());
-                ada.visit("type", ((XmlJavaTypeAdapter)ann).type());
-                ada.visitEnd();
-            } else if (ann instanceof XmlAttachmentRef) {
-                AnnotationVisitor att = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlAttachmentRef;", true);
-                att.visitEnd();
-            } else if (ann instanceof XmlList) {
-                AnnotationVisitor list = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlList;", true);
-                list.visitEnd();
-            }
-        }
-
-        fv.visitEnd();
-    }
-
-    protected void declareSetter(ClassWriter cw,
-                                 String classDescriptor,
-                                 String classSignature,
-                                 String propName,
-                                 String propClassSignature,
-                                 String propTypeSignature) {
-        if ("Ljava/util/List;".equals(propClassSignature)) {
-            return;
-        }
-        MethodVisitor mv =
-            cw.visitMethod(ACC_PUBLIC,
-                           "set" + capitalize(propName),
-                           "(" + propClassSignature + ")V",
-                           propTypeSignature == null ? null : "(" + propTypeSignature + ")V",
-                           null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        // mv.visitLineNumber(57, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitVarInsn(CodeGenerationHelper.getLoadOPCode(propClassSignature), 1);
-        mv.visitFieldInsn(PUTFIELD, classDescriptor, getFieldName(propName), propClassSignature);
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        // mv.visitLineNumber(58, l1);
-        mv.visitInsn(RETURN);
-        Label l2 = new Label();
-        mv.visitLabel(l2);
-        mv.visitLocalVariable("this", classSignature, null, l0, l2, 0);
-        mv.visitLocalVariable(getFieldName(propName), propClassSignature, propTypeSignature, l0, l2, 1);
-        mv.visitMaxs(3, 3);
-        mv.visitEnd();
-
-    }
-
-    protected void decalreGetter(ClassWriter cw,
-                                 String classDescriptor,
-                                 String classSignature,
-                                 String propName,
-                                 String propClassSignature,
-                                 String propTypeSignature) {
-        String collectionImplClass = COLLECTION_CLASSES.get(propClassSignature);
-        if (collectionImplClass != null) {
-            decalreCollectionGetter(cw,
-                                    classDescriptor,
-                                    classSignature,
-                                    propName,
-                                    propClassSignature,
-                                    propTypeSignature,
-                                    collectionImplClass);
-            return;
-        }
-
-        String getterName = ("Z".equals(propClassSignature) ? "is" : "get") + capitalize(propName);
-        MethodVisitor mv =
-            cw.visitMethod(ACC_PUBLIC, getterName, "()" + propClassSignature, propTypeSignature == null ? null
-                : "()" + propTypeSignature, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        // mv.visitLineNumber(48, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, classDescriptor, getFieldName(propName), propClassSignature);
-        mv.visitInsn(CodeGenerationHelper.getReturnOPCode(propClassSignature));
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        mv.visitLocalVariable("this", classSignature, null, l0, l1, 0);
-        mv.visitMaxs(2, 1);
-        mv.visitEnd();
-    }
-
-    protected void decalreCollectionGetter(ClassWriter cw,
-                                           String classDescriptor,
-                                           String classSignature,
-                                           String propName,
-                                           String propClassSignature,
-                                           String propTypeSignature,
-                                           String collectionImplClass) {
-        String getterName = "get" + capitalize(propName);
-        String fieldName = getFieldName(propName);
-        MethodVisitor mv =
-            cw.visitMethod(ACC_PUBLIC, getterName, "()" + propClassSignature, propTypeSignature == null ? null
-                : "()" + propTypeSignature, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        mv.visitLineNumber(63, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, classDescriptor, fieldName, propClassSignature);
-        Label l1 = new Label();
-        mv.visitJumpInsn(IFNONNULL, l1);
-        Label l2 = new Label();
-        mv.visitLabel(l2);
-        mv.visitLineNumber(64, l2);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitTypeInsn(NEW, collectionImplClass);
-        mv.visitInsn(DUP);
-        mv.visitMethodInsn(INVOKESPECIAL, collectionImplClass, "<init>", "()V");
-        mv.visitFieldInsn(PUTFIELD, classDescriptor, fieldName, propClassSignature);
-        mv.visitLabel(l1);
-        mv.visitLineNumber(66, l1);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, classDescriptor, fieldName, propClassSignature);
-        mv.visitInsn(ARETURN);
-        Label l3 = new Label();
-        mv.visitLabel(l3);
-        mv.visitLocalVariable("this", classSignature, null, l0, l3, 0);
-        mv.visitMaxs(3, 1);
-        mv.visitEnd();
-    }
-
-    protected static String capitalize(String name) {
-        if (name == null || name.length() == 0) {
-            return name;
-        } else {
-            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-    }
-
-    protected void declareConstructor(ClassWriter cw, String classSignature) {
-        MethodVisitor mv;
-        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        // mv.visitLineNumber(37, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
-        mv.visitInsn(RETURN);
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        mv.visitLocalVariable("this", classSignature, null, l0, l1, 0);
-        mv.visitMaxs(1, 1);
-        mv.visitEnd();
-    }
-
-    protected void declareClass(ClassWriter cw, String classDescriptor) {
-        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, classDescriptor, null, "java/lang/Object", null);
-    }
-
-    protected void annotateClass(ClassWriter cw, String name, String namespace, String[] propOrder) {
-        AnnotationVisitor av0;
-        // @XmlRootElement
-        av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlRootElement;", true);
-        av0.visit("name", name);
-        av0.visit("namespace", namespace);
-        av0.visitEnd();
-        // @XmlAccessorType
-        av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlAccessorType;", true);
-        av0.visitEnum("value", "Ljavax/xml/bind/annotation/XmlAccessType;", "FIELD");
-        av0.visitEnd();
-        // @XmlType
-        av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlType;", true);
-        av0.visit("name", name);
-        av0.visit("namespace", namespace);
-        if (propOrder != null) {
-            AnnotationVisitor pv = av0.visitArray("propOrder");
-            for (String p : propOrder) {
-                pv.visit(null, p);
-            }
-            pv.visitEnd();
-        }
-        av0.visitEnd();
-    }
-
-    public Class<?> generate(String classDescriptor,
-                             String classSignature,
-                             String namespace,
-                             String name,
-                             BeanProperty[] properties,
-                             GeneratedClassLoader classLoader) {
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        byte[] byteCode = defineClass(cw, classDescriptor, classSignature, namespace, name, properties);
-        String className = classDescriptor.replace('/', '.');
-        Class<?> generated = classLoader.getGeneratedClass(className, byteCode);
-        return generated;
-    }
-
-    public static class BeanProperty {
-        private Class<?> type;
-        private String namespace;
-        private String name;
-        private String signature;
-        private String genericSignature;
-        private List<Annotation> jaxbAnnotaions = new ArrayList<Annotation>();
-        private boolean element;
-        private boolean nillable;
-
-        public BeanProperty(String namespace, String name, Class<?> javaClass, Type type, boolean isElement) {
-            super();
-            this.namespace = namespace;
-            this.name = name;
-            this.signature = CodeGenerationHelper.getJAXWSSignature(javaClass);
-            this.type = javaClass;
-            this.genericSignature = CodeGenerationHelper.getJAXWSSignature(type);
-            this.element = isElement; 
-            // FIXME: How to test nillable?
-            // this.nillable = (type instanceof GenericArrayType) || Collection.class.isAssignableFrom(javaClass) || javaClass.isArray();
-            // TUSCANY-2389: Set the nillable consistent with what wsgen produces
-            this.nillable = javaClass.isArray();
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getSignature() {
-            return signature;
-        }
-
-        public String getGenericSignature() {
-            return genericSignature;
-        }
-
-        public Class<?> getType() {
-            return type;
-        }
-
-        public List<Annotation> getJaxbAnnotaions() {
-            return jaxbAnnotaions;
-        }
-
-        public String getNamespace() {
-            return namespace;
-        }
-
-        public boolean isElement() {
-            return element;
-        }
-
-        public boolean isNillable() {
-            return nillable;
-        }
-    }
-
-    public XMLAdapterExtensionPoint getXmlAdapters() {
-        return xmlAdapters;
-    }
-
-    public void setXmlAdapters(XMLAdapterExtensionPoint xmlAdapters) {
-        this.xmlAdapters = xmlAdapters;
-    }
-
-    protected static <T extends Annotation> T findAnnotation(Annotation[] anns, Class<T> annotationClass) {
-        for (Annotation a : anns) {
-            if (a.annotationType() == annotationClass) {
-                return annotationClass.cast(a);
-            }
-        }
-        return null;
-    }
-
-    protected static List<Annotation> findJAXBAnnotations(Annotation[] anns) {
-        List<Annotation> jaxbAnnotation = new ArrayList<Annotation>();
-        for (Class<? extends Annotation> c : KNOWN_JAXB_ANNOTATIONS) {
-            Annotation a = findAnnotation(anns, c);
-            if (a != null) {
-                jaxbAnnotation.add(a);
-            }
-        }
-        return jaxbAnnotation;
-    }
-
-    protected List<Annotation> findJAXBAnnotations(Method method) {
-        List<Annotation> anns = new ArrayList<Annotation>();
-        for (Class<? extends Annotation> c : KNOWN_JAXB_ANNOTATIONS) {
-            Annotation ann = method.getAnnotation(c);
-            if (ann != null) {
-                anns.add(ann);
-            }
-        }
-        return anns;
-    }
-
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
deleted file mode 100644
index b05715b54e..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.objectweb.asm.Opcodes;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CodeGenerationHelper {
-    /**
-     * @param type
-     * @return
-     */
-    public static Class<?> getErasure(Type type) {
-        if (type instanceof Class) {
-            return (Class<?>)type;
-        } else if (type instanceof GenericArrayType) {
-            GenericArrayType arrayType = (GenericArrayType)type;
-            Class<?> componentType = getErasure(arrayType.getGenericComponentType());
-            return Array.newInstance(componentType, 0).getClass();
-        } else if (type instanceof ParameterizedType) {
-            ParameterizedType pType = (ParameterizedType)type;
-            return getErasure(pType.getRawType());
-        } else if (type instanceof WildcardType) {
-            WildcardType wType = (WildcardType)type;
-            Type[] types = wType.getUpperBounds();
-            if (types.length == 0) {
-                return Object.class;
-            }
-            return getErasure(types[0]);
-        } else if (type instanceof TypeVariable) {
-            TypeVariable<?> var = (TypeVariable<?>)type;
-            Type[] types = var.getBounds();
-            if (types.length == 0) {
-                return Object.class;
-            }
-            return getErasure(types[0]);
-        }
-        return null;
-    }
-
-    /**
-     * @param type
-     * @return
-     */
-    public static String getJAXWSSignature(Type type) {
-        Class<?> cls = getErasure(type);
-        if (Collection.class.isAssignableFrom(cls) && (type instanceof ParameterizedType)) {
-            ParameterizedType pType = (ParameterizedType)type;
-            Type p = pType.getActualTypeArguments()[0];
-            StringBuffer sb = new StringBuffer();
-            sb.append(getSignature(cls));
-            sb.deleteCharAt(sb.length() - 1); // Remove ;
-            sb.append('<').append(getSignature(getErasure(p))).append(">;");
-            return sb.toString();
-        } else if (Map.class.isAssignableFrom(cls) && (type instanceof ParameterizedType)) {
-            ParameterizedType pType = (ParameterizedType)type;
-            Type key = pType.getActualTypeArguments()[0];
-            Type value = pType.getActualTypeArguments()[1];
-            StringBuffer sb = new StringBuffer();
-            sb.append(getSignature(cls));
-            sb.deleteCharAt(sb.length() - 1); // Remove ;
-            sb.append('<').append(getSignature(getErasure(key))).append(getSignature(getErasure(value))).append(">;");
-            return sb.toString();
-        } else {
-            return getSignature(cls);
-        }
-    }
-
-    /**
-     * @param type
-     * @return
-     */
-    public static String getSignature(Type type) {
-        if (!(type instanceof Class)) {
-            if (type instanceof ParameterizedType) {
-                ParameterizedType pType = (ParameterizedType)type;
-                StringBuffer sb = new StringBuffer();
-                String rawType = getSignature(pType.getRawType());
-                sb.append(rawType.substring(0, rawType.length() - 1));
-                sb.append('<');
-                for (Type t : pType.getActualTypeArguments()) {
-                    String argType = getSignature(t);
-                    sb.append(argType);
-                }
-                sb.append('>');
-                sb.append(rawType.substring(rawType.length() - 1));
-                return sb.toString();
-            }
-            if (type instanceof TypeVariable) {
-                return "T" + ((TypeVariable<?>)type).getName() + ";";
-            }
-            if (type instanceof GenericArrayType) {
-                GenericArrayType arrayType = (GenericArrayType)type;
-                return "[" + getSignature(arrayType.getGenericComponentType());
-            }
-            if (type instanceof WildcardType) {
-                WildcardType wType = (WildcardType)type;
-                Type[] types = wType.getUpperBounds();
-                StringBuffer sb = new StringBuffer();
-                if (types.length == 0 || !(types.length == 1 && types[0] == Object.class)) {
-                    sb.append('+');
-                    for (Type t : types) {
-                        sb.append(getSignature(t));
-                    }
-                }
-                types = wType.getLowerBounds();
-                if (types.length != 0) {
-                    sb.append('-');
-                    for (Type t : wType.getLowerBounds()) {
-                        sb.append(getSignature(t));
-                    }
-                }
-                if (sb.length() == 0) {
-                    return "*";
-                }
-                return sb.toString();
-            }
-        }
-        Class<?> cls = (Class<?>)type;
-        return org.objectweb.asm.Type.getDescriptor(cls);
-    }
-
-    /**
-     * Get the actual type arguments a child class has used to extend a generic base class.
-     *
-     * @param baseClass the base class
-     * @param childClass the child class
-     * @return a list of the raw classes for the actual type arguments.
-     */
-    public static <T> List<Class<?>> resovleTypeArguments(Class<T> baseClass, Class<? extends T> childClass) {
-        Map<Type, Type> resolvedTypes = new HashMap<Type, Type>();
-        Type type = childClass;
-        // start walking up the inheritance hierarchy until we hit baseClass
-        while (!getErasure(type).equals(baseClass)) {
-            if (type instanceof Class) {
-                // there is no useful information for us in raw types, so just keep going.
-                type = ((Class<?>)type).getGenericSuperclass();
-            } else {
-                ParameterizedType parameterizedType = (ParameterizedType)type;
-                Class<?> rawType = getErasure(parameterizedType.getRawType());
-
-                Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
-                TypeVariable<?>[] typeParameters = rawType.getTypeParameters();
-                for (int i = 0; i < actualTypeArguments.length; i++) {
-                    resolvedTypes.put(typeParameters[i], actualTypeArguments[i]);
-                }
-
-                if (!rawType.equals(baseClass)) {
-                    type = rawType.getGenericSuperclass();
-                }
-            }
-        }
-
-        // finally, for each actual type argument provided to baseClass, determine (if possible)
-        // the raw class for that type argument.
-        Type[] actualTypeArguments;
-        if (type instanceof Class) {
-            actualTypeArguments = ((Class<?>)type).getTypeParameters();
-        } else {
-            actualTypeArguments = ((ParameterizedType)type).getActualTypeArguments();
-        }
-        List<Class<?>> typeArgumentsAsClasses = new ArrayList<Class<?>>();
-        // resolve types by chasing down type variables.
-        for (Type baseType : actualTypeArguments) {
-            while (resolvedTypes.containsKey(baseType)) {
-                baseType = resolvedTypes.get(baseType);
-            }
-            typeArgumentsAsClasses.add(getErasure(baseType));
-        }
-        return typeArgumentsAsClasses;
-    }
-
-    /*
-    signatures.put(boolean.class, "Z");
-    signatures.put(byte.class, "B");
-    signatures.put(char.class, "C");
-    signatures.put(short.class, "S");
-    signatures.put(int.class, "I");
-    signatures.put(long.class, "J");
-    signatures.put(float.class, "F");
-    signatures.put(double.class, "D");
-    */
-    public static int getLoadOPCode(String signature) {
-        if ("Z".equals(signature) || "B".equals(signature)
-            || "C".equals(signature)
-            || "S".equals(signature)
-            || "I".equals(signature)) {
-            return Opcodes.ILOAD;
-        }
-
-        if ("J".equals(signature)) {
-            return Opcodes.LLOAD;
-        }
-
-        if ("F".equals(signature)) {
-            return Opcodes.FLOAD;
-        }
-
-        if ("D".equals(signature)) {
-            return Opcodes.DLOAD;
-        }
-
-        return Opcodes.ALOAD;
-
-    }
-
-    public static int getReturnOPCode(String signature) {
-        if ("Z".equals(signature) || "B".equals(signature)
-            || "C".equals(signature)
-            || "S".equals(signature)
-            || "I".equals(signature)) {
-            return Opcodes.IRETURN;
-        }
-
-        if ("J".equals(signature)) {
-            return Opcodes.LRETURN;
-        }
-
-        if ("F".equals(signature)) {
-            return Opcodes.FRETURN;
-        }
-
-        if ("D".equals(signature)) {
-            return Opcodes.DRETURN;
-        }
-        if ("V".equals(signature)) {
-            return Opcodes.RETURN;
-        }
-
-        return Opcodes.ARETURN;
-
-    }
-    
-    /**
-     * Get the package prefix for generated JAXWS artifacts
-     * @param cls
-     * @return
-     */
-    public static String getPackagePrefix(Class<?> cls) {
-        String name = cls.getName();
-        int index = name.lastIndexOf('.');
-        if (index == -1) {
-            return "jaxws.";
-        } else {
-            return name.substring(0, index) + ".jaxws.";
-        }
-    }
-
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
deleted file mode 100644
index 40fbefa3ed..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebFault;
-
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.objectweb.asm.ClassWriter;
-
-public class FaultBeanGenerator extends BaseBeanGenerator {
-    public FaultBeanGenerator() {
-        super();
-    }
-
-    protected BeanProperty[] getProperties(Class<? extends Throwable> exceptionClass) {
-        BeanInfo beanInfo;
-        try {
-            beanInfo = Introspector.getBeanInfo(exceptionClass);
-        } catch (IntrospectionException e) {
-            throw new IllegalArgumentException(e);
-        }
-        List<BeanProperty> props = new ArrayList<BeanProperty>();
-        for (PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {
-            if (pd.getReadMethod() != null) {
-                String name = pd.getReadMethod().getName();
-                if ("getClass".equals(name) || "getStackTrace".equals(name)
-                    || "getCause".equals(name)
-                    || "getLocalizedMessage".equals(name)) {
-                    continue;
-                }
-                // Add the field
-                String field = pd.getName();
-                Method getter = pd.getReadMethod();
-                props.add(new BeanProperty("", field, getter.getReturnType(), getter.getGenericReturnType(), false));
-            }
-        }
-        Collections.sort(props, new Comparator<BeanProperty>() {
-            public int compare(BeanProperty o1, BeanProperty o2) {
-                return o1.getName().compareTo(o2.getName());
-            }
-        });
-        return props.toArray(new BeanProperty[0]);
-    }
-
-    public byte[] generate(Class<? extends Throwable> exceptionClass) {
-        String className = getFaultBeanName(exceptionClass);
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        String classDescriptor = className.replace('.', '/');
-        String classSignature = "L" + classDescriptor + ";";
-        QName element = getElementName(exceptionClass);
-        String namespace = element.getNamespaceURI();
-        String name = element.getLocalPart();
-        return defineClass(cw, classDescriptor, classSignature, namespace, name, getProperties(exceptionClass));
-    }
-
-    public Class<?> generate(Class<? extends Throwable> exceptionClass, GeneratedClassLoader cl) {
-        synchronized (exceptionClass) {
-            Class<?> faultBeanClass = generatedClasses.get(exceptionClass);
-            if (faultBeanClass == null) {
-                String className = getFaultBeanName(exceptionClass);
-                String classDescriptor = className.replace('.', '/');
-                String classSignature = "L" + classDescriptor + ";";
-                QName element = getElementName(exceptionClass);
-                String namespace = element.getNamespaceURI();
-                String name = element.getLocalPart();
-                faultBeanClass =
-                    generate(classDescriptor, classSignature, namespace, name, getProperties(exceptionClass), cl);
-                generatedClasses.put(exceptionClass, faultBeanClass);
-            }
-            return faultBeanClass;
-        }
-    }
-
-    private static String getFaultBeanName(Class<?> exceptionClass) {
-        String faultBeanName = null;
-        WebFault webFault = exceptionClass.getAnnotation(WebFault.class);
-        if (webFault != null) {
-            faultBeanName = webFault.faultBean();
-            if (!"".equals(faultBeanName)) {
-                return faultBeanName;
-            }
-        }
-
-        String name = exceptionClass.getName();
-        int index = name.lastIndexOf('.');
-        String pkg = name.substring(0, index);
-        String clsName = name.substring(index + 1);
-
-        // FIXME: [rfeng] This is a workaround to avoid "Prohibited package name: java.lang.jaxws"
-        if (pkg.startsWith("java.") || pkg.startsWith("javax.")) {
-            pkg = "tuscany";
-        }
-        faultBeanName = (pkg + ".jaxws." + clsName + "Bean");
-        return faultBeanName;
-    }
-
-    public static QName getElementName(Class<? extends Throwable> exceptionClass) {
-        WebFault webFault = exceptionClass.getAnnotation(WebFault.class);
-        String namespace = null;
-        String name = null;
-        if (webFault != null) {
-            namespace = webFault.targetNamespace();
-            name = webFault.name();
-        }
-        if (namespace == null) {
-            namespace = JavaInterfaceUtil.getNamespace(exceptionClass);
-        }
-        if (name == null) {
-            name = exceptionClass.getSimpleName();
-        }
-        return new QName(namespace, name);
-    }
-
-    public static Class<?> generateFaultBeanClass(Class<? extends Throwable> exceptionClass) {
-        FaultBeanGenerator generator = new FaultBeanGenerator();
-        GeneratedClassLoader cl = new GeneratedClassLoader(exceptionClass.getClassLoader());
-        return generator.generate(exceptionClass, cl);
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
deleted file mode 100644
index f36dd3a443..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.security.SecureClassLoader;
-import java.util.HashMap;
-import java.util.Map;
-
-public class GeneratedClassLoader extends SecureClassLoader {
-    private class GeneratedClass {
-        private String className;
-        private byte[] byteCode;
-        private Class<?> cls;
-
-        public GeneratedClass(String className, byte[] byteCode) {
-            super();
-            this.className = className;
-            this.byteCode = byteCode;
-        }
-
-        public synchronized Class<?> getGeneratedClass() {
-            if (cls == null) {
-                cls = defineClass(className, byteCode, 0, byteCode.length);
-            }
-            return cls;
-        }
-    }
-
-    private Map<String, GeneratedClass> generatedClasses = new HashMap<String, GeneratedClass>();
-
-    public GeneratedClassLoader(ClassLoader parentLoader) {
-        super(parentLoader);
-    }
-
-    @Override
-    protected Class<?> findClass(String className) throws ClassNotFoundException {
-        GeneratedClass cls = generatedClasses.get(className);
-        if (cls != null) {
-            return cls.getGeneratedClass();
-        }
-        return super.findClass(className);
-    }
-
-    public synchronized Class<?> getGeneratedClass(String className, byte[] byteCode) {
-        GeneratedClass cls = generatedClasses.get(className);
-        if (cls == null) {
-            cls = new GeneratedClass(className, byteCode);
-            generatedClasses.put(className, cls);
-        }
-        return cls.getGeneratedClass();
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
deleted file mode 100644
index c3f568ef48..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * A special data type that generate the class on demand
- * @version $Rev$ $Date$
- */
-public class GeneratedDataTypeImpl implements DataType<XMLType> {
-    private XMLAdapterExtensionPoint xmlAdapters;
-    
-    private Class<?> physical;
-    private XMLType logical;
-
-    private Map<Class<?>, Object> metaDataMap;
-    private Method method;
-    private String wrapperClassName;
-    private String wrapperNamespace;
-    private String wrapperName;
-    private boolean request;
-    private GeneratedClassLoader classLoader;
-
-    private Class<? extends Throwable> exceptionClass;
-
-    public GeneratedDataTypeImpl(XMLAdapterExtensionPoint xmlAdapters, Class<? extends Throwable> exceptionClass, GeneratedClassLoader cl) {
-        super();
-        this.exceptionClass = exceptionClass;
-        this.classLoader = cl;
-        QName name = FaultBeanGenerator.getElementName(exceptionClass);
-        this.logical = new XMLType(name, name);
-        this.xmlAdapters = xmlAdapters;
-    }
-
-    public GeneratedDataTypeImpl(XMLAdapterExtensionPoint xmlAdapters,
-                                 Method m,
-                                 String wrapperClassName,
-                                 String wrapperNamespace,
-                                 String wrapperName,
-                                 boolean request,
-                                 GeneratedClassLoader cl) {
-        super();
-        this.method = m;
-        this.wrapperClassName = wrapperClassName;
-        this.wrapperNamespace = wrapperNamespace;
-        this.wrapperName = wrapperName;
-        this.classLoader = cl;
-        this.request = request;
-        QName name = new QName(wrapperNamespace, wrapperName);
-        this.logical = new XMLType(name, name);
-        this.xmlAdapters = xmlAdapters;
-    }
-
-    public String getDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-
-    public Type getGenericType() {
-        return getPhysical();
-    }
-
-    public XMLType getLogical() {
-        return logical;
-    }
-
-    public synchronized Class<?> getPhysical() {
-        if (physical == null) {
-            if (method != null) {
-                WrapperBeanGenerator generator = new WrapperBeanGenerator();
-                generator.setXmlAdapters(xmlAdapters);
-                physical =
-                    request ? generator.generateRequestWrapper(method, wrapperClassName, wrapperNamespace, wrapperName, classLoader)
-                        : generator.generateResponseWrapper(method, wrapperClassName, wrapperNamespace, wrapperName, classLoader);
-                ;
-            } else if (exceptionClass != null) {
-                FaultBeanGenerator faultBeanGenerator = new FaultBeanGenerator();
-                faultBeanGenerator.setXmlAdapters(xmlAdapters);
-                physical = faultBeanGenerator.generate(exceptionClass, classLoader);
-            }
-        }
-        return physical;
-    }
-
-    public void setDataBinding(String dataBinding) {
-        // NOP
-    }
-
-    public void setGenericType(Type genericType) {
-        // NOP
-    }
-
-    public void setLogical(XMLType logical) {
-        this.logical = logical;
-    }
-
-    public void setPhysical(Class<?> cls) {
-        // NOP
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public <T> T getMetaData(Class<T> type) {
-        return metaDataMap == null ? null : type.cast(metaDataMap.get(type));
-    }
-
-    public <T> void setMetaData(Class<T> type, T metaData) {
-        if (metaDataMap == null) {
-            metaDataMap = new ConcurrentHashMap<Class<?>, Object>();
-        }
-        metaDataMap.put(type, metaData);
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
deleted file mode 100644
index 75a0aa8131..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebFault;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * JAX-WS ExceptionHandler
- * 
- * @version $Rev$ $Date$
- */
-public class JAXWSFaultExceptionMapper implements FaultExceptionMapper {
-    public static final String GETCAUSE = "getCause";
-    public static final String GETLOCALIZEDMESSAGE = "getLocalizedMessage";
-    public static final String GETSTACKTRACE = "getStackTrace";
-    public static final String GETCLASS = "getClass";
-
-    private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class[0];
-    private DataBindingExtensionPoint dataBindingExtensionPoint;
-    private XMLAdapterExtensionPoint xmlAdapterExtensionPoint;
-
-
-    public JAXWSFaultExceptionMapper(DataBindingExtensionPoint dataBindingExtensionPoint, XMLAdapterExtensionPoint xmlAdapters) {
-        super();
-        this.dataBindingExtensionPoint = dataBindingExtensionPoint;
-        this.xmlAdapterExtensionPoint = xmlAdapters;
-    }
-
-    /**
-     * The following is quoted from the JAX-WS Specification v2.1
-     * <ul>
-     * <li>WrapperException(String message, FaultBean faultInfo) <br>
-     * A constructor where WrapperException is replaced with the name of the
-     * generated wrapper exception and FaultBean is replaced by the name of the
-     * generated fault bean.
-     * <li> WrapperException(String message, FaultBean faultInfo, Throwable
-     * cause) <br>
-     * A constructor where WrapperException is replaced with the name of the
-     * generated wrapper exception and FaultBean is replaced by the name of the
-     * generated fault bean. The last argument, cause, may be used to convey
-     * protocol specific fault information
-     * </ul>
-     */
-    @SuppressWarnings("unchecked")
-    public Throwable wrapFaultInfo(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause, Operation operation) {
-        Class<?> exceptionClass = exceptionType.getPhysical();
-        if (exceptionClass.isInstance(faultInfo)) {
-            return (Throwable)faultInfo;
-        }
-        DataType<?> faultBeanType = exceptionType.getLogical();
-        Class<?> faultBeanClass = faultBeanType.getPhysical();
-        try {
-            Throwable exc =
-                newInstance((Class<? extends Throwable>)exceptionClass, message, faultBeanClass, faultInfo, cause);
-            // Include the elem name into the FaultException we build so it can be used for matching in the DataTransformationInterceptor
-            // 
-            // Note this may happen even if we find a constructor above, that is the type of the non-generic fault exc may be an instance
-            // of FaultException
-            //
-            if ((exc instanceof FaultException) && (faultBeanType.getLogical() instanceof XMLType)) {
-                FaultException faultExc = (FaultException)exc;
-                DataType<XMLType> faultBeanXMLType = (DataType<XMLType>)faultBeanType;
-                XMLType faultLogical = faultBeanXMLType.getLogical();
-                faultExc.setFaultName(faultLogical.getElementName());
-            }
-            return exc;
-        } catch (Throwable e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private Throwable newInstance(Class<? extends Throwable> exceptionClass,
-                                  String message,
-                                  Class<?> faultBeanClass,
-                                  Object faultInfo,
-                                  Throwable cause) throws Exception {
-        Throwable ex = null;
-        Constructor<? extends Throwable> ctor = null;
-        try {
-            // Get the message property
-            Method getMessage = faultBeanClass.getMethod("getMessage");
-            message = (String)getMessage.invoke(faultInfo);
-        } catch (Throwable e) {
-            // Ignore
-        }
-        try {
-            // FIXME: What about if the faultBeanClass is a subclass of the argument type?
-            ctor = exceptionClass.getConstructor(String.class, faultBeanClass, Throwable.class);
-            ex = ctor.newInstance(message, faultInfo, cause);
-        } catch (NoSuchMethodException e1) {
-            try {
-                ctor = exceptionClass.getConstructor(String.class, faultInfo.getClass());
-                ex = ctor.newInstance(message, faultInfo);
-            } catch (NoSuchMethodException e2) {
-                try {
-                    ctor = exceptionClass.getConstructor(String.class, Throwable.class);
-                    ex = ctor.newInstance(message, cause);
-                    populateException(ex, faultInfo);
-                } catch (NoSuchMethodException e3) {
-                    try {
-                        ctor = exceptionClass.getConstructor(String.class);
-                        ex = ctor.newInstance(message);
-                        populateException(ex, faultInfo);
-                    } catch (NoSuchMethodException e4) {
-                        ctor = exceptionClass.getConstructor();
-                        if (ctor != null) {
-                            ex = ctor.newInstance();
-                            populateException(ex, faultInfo);
-                        } else {
-                            ex = new FaultException(message, faultInfo, cause);
-                        }
-                    }
-                }
-            }
-        }
-        return ex;
-    }
-
-    /**
-     * Populate the java exception from the fault bean
-     * @param ex
-     * @param faultBean
-     * @throws Exception
-     */
-    private void populateException(Throwable ex, Object faultBean) throws Exception {
-        PropertyDescriptor props[] = Introspector.getBeanInfo(faultBean.getClass()).getPropertyDescriptors();
-        for (PropertyDescriptor p : props) {
-            Method getter = p.getReadMethod();
-            Method setter = p.getWriteMethod();
-            if (getter == null || setter == null) {
-                continue;
-            }
-            try {
-                Method m = ex.getClass().getMethod(setter.getName(), setter.getParameterTypes());
-                Object pv = getter.invoke(faultBean);
-                m.invoke(ex, pv);
-            } catch (Exception e) {
-                // Ignore;
-            }
-        }
-    }
-
-    public Object getFaultInfo(Throwable exception, Class<?> faultBeanClass, Operation operation) {
-        if (exception == null) {
-            return null;
-        }
-
-        // Check if it's the generic FaultException
-        if (exception instanceof FaultException) {
-            return ((FaultException)exception).getFaultInfo();
-        }
-
-        try {
-            Method method = exception.getClass().getMethod("getFaultInfo", EMPTY_CLASS_ARRAY);
-            return method.invoke(exception, (Object[])null);
-        } catch (NoSuchMethodException e) {
-            // Follow the JAX-WS v2.1 Specification section 3.7
-            return createFaultBean(exception, faultBeanClass);
-        } catch (Throwable e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private Object createFaultBean(Throwable exception, Class<?> faultBeanClass) {
-        /**
-         * For each getter in the exception and its superclasses, a property of the same 
-         * type and name is added to the bean. The getCause, getLocalizedMessage and 
-         * getStackTrace getters from java.lang.Throwable and the getClass getter from 
-         * java.lang.Object are excluded from the list of getters to be mapped.
-         */
-        // Return the exception as-is if it's already the fault bean
-        if (faultBeanClass.isInstance(exception)) {
-            return exception;
-        }
-        try {
-            Object faultBean = null;
-            for (Constructor<?> ctor : faultBeanClass.getConstructors()) {
-                Class<?>[] params = ctor.getParameterTypes();
-                if (params.length == 1 && String.class == params[0]) {
-                    faultBean = ctor.newInstance(exception.getMessage());
-                } else if (params.length == 2 && String.class == params[0]
-                    && Throwable.class.isAssignableFrom(params[1])) {
-                    faultBean = ctor.newInstance(exception.getMessage(), exception);
-                } else if (params.length == 0) {
-                    faultBean = ctor.newInstance();
-                }
-                if (faultBean != null) {
-                    break;
-                }
-            }
-            if (faultBean == null) {
-                return exception;
-            }
-            BeanInfo beanInfo = Introspector.getBeanInfo(exception.getClass());
-            for (PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {
-                Method getter = pd.getReadMethod();
-                String name = getter.getName();
-                if (!isMappedGetter(name)) {
-                    continue;
-                }
-                Method setter = null;
-                try {
-                    setter = faultBeanClass.getMethod("set" + capitalize(pd.getName()), getter.getReturnType());
-                } catch (NoSuchMethodException e) {
-                    continue;
-                }
-                Object prop = getter.invoke(exception);
-                setter.invoke(faultBean, prop);
-            }
-            return faultBean;
-        } catch (Throwable ex) {
-            throw new IllegalArgumentException(ex);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public boolean introspectFaultDataType(DataType<DataType> exceptionType, final Operation operation, final boolean generatingFaultBean) {
-        QName faultName = null;
-        boolean result = false;
-
-        final Class<?> cls = exceptionType.getPhysical();
-        if (cls == FaultException.class) {
-            return true;
-        }
-        DataType faultType = (DataType)exceptionType.getLogical();
-        Class<?> faultBean = null;
-        final WebFault fault = cls.getAnnotation(WebFault.class);
-        if (fault != null) {
-            if (!"".equals(fault.name()) || !"".equals(fault.targetNamespace())) {
-                QName faultQName = ((XMLType)faultType.getLogical()).getElementName();
-                String faultNS =
-                    "".equals(fault.targetNamespace()) ? faultQName.getNamespaceURI() : fault.targetNamespace();
-                String faultLocal = "".equals(fault.name()) ? faultQName.getLocalPart() : fault.name();
-                faultName = new QName(faultNS, faultLocal);
-                XMLType xmlType = new XMLType(faultName, null);
-                faultType.setLogical(xmlType);
-            }
-            if (!"".equals(fault.faultBean())) {
-                faultBean = AccessController.doPrivileged(new PrivilegedAction<Class<?>>() {
-                    public Class<?> run() {
-                        try {
-                            return Class.forName(fault.faultBean(), false, cls.getClassLoader());
-                        } catch (ClassNotFoundException e) {
-                            throw new ServiceRuntimeException(e);
-                        }
-                    }
-                });
-            } else {
-                Method m;
-                try {
-                    m = cls.getMethod("getFaultInfo", (Class[])null);
-                    faultBean = m.getReturnType();
-                } catch (NoSuchMethodException e) {
-                    // Ignore
-                }
-            }
-        }
-
-        if (faultBean == null) {
-            final String faultBeanClassName = CodeGenerationHelper.getPackagePrefix(cls) + cls.getSimpleName() + "Bean";
-            final QName qname = faultName;
-            faultType = AccessController.doPrivileged(new PrivilegedAction<DataType<XMLType>>() {
-                public DataType<XMLType> run() {
-                    try {
-                        Class<?> faultBean = Class.forName(faultBeanClassName, false, cls.getClassLoader());
-                        return new DataTypeImpl<XMLType>(faultBean, new XMLType(qname, qname));
-                    } catch (ClassNotFoundException e) {
-                        if (generatingFaultBean) {
-                            Class<? extends Throwable> t = (Class<? extends Throwable>)cls;
-                            ClassLoader parent =
-                                operation == null ? t.getClassLoader() : ((JavaInterface)operation.getInterface())
-                                    .getJavaClass().getClassLoader();
-                            GeneratedClassLoader cl = new GeneratedClassLoader(parent);
-                            GeneratedDataTypeImpl dt = new GeneratedDataTypeImpl(xmlAdapterExtensionPoint, t, cl);
-                            return dt;
-                        } else {
-                            return new DataTypeImpl<XMLType>(cls, new XMLType(qname, qname));
-                        }
-                    }
-                }
-            });
-        } else {
-            faultType.setDataBinding(null);
-            faultType.setGenericType(faultBean);
-            faultType.setPhysical(faultBean);
-        }
-
-        // TODO: Use the databinding framework to introspect the fault bean class
-        if (faultType.getDataBinding() == null && dataBindingExtensionPoint != null) {
-            faultBean = faultType.getPhysical();
-            result =
-                dataBindingExtensionPoint.introspectType(faultType, operation);
-        }
-        ((DataType) exceptionType).setLogical(faultType);
-
-        /*
-         The introspection of the fault DT may not have calculated the correct element name, 
-         though we may have already done this in this method.  Let's look at the DataType now 
-         that introspection is done, and, if it has an XMLType, let's set the element to the 
-         'faultName' if we calculated one.
-         */
-        if ((faultName != null) && (faultType.getLogical() instanceof XMLType)) {
-            XMLType faultTypeXML = (XMLType)faultType.getLogical();
-            // The element name (if set) should match the fault name
-            faultTypeXML.setElementName(faultName);
-        }
-
-        return result;
-    }
-
-    public static boolean isMappedGetter(String methodName) {
-        if (GETCAUSE.equals(methodName) || GETLOCALIZEDMESSAGE.equals(methodName)
-            || GETSTACKTRACE.equals(methodName)
-            || GETCLASS.equals(methodName)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    private static String capitalize(String name) {
-        if (name == null || name.length() == 0) {
-            return name;
-        } else {
-            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-    }
-
-    public void setDataBindingExtensionPoint(DataBindingExtensionPoint dataBindingExtensionPoint) {
-        this.dataBindingExtensionPoint = dataBindingExtensionPoint;
-    }
-
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
deleted file mode 100644
index d1b36fa17c..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.xml.namespace.QName;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Introspect the java class/interface with JSR-181 and JAXWS annotations
- * 
- * @version $Rev$ $Date$
- */
-public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
-    private static final String JAXB_DATABINDING = JAXBDataBinding.NAME;
-    private static final String GET = "get";
-    private DataBindingExtensionPoint dataBindingExtensionPoint;
-    private FaultExceptionMapper faultExceptionMapper;
-    private XMLAdapterExtensionPoint xmlAdapterExtensionPoint;
-
-
-    public JAXWSJavaInterfaceProcessor(DataBindingExtensionPoint dataBindingExtensionPoint,
-                                       FaultExceptionMapper faultExceptionMapper,
-                                       XMLAdapterExtensionPoint xmlAdapters) {
-        super();
-        this.dataBindingExtensionPoint = dataBindingExtensionPoint;
-        this.faultExceptionMapper = faultExceptionMapper;
-        this.xmlAdapterExtensionPoint = xmlAdapters;
-    }
-
-    public JAXWSJavaInterfaceProcessor() {
-        super();
-    }
-
-    private static String capitalize(String name) {
-        if (name == null || name.length() == 0) {
-            return name;
-        } else {
-            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-    }
-
-    public void visitInterface(JavaInterface contract) throws InvalidInterfaceException {
-
-        final Class<?> clazz = contract.getJavaClass();
-        WebService webService = clazz.getAnnotation(WebService.class);
-        String tns = JavaXMLMapper.getNamespace(clazz);
-        String localName = clazz.getSimpleName();
-        if (webService != null) {
-            tns = getValue(webService.targetNamespace(), tns);
-            localName = getValue(webService.name(), localName);
-            contract.setQName(new QName(tns, localName));
-            // Mark SEI as Remotable
-            contract.setRemotable(true);
-        }
-        if (!contract.isRemotable()) {
-            return;
-        }
-
-        // SOAP binding (doc/lit/wrapped|bare or rpc/lit)
-        SOAPBinding soapBinding = clazz.getAnnotation(SOAPBinding.class);
-
-        for (Iterator<Operation> it = contract.getOperations().iterator(); it.hasNext();) {
-            final JavaOperation operation = (JavaOperation)it.next();
-            final Method method = operation.getJavaMethod();
-            introspectFaultTypes(operation);
-
-            // SOAP binding (doc/lit/wrapped|bare or rpc/lit)
-            SOAPBinding methodSOAPBinding = method.getAnnotation(SOAPBinding.class);
-            if (methodSOAPBinding == null) {
-                methodSOAPBinding = soapBinding;
-            }
-
-            boolean documentStyle = true;
-            boolean bare = false;
-            if (methodSOAPBinding != null) {
-                bare = methodSOAPBinding.parameterStyle() == SOAPBinding.ParameterStyle.BARE;
-                if(bare) {
-                    // For BARE parameter style, the data won't be unwrapped
-                    // The wrapper should be null
-                    operation.setWrapperStyle(false);
-                }
-                documentStyle = methodSOAPBinding.style() == Style.DOCUMENT;
-            }
-
-            String operationName = operation.getName();
-            // WebMethod
-            WebMethod webMethod = method.getAnnotation(WebMethod.class);
-            if (webMethod != null) {
-                if (webMethod.exclude()) {
-                    // Exclude the method
-                    it.remove();
-                    continue;
-                }
-                operationName = getValue(webMethod.operationName(), operationName);
-                operation.setName(operationName);
-                operation.setAction(webMethod.action());
-            }
-
-            // Is one way?
-            Oneway oneway = method.getAnnotation(Oneway.class);
-            if (oneway != null) {
-                // JSR 181
-                assert method.getReturnType() == void.class;
-                operation.setNonBlocking(true);
-            }
-
-            // Handle BARE mapping
-            if (bare) {
-                for (int i = 0; i < method.getParameterTypes().length; i++) {
-                    WebParam param = getAnnotation(method, i, WebParam.class);
-                    if (param != null) {
-                        String ns = getValue(param.targetNamespace(), tns);
-                        // Default to <operationName> for doc-bare
-                        String name = getValue(param.name(), documentStyle ? operationName : "arg" + i);
-                        QName element = new QName(ns, name);
-                        Object logical = operation.getInputType().getLogical().get(i).getLogical();
-                        if (logical instanceof XMLType) {
-                            ((XMLType)logical).setElementName(element);
-                        }
-                    }
-                }
-                WebResult result = method.getAnnotation(WebResult.class);
-                if (result != null) {
-                    String ns = getValue(result.targetNamespace(), tns);
-                    // Default to <operationName>Response for doc-bare
-                    String name = getValue(result.name(), documentStyle ? operationName + "Response" : "return");
-                    QName element = new QName(ns, name);
-                    Object logical = operation.getOutputType().getLogical();
-                    if (logical instanceof XMLType) {
-                        ((XMLType)logical).setElementName(element);
-                    }
-                }
-                // FIXME: [rfeng] For the BARE mapping, do we need to create a Wrapper?
-                // it's null at this point
-            } else {
-
-                RequestWrapper requestWrapper = method.getAnnotation(RequestWrapper.class);
-                String ns = requestWrapper == null ? tns : getValue(requestWrapper.targetNamespace(), tns);
-                String name =
-                    requestWrapper == null ? operationName : getValue(requestWrapper.localName(), operationName);
-                String wrapperBeanName = requestWrapper == null ? "" : requestWrapper.className();
-                if ("".equals(wrapperBeanName)) {
-                    wrapperBeanName = CodeGenerationHelper.getPackagePrefix(clazz) + capitalize(method.getName());
-                }
-
-                DataType<XMLType> inputWrapperDT = null;
-
-                final String inputWrapperClassName = wrapperBeanName;
-                final String inputNS = ns;
-                final String inputName = name;
-                inputWrapperDT = AccessController.doPrivileged(new PrivilegedAction<DataType<XMLType>>() {
-                    public DataType<XMLType> run() {
-                        try {
-                            Class<?> wrapperClass = Class.forName(inputWrapperClassName, false, clazz.getClassLoader());
-                            QName qname = new QName(inputNS, inputName);
-                            DataType dt = new DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
-                            dataBindingExtensionPoint.introspectType(dt, operation);
-                            // TUSCANY-2505
-                            if (dt.getLogical() instanceof XMLType) {
-                                XMLType xmlType = (XMLType)dt.getLogical();
-                                xmlType.setElementName(qname);
-                            }
-                            return dt;
-                        } catch (ClassNotFoundException e) {
-                            GeneratedClassLoader cl = new GeneratedClassLoader(clazz.getClassLoader());
-                            return new GeneratedDataTypeImpl(xmlAdapterExtensionPoint, method, inputWrapperClassName, inputNS, inputName, true,
-                                                             cl);
-                        }
-                    }
-                });
-
-                QName inputWrapper = inputWrapperDT.getLogical().getElementName();
-
-                ResponseWrapper responseWrapper = method.getAnnotation(ResponseWrapper.class);
-                ns = responseWrapper == null ? tns : getValue(responseWrapper.targetNamespace(), tns);
-                name =
-                    responseWrapper == null ? operationName + "Response" : getValue(responseWrapper.localName(),
-                                                                                    operationName + "Response");
-                wrapperBeanName = responseWrapper == null ? "" : responseWrapper.className();
-                if ("".equals(wrapperBeanName)) {
-                    wrapperBeanName =
-                        CodeGenerationHelper.getPackagePrefix(clazz) + capitalize(method.getName()) + "Response";
-                }
-
-                DataType<XMLType> outputWrapperDT = null;
-                final String outputWrapperClassName = wrapperBeanName;
-                final String outputNS = ns;
-                final String outputName = name;
-
-                outputWrapperDT = AccessController.doPrivileged(new PrivilegedAction<DataType<XMLType>>() {
-                    public DataType<XMLType> run() {
-                        try {
-                            Class<?> wrapperClass =
-                                Class.forName(outputWrapperClassName, false, clazz.getClassLoader());
-                            QName qname = new QName(outputNS, outputName);
-                            DataType dt = new DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
-                            dataBindingExtensionPoint.introspectType(dt, operation);
-                            // TUSCANY-2505
-                            if (dt.getLogical() instanceof XMLType) {
-                                XMLType xmlType = (XMLType)dt.getLogical();
-                                xmlType.setElementName(qname);
-                            }
-                            return dt;
-                        } catch (ClassNotFoundException e) {
-                            GeneratedClassLoader cl = new GeneratedClassLoader(clazz.getClassLoader());
-                            return new GeneratedDataTypeImpl(xmlAdapterExtensionPoint, method, outputWrapperClassName, outputNS, outputName,
-                                                             false, cl);
-                        }
-                    }
-                });
-                QName outputWrapper = outputWrapperDT.getLogical().getElementName();
-
-                List<ElementInfo> inputElements = new ArrayList<ElementInfo>();
-                for (int i = 0; i < method.getParameterTypes().length; i++) {
-                    WebParam param = getAnnotation(method, i, WebParam.class);
-                    ns = param != null ? param.targetNamespace() : "";
-                    // Default to "" for doc-lit-wrapped && non-header
-                    ns = getValue(ns, documentStyle && (param == null || !param.header()) ? "" : tns);
-                    name = param != null ? param.name() : "";
-                    name = getValue(name, "arg" + i);
-                    QName element = new QName(ns, name);
-                    Object logical = operation.getInputType().getLogical().get(i).getLogical();
-                    if (logical instanceof XMLType) {
-                        ((XMLType)logical).setElementName(element);
-                    }
-                    inputElements.add(new ElementInfo(element, null));
-                }
-
-                List<ElementInfo> outputElements = new ArrayList<ElementInfo>();
-                WebResult result = method.getAnnotation(WebResult.class);
-                // Default to "" for doc-lit-wrapped && non-header
-                ns = result != null ? result.targetNamespace() : "";
-                ns = getValue(ns, documentStyle && (result == null || !result.header()) ? "" : tns);
-                name = result != null ? result.name() : "";
-                name = getValue(name, "return");
-                QName element = new QName(ns, name);
-
-                if (operation.getOutputType() != null) {
-                    Object logical = operation.getOutputType().getLogical();
-                    if (logical instanceof XMLType) {
-                        ((XMLType)logical).setElementName(element);
-                    }
-                    outputElements.add(new ElementInfo(element, null));
-                }
-
-                String db = inputWrapperDT != null ? inputWrapperDT.getDataBinding() : JAXB_DATABINDING;
-                WrapperInfo wrapperInfo =
-                    new WrapperInfo(db, new ElementInfo(inputWrapper, null), new ElementInfo(outputWrapper, null),
-                                    inputElements, outputElements);
-
-                wrapperInfo.setInputWrapperType(inputWrapperDT);
-                wrapperInfo.setOutputWrapperType(outputWrapperDT);
-
-                operation.setWrapper(wrapperInfo);
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void introspectFaultTypes(Operation operation) {
-        if (operation != null && operation.getFaultTypes() != null) {
-            for (DataType exceptionType : operation.getFaultTypes()) {
-                faultExceptionMapper.introspectFaultDataType(exceptionType, operation, true);
-                DataType faultType = (DataType)exceptionType.getLogical();
-                if (faultType.getDataBinding() == JavaExceptionDataBinding.NAME) {
-                    // The exception class doesn't have an associated bean class, so
-                    // synthesize a virtual bean by introspecting the exception class.
-                    createSyntheticBean(operation, exceptionType);
-                }
-            }
-        }
-    }
-
-    private void createSyntheticBean(Operation operation, DataType exceptionType) {
-        DataType faultType = (DataType)exceptionType.getLogical();
-        QName faultBeanName = ((XMLType)faultType.getLogical()).getElementName();
-        List<DataType<XMLType>> beanDataTypes = new ArrayList<DataType<XMLType>>();
-        for (Method aMethod : exceptionType.getPhysical().getMethods()) {
-            if (Modifier.isPublic(aMethod.getModifiers()) && aMethod.getName().startsWith(GET)
-                && aMethod.getParameterTypes().length == 0
-                && JAXWSFaultExceptionMapper.isMappedGetter(aMethod.getName())) {
-                String propName = resolvePropertyFromMethod(aMethod.getName());
-                QName propQName = new QName(faultBeanName.getNamespaceURI(), propName);
-                Class propType = aMethod.getReturnType();
-                XMLType xmlPropType = new XMLType(propQName, null);
-                DataType<XMLType> propDT = new DataTypeImpl<XMLType>(propType, xmlPropType);
-                org.apache.tuscany.sca.databinding.annotation.DataType dt =
-                    aMethod.getAnnotation(org.apache.tuscany.sca.databinding.annotation.DataType.class);
-                if (dt != null) {
-                    propDT.setDataBinding(dt.value());
-                }
-                dataBindingExtensionPoint.introspectType(propDT, operation);
-
-                // sort the list lexicographically as specified in JAX-WS spec section 3.7
-                int i = 0;
-                for (; i < beanDataTypes.size(); i++) {
-                    if (beanDataTypes.get(i).getLogical().getElementName().getLocalPart().compareTo(propName) > 0) {
-                        break;
-                    }
-                }
-                beanDataTypes.add(i, propDT);
-            }
-        }
-        operation.getFaultBeans().put(faultBeanName, beanDataTypes);
-    }
-
-    private String resolvePropertyFromMethod(String methodName) {
-        StringBuffer propName = new StringBuffer();
-        propName.append(Character.toLowerCase(methodName.charAt(GET.length())));
-        propName.append(methodName.substring(GET.length() + 1));
-        return propName.toString();
-    }
-
-    private <T extends Annotation> T getAnnotation(Method method, int index, Class<T> annotationType) {
-        Annotation[] annotations = method.getParameterAnnotations()[index];
-        for (Annotation annotation : annotations) {
-            if (annotation.annotationType() == annotationType) {
-                return annotationType.cast(annotation);
-            }
-        }
-        return null;
-    }
-
-    private static String getValue(String value, String defaultValue) {
-        return "".equals(value) ? defaultValue : value;
-    }
-
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
deleted file mode 100644
index 764c10ff00..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-
-public class WrapperBeanGenerator extends BaseBeanGenerator {
-
-    public List<Class<?>> generateWrapperBeans(Class<?> sei) {
-        GeneratedClassLoader cl = new GeneratedClassLoader(sei.getClassLoader());
-        List<Class<?>> classes = new ArrayList<Class<?>>();
-        for (Method m : sei.getMethods()) {
-            if (m.getDeclaringClass() == Object.class) {
-                continue;
-            }
-            classes.add(generateRequestWrapper(sei, m, cl));
-            classes.add(generateResponseWrapper(sei, m, cl));
-        }
-        return classes;
-
-    }
-
-    public Class<?> generateRequestWrapper(Class<?> sei, Method m, GeneratedClassLoader cl) {
-        String wrapperNamespace = JavaInterfaceUtil.getNamespace(sei);
-        String wrapperName = m.getName();
-        String wrapperBeanName = capitalize(wrapperName);
-        String wrapperClassName = CodeGenerationHelper.getPackagePrefix(sei) + wrapperBeanName;
-
-        return generateRequestWrapper(m, wrapperClassName, wrapperNamespace, wrapperName, cl);
-    }
-
-    public Class<?> generateRequestWrapper(Method m,
-                                           String wrapperClassName,
-                                           String wrapperNamespace,
-                                           String wrapperName,
-                                           GeneratedClassLoader cl) {
-        synchronized (m.getDeclaringClass()) {
-            MethodKey key = new MethodKey(m, true);
-            Class<?> wrapperClass = generatedClasses.get(key);
-            if (wrapperClass == null) {
-                String wrapperClassDescriptor = wrapperClassName.replace('.', '/');
-                String wrapperClassSignature = "L" + wrapperClassDescriptor + ";";
-
-                Class<?>[] paramTypes = m.getParameterTypes();
-                Type[] genericParamTypes = m.getGenericParameterTypes();
-                Annotation[][] paramAnnotations = m.getParameterAnnotations();
-                List<BeanProperty> properties = new ArrayList<BeanProperty>();
-                for (int i = 0; i < paramTypes.length; i++) {
-                    String propNS = "";
-                    String propName = "arg" + i;
-
-                    WebParam webParam = findAnnotation(paramAnnotations[i], WebParam.class);
-                    if (webParam != null && webParam.header()) {
-                        continue;
-                    }
-                    WebParam.Mode mode = WebParam.Mode.IN;
-                    if (webParam != null) {
-                        mode = webParam.mode();
-                        if (webParam.name().length() > 0) {
-                            propName = webParam.name();
-                        }
-                        propNS = webParam.targetNamespace();
-                    }
-                    if (mode.equals(WebParam.Mode.IN) || mode.equals(WebParam.Mode.INOUT)) {
-                        java.lang.reflect.Type genericParamType = getHolderValueType(genericParamTypes[i]);
-                        Class<?> paramType = CodeGenerationHelper.getErasure(genericParamType);
-                        BeanProperty prop = new BeanProperty(propNS, propName, paramType, genericParamType, true);
-                        prop.getJaxbAnnotaions().addAll(findJAXBAnnotations(paramAnnotations[i]));
-                        properties.add(prop);
-                    }
-                }
-
-                wrapperClass =
-                    generate(wrapperClassDescriptor, wrapperClassSignature, wrapperNamespace, wrapperName, properties
-                        .toArray(new BeanProperty[properties.size()]), cl);
-                generatedClasses.put(key, wrapperClass);
-            }
-            return wrapperClass;
-
-        }
-    }
-
-    public Class<?> generateResponseWrapper(Class<?> sei, Method m, GeneratedClassLoader cl) {
-        String wrapperNamespace = JavaInterfaceUtil.getNamespace(sei);
-
-        String wrapperName = m.getName() + "Response";
-        String wrapperBeanName = capitalize(wrapperName);
-        String wrapperClassName = CodeGenerationHelper.getPackagePrefix(sei) + wrapperBeanName;
-        return generateResponseWrapper(m, wrapperClassName, wrapperNamespace, wrapperName, cl);
-
-    }
-
-    public Class<?> generateResponseWrapper(Method m,
-                                            String wrapperClassName,
-                                            String wrapperNamespace,
-                                            String wrapperName,
-                                            GeneratedClassLoader cl) {
-        synchronized (m.getDeclaringClass()) {
-            MethodKey key = new MethodKey(m, false);
-            Class<?> wrapperClass = generatedClasses.get(key);
-            if (wrapperClass == null) {
-                String wrapperClassDescriptor = wrapperClassName.replace('.', '/');
-                String wrapperClassSignature = "L" + wrapperClassDescriptor + ";";
-
-                List<BeanProperty> properties = new ArrayList<BeanProperty>();
-                // Collect all OUT, INOUT parameters as fields
-                Annotation[][] paramAnns = m.getParameterAnnotations();
-                Class<?>[] paramTypes = m.getParameterTypes();
-                java.lang.reflect.Type[] genericParamTypes = m.getGenericParameterTypes();
-                for (int i = 0; i < paramTypes.length; i++) {
-                    WebParam webParam = findAnnotation(paramAnns[i], WebParam.class);
-                    if (webParam != null) {
-                        if (webParam.header() || webParam.mode() == WebParam.Mode.IN) {
-                            continue;
-                        }
-                    }
-                    if (!isHolder(genericParamTypes[i])) {
-                        continue;
-                    }
-
-                    List<Annotation> jaxb = findJAXBAnnotations(paramAnns[i]);
-
-                    java.lang.reflect.Type genericParamType = getHolderValueType(genericParamTypes[i]);
-                    Class<?> paramType = CodeGenerationHelper.getErasure(genericParamType);
-
-                    String paramNamespace = "";
-                    String paramName = "arg" + i;
-
-                    if (webParam != null) {
-                        if (webParam.name().length() > 0)
-                            paramName = webParam.name();
-                        if (webParam.targetNamespace().length() > 0)
-                            paramNamespace = webParam.targetNamespace();
-                    }
-
-                    BeanProperty prop = new BeanProperty(paramNamespace, paramName, paramType, genericParamType, true);
-                    prop.getJaxbAnnotaions().addAll(jaxb);
-                    properties.add(prop);
-                }
-
-                WebResult webResult = m.getAnnotation(WebResult.class);
-                Class<?> returnType = m.getReturnType();
-                if (!((webResult != null && webResult.header()) || returnType == Void.TYPE)) {
-                    String propName = "return";
-                    String propNS = "";
-
-                    if (webResult != null) {
-                        if (webResult.name().length() > 0) {
-                            propName = webResult.name();
-                        }
-                        if (webResult.targetNamespace().length() > 1) {
-                            propNS = webResult.targetNamespace();
-                        }
-                    }
-
-                    List<Annotation> jaxb = findJAXBAnnotations(m.getAnnotations());
-
-                    Type genericReturnType = m.getGenericReturnType();
-                    BeanProperty prop = new BeanProperty(propNS, propName, returnType, genericReturnType, true);
-                    prop.getJaxbAnnotaions().addAll(jaxb);
-                    properties.add(prop);
-                }
-                wrapperClass =
-                    generate(wrapperClassDescriptor, wrapperClassSignature, wrapperNamespace, wrapperName, properties
-                        .toArray(new BeanProperty[properties.size()]), cl);
-                generatedClasses.put(key, wrapperClass);
-            }
-            return wrapperClass;
-
-        }
-    }
-
-    private static class MethodKey {
-        private Method m;
-        private boolean request;
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((m == null) ? 0 : m.hashCode());
-            result = prime * result + (request ? 1231 : 1237);
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            final MethodKey other = (MethodKey)obj;
-            if (m == null) {
-                if (other.m != null)
-                    return false;
-            } else if (!m.equals(other.m))
-                return false;
-            if (request != other.request)
-                return false;
-            return true;
-        }
-
-        public MethodKey(Method m, boolean request) {
-            super();
-            this.m = m;
-            this.request = request;
-        }
-    }
-
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
deleted file mode 100644
index 1b07e25bad..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public interface Bean<T> {
-    T getP1();
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
deleted file mode 100644
index d38a21ba52..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Bean1 {
-    private String p1;
-    private int p2;
-    public String getP1() {
-        return p1;
-    }
-    public void setP1(String p1) {
-        this.p1 = p1;
-    }
-    public int getP2() {
-        return p2;
-    }
-    public void setP2(int p2) {
-        this.p2 = p2;
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
deleted file mode 100644
index 7b9375063d..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Bean2 implements Bean<String>{
-    private String p1;
-    private int p2;
-    public String getP1() {
-        return p1;
-    }
-    public void setP1(String p1) {
-        this.p1 = p1;
-    }
-    public int getP2() {
-        return p2;
-    }
-    public void setP2(int p2) {
-        this.p2 = p2;
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
deleted file mode 100644
index 567591f166..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.annotation.Annotation;
-
-import javax.xml.bind.JAXBContext;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.util.CheckClassAdapter;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FaultBeanGeneratorTestCase extends TestCase {
-    public void testGenerate() throws IOException {
-        byte[] content = new FaultBeanGenerator().generate(MyException.class);
-        ClassReader cr = new ClassReader(content);
-        PrintWriter pw = new PrintWriter(System.out);
-        CheckClassAdapter.verify(cr, false, pw);
-    }
-
-    public void testGenerateClass() throws Exception {
-        Class<?> cls = FaultBeanGenerator.generateFaultBeanClass(MyException.class);
-        Assert.assertEquals("org.apache.tuscany.sca.interfacedef.java.jaxws.jaxws.MyExceptionBean", cls.getName());
-        for (Annotation a : cls.getAnnotations()) {
-            System.out.println(a);
-        }
-        //        XmlType xmlType = cls.getAnnotation(XmlType.class);
-        //        System.out.println(xmlType);
-        Object bean = cls.newInstance();
-        JAXBContext context = JAXBContextHelper.createJAXBContext(cls);
-        StringWriter sw = new StringWriter();
-        context.createMarshaller().marshal(bean, sw);
-        System.out.println(sw.toString());
-
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
deleted file mode 100644
index 108d283584..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.jaxb.DefaultXMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-
-import com.example.stock.StockExceptionTest;
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXWSJavaInterfaceProcessorTestCase extends TestCase {
-    private JAXWSJavaInterfaceProcessor interfaceProcessor;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        DataBindingExtensionPoint db = new DefaultDataBindingExtensionPoint();
-        XMLAdapterExtensionPoint xa = new DefaultXMLAdapterExtensionPoint();
-        interfaceProcessor = new JAXWSJavaInterfaceProcessor(db, new JAXWSFaultExceptionMapper(db, xa), xa);
-    }
-
-    public void testWrapper() throws Exception {
-        DefaultJavaInterfaceFactory iFactory = new DefaultJavaInterfaceFactory();
-        JavaInterface contract = iFactory.createJavaInterface(StockExceptionTest.class);
-
-        interfaceProcessor.visitInterface(contract);
-        Operation op = contract.getOperations().get(0);
-        Assert.assertTrue(!op.isWrapperStyle());
-        Assert.assertEquals(new QName("http://www.example.com/stock", "stockQuoteOffer"), op.getWrapper().getInputWrapperElement().getQName());
-        Assert.assertEquals(new QName("http://www.example.com/stock", "stockQuoteOfferResponse"), op.getWrapper().getOutputWrapperElement().getQName());
-    }
-
-    /**
-     * Test method for
-     * {@link org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor#visitInterface(JavaInterface)}.
-     */
-    public final void testProcessor() throws Exception {
-        DefaultJavaInterfaceFactory iFactory = new DefaultJavaInterfaceFactory();
-        JavaInterface contract = iFactory.createJavaInterface(WebServiceInterfaceWithoutAnnotation.class);
-
-        interfaceProcessor.visitInterface(contract);
-        assertFalse(contract.isRemotable());
-
-        contract = iFactory.createJavaInterface(WebServiceInterfaceWithAnnotation.class);
-        interfaceProcessor.visitInterface(contract);
-        assertTrue(contract.isRemotable());
-
-        Operation op1 = contract.getOperations().get(0);
-        Operation op2 = contract.getOperations().get(1);
-
-        Operation op = null;
-        if ("m1".equals(op1.getName())) {
-            op = op1;
-        } else {
-            op = op2;
-        }
-
-        assertTrue(!op.isWrapperStyle() && op.getWrapper() == null);
-
-        if ("M2".equals(op2.getName())) {
-            op = op2;
-        } else {
-            op = op1;
-        }
-        assertTrue(!op.isWrapperStyle() && op.getWrapper() != null);
-
-    }
-
-    @WebService
-    private static interface WebServiceInterfaceWithAnnotation {
-
-        @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-        @WebMethod(operationName = "m1")
-        String m1(String str);
-
-        @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
-        @WebMethod(operationName = "M2")
-        String m2(String str, int i);
-    }
-
-    private static interface WebServiceInterfaceWithoutAnnotation {
-
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
deleted file mode 100644
index b3c7102a78..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.reflect.Field;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaReflectionHelperTestCase {
-    @Test
-    public void testErasure() throws Exception {
-        for (Field f : TestGenericClass.class.getDeclaredFields()) {
-            Class<?> cls = CodeGenerationHelper.getErasure(f.getGenericType());
-            System.out.println(cls.getName());
-            Assert.assertSame(f.getType(), cls);
-        }
-    }
-
-    @Test
-    public void testSignature() throws Exception {
-        for (Field f : TestGenericClass.class.getDeclaredFields()) {
-            String sig = CodeGenerationHelper.getSignature(f.getGenericType());
-            System.out.println(sig);
-        }
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
deleted file mode 100644
index 4df0517de6..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class MyException extends Exception {
-    private String error;
-    private int code;
-
-    public MyException() {
-        super();
-    }
-
-    public MyException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public MyException(String message) {
-        super(message);
-    }
-
-    public MyException(Throwable cause) {
-        super(cause);
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
deleted file mode 100644
index 78527193d5..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-/**
- * @version $Rev$ $Date$
- */
-@WebService
-public class MyServiceImpl {
-    
-    public MyServiceImpl() {
-        super();
-    }
-
-    @WebMethod
-    public <T extends Bean1> T getBean(T b, Bean2 b2) {
-        return null;
-    }
-    
-    @WebMethod
-    public List<? extends Bean1> getBeans() {
-        return null;
-    }
-    
-    @WebMethod
-    public String convert(String str, int i) throws MyException {
-        return "ME";
-    }
-    
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
deleted file mode 100644
index 2ecf822904..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestGenericClass <T extends Serializable & List<String>, S> {
-    public TestGenericClass<?, S> i;
-    public T f1;
-    public T[] f2;
-    public S f3;
-    public List<? extends T> list1;
-    public List<?> list2;
-    public List<? extends Serializable> list3;
-    public int f4;
-    public int[] f5;
-    public Map<? super T, S> map;
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
deleted file mode 100644
index a6a3375eff..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.xml.ws.Holder;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TestInterface {
-    int convert(String currency1, String currency2);
-
-    List<Double> getRates(String currency);
-
-    void check(boolean flag);
-
-    String[] list(int[] list);
-
-    int[][] map(String[][] strs);
-
-    String getGreetings(String name);
-
-    String[] getGreetingsArray(String[] names);
-
-    List<String> getGreetingsList(List<String> names);
-
-    ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
-
-    Map<String, String> getGreetingsMap(Map<String, String> namesMap);
-
-    HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
-    
-    @WebMethod
-    @WebResult(name = "output")
-    String webMethod(@WebParam(name = "input", mode = WebParam.Mode.IN)
-    String in, @WebParam(name = "holder", mode = WebParam.Mode.INOUT)
-    Holder<String> holder);
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
deleted file mode 100644
index b14ef19939..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBTypeHelper;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WrapperBeanGeneratorTestCase {
-    @Test
-    public void testGenerate() throws Exception {
-        List<Class<?>> classes = new WrapperBeanGenerator().generateWrapperBeans(TestInterface.class);
-        for (Class<?> cls : classes) {
-            for (Field f : cls.getDeclaredFields()) {
-                System.out.println(f.getName());
-                System.out.println(f.getGenericType());
-                for (Annotation a : f.getAnnotations()) {
-                    System.out.println(a);
-                }
-            }
-            for (Method m : cls.getDeclaredMethods()) {
-                System.out.println(m);
-                for (Annotation a : m.getAnnotations()) {
-                    System.out.println(a);
-                }
-            }
-        }
-        JAXBContext context = JAXBContextHelper.createJAXBContext(classes.toArray(new Class<?>[classes.size()]));
-        for (Class<?> cls : classes) {
-            Object obj = cls.newInstance();
-            StringWriter sw = new StringWriter();
-            context.createMarshaller().marshal(obj, sw);
-            // System.out.println(sw.toString());
-            StringReader sr = new StringReader(sw.toString());
-            context.createUnmarshaller().unmarshal(new StreamSource(sr), cls);
-        }
-    }
-
-    @Test
-    public void testGenerateSchema() throws Exception {
-        List<Class<?>> classes = new WrapperBeanGenerator().generateWrapperBeans(TestInterface.class);
-        JAXBContext context = JAXBContextHelper.createJAXBContext(classes.toArray(new Class<?>[classes.size()]));
-        Map<String, String> results = JAXBTypeHelper.generateSchema(context);
-        for (String xsd : results.values()) {
-            System.out.println(xsd);
-        }
-    }
-}
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/branches/sca-android/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
deleted file mode 100644
index 882408ade6..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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://www.example.com/stock" xmlns:impl="http://www.example.com/stock"

-    xmlns:tns="http://www.example.com/stock" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">

-    <wsdl:types>

-        <schema targetNamespace="http://www.example.com/stock" xmlns="http://www.w3.org/2001/XMLSchema"

-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-            <complexType name="StockOffer">

-                <sequence>

-                    <element name="symbol" minOccurs="1" type="xsd:string" />

-                    <element name="price" minOccurs="1" type="xsd:float" nillable="true" /><!-- max price reqested, actual response -->

-                    <element name="name" minOccurs="0" type="xsd:string" />

-                    <element name="list" minOccurs="0" maxOccurs="unbounded" type="xsd:string" />

-                </sequence>

-            </complexType>

-

-            <element name="stockQuoteOffer">

-                <complexType>

-                    <sequence>

-                        <element name="input" minOccurs="0" maxOccurs="unbounded" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="stockQuoteOfferResponse">

-                <complexType>

-                    <sequence>

-                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <!-- Faults -->

-            <element name="InvalidSymbolFault">

-                <complexType>

-                    <sequence>

-                        <element name="message" minOccurs="1" type="xsd:string" />

-                        <element name="offer" minOccurs="1" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="MarketClosedFault" type="xsd:int" />

-

-            <element name="TestNotDeclaredAtSourceFault" type="xsd:string" />

-

-        </schema>

-    </wsdl:types>

-

-

-    <wsdl:message name="stockQuoteOfferRequest">

-        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="stockQuoteOfferResponse">

-        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="InvalidSymbolFault">

-        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />

-    </wsdl:message>

-

-    <wsdl:message name="MarketClosedFault">

-        <wsdl:part element="tns:MarketClosedFault" name="fault" />

-    </wsdl:message>

-

-    <wsdl:message name="TestNotDeclaredAtSourceFault">

-        <wsdl:part element="tns:TestNotDeclaredAtSourceFault" name="fault" />

-    </wsdl:message>

-

-

-    <wsdl:portType name="StockExceptionTest">

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />

-

-            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />

-

-            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />

-

-            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />

-

-            <wsdl:fault message="tns:TestNotDeclaredAtSourceFault" name="TestNotDeclaredAtSourceException" />

-        </wsdl:operation>

-

-

-    </wsdl:portType>

-

-    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">

-        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->

-

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdlsoap:operation soapAction="" />

-

-            <wsdl:input name="stockQuoteOfferRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-

-            <wsdl:output name="stockQuoteOfferResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-

-            <wsdl:fault name="InvalidSymbolException">

-                <wsdlsoap:fault name="InvalidSymbolException" use="literal" />

-            </wsdl:fault>

-

-            <wsdl:fault name="MarketClosedException">

-                <wsdlsoap:fault name="MarketClosedException" use="literal" />

-            </wsdl:fault>

-

-            <wsdl:fault name="TestNotDeclaredAtSourceException">

-                <wsdlsoap:fault name="TestNotDeclaredAtSourceException" use="literal" />

-            </wsdl:fault>

-

-

-

-        </wsdl:operation>

-

-

-    </wsdl:binding>

-

-

-</wsdl:definitions>
\ No newline at end of file
diff --git a/branches/sca-android/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/branches/sca-android/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 4fee9e9756..0000000000
--- a/branches/sca-android/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,149 +0,0 @@
-<?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://www.example.com/stock" xmlns:impl="http://www.example.com/stock"

-    xmlns:tns="http://www.example.com/stock" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">

-    <wsdl:types>

-        <schema targetNamespace="http://www.example.com/stock" xmlns="http://www.w3.org/2001/XMLSchema"

-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-            <complexType name="StockOffer">

-                    <sequence>

-                        <element name="symbol" minOccurs="1" type="xsd:string" />

-                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->

-                        <element name="name" minOccurs="0" type="xsd:string" />

-                        <element name="list" minOccurs="0" maxOccurs="unbounded" type="xsd:string" />

-                    </sequence>

-            </complexType>

-            

-            <element name="stockQuoteOffer">

-                <complexType>

-                    <sequence>

-                        <element name="input" minOccurs="0" maxOccurs="unbounded" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            <!--  TUSCANY 2505, make the responseWrapper non-anonymous -->

-            <element name="stockQuoteOfferResponse" type="tns:StockQuoteOfferResponseType">

-            </element>

-             <complexType name="StockQuoteOfferResponseType">

-                <sequence>

-                    <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />

-                </sequence>

-            </complexType>            

-            <!-- Faults -->

-            <element name="InvalidSymbolFault">

-                <complexType>

-                    <sequence>

-                        <element name="message"  minOccurs="1" type="xsd:string" />

-                        <element name="offer" minOccurs="1" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-            <element name="MarketClosedFault"   type="xsd:int" />

-			

-			<element name="TestNotDeclaredAtSourceFault" type="xsd:string" />

-     

-        </schema>

-    </wsdl:types>

-

-

-    <wsdl:message name="stockQuoteOfferRequest">

-        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="stockQuoteOfferResponse">

-        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="InvalidSymbolFault">

-        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />

-    </wsdl:message>

-

-    <wsdl:message name="MarketClosedFault">

-        <wsdl:part element="tns:MarketClosedFault" name="fault" />

-    </wsdl:message>

-

-   <wsdl:message name="TestNotDeclaredAtSourceFault">

-        <wsdl:part element="tns:TestNotDeclaredAtSourceFault" name="fault" />

-    </wsdl:message>

-

-

-    <wsdl:portType name="StockExceptionTest">

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />

-

-            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />

-            

-            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />

-             

-            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />

-            

-            <wsdl:fault message="tns:TestNotDeclaredAtSourceFault" name="TestNotDeclaredAtSourceException" />

-        </wsdl:operation>

-

- 

-    </wsdl:portType>

-

-    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">

-        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->

-

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdlsoap:operation soapAction="" />

-

-            <wsdl:input name="stockQuoteOfferRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-

-            <wsdl:output name="stockQuoteOfferResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-            

-            <wsdl:fault name="InvalidSymbolException"> 

-            	<wsdlsoap:fault name="InvalidSymbolException" use="literal" />

-            </wsdl:fault>

-            

-            <wsdl:fault name="MarketClosedException"> 

-            	<wsdlsoap:fault name="MarketClosedException" use="literal" />

-            </wsdl:fault>

-            

-            <wsdl:fault name="TestNotDeclaredAtSourceException"> 

-            	<wsdlsoap:fault name="TestNotDeclaredAtSourceException" use="literal" />

-            </wsdl:fault>

-

-

-

-        </wsdl:operation>

-

-

-    </wsdl:binding>

-

-    <wsdl:service name="StockExceptionTestService">

-        <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/services/exchangeJaxbService" />

-

-        </wsdl:port>

-

-    </wsdl:service>

-

-</wsdl:definitions>
\ No newline at end of file