Moving 1.x branches

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

33 files changed, 5033 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/LICENSE
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/NOTICE
new file mode 100644
index 0000000000..fdfa0e9faa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/pom.xml
new file mode 100644
index 0000000000..b10f64947a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/pom.xml
@@ -0,0 +1,235 @@
+<?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-sca-tools</artifactId>
+        <version>1.3.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-java2wsdl</artifactId>
+    <name>Apache Tuscany SCA Java2WSDL Tool</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1-incubating</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.3.1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>1.3.1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>wsdl4j</groupId>
+                    <artifactId>wsdl4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>1.2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-java2wsdl</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-codegen</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>codegen</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>codegen-ecore</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>annogen</groupId>
+            <artifactId>annogen</artifactId>
+            <version>0.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <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/sdo-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>        
+            <plugin>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-plugin</artifactId>
+                <version>1.1-incubating</version>
+                <executions>
+                    <execution>
+                        <id>generate-sdo</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile>
+                            <javaPackage>org.example.creditscore.doclit</javaPackage>
+                            <noNotification>true</noNotification>
+                            <noContainer>true</noContainer>
+                            <noUnsettable>true</noUnsettable>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <!-- <id>eclipse.emf</id>
+            <url>http://download.eclipse.org/tools/emf/maven2</url> -->
+            <!-- <id>osuosl.org</id>
+            <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
+            <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
+            <id>indiana</id>
+            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
new file mode 100644
index 0000000000..60afe70534
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
@@ -0,0 +1,423 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+
+/**
+ * This class encapsulates the parameters that effect the generation of the WSDL. For example they contain all user settings such as source class,
+ * target location etc.
+ *
+ */
+public class GenerationParameters implements TuscanyJava2WSDLConstants {
+    public static final String WSDL_FILENAME_SUFFIX = ".wsdl";
+
+    public static final String XSD_IMPORT_DELIMITER = "[,]";
+
+    private Map cmdLineOptions = null;
+
+    private File outputFile = null;
+
+    private FileOutputStream outputFileStream = null;
+
+    private String sourceClassName = null;
+
+    private ArrayList extraClasses;
+
+    private ArrayList factoryClassNames;
+
+    private String attrFormDefault = null;
+
+    private String elementFormDefault = null;
+
+    private String targetNamespace = null;
+
+    private String targetNamespacePrefix = null;
+
+    private String schemaTargetNamespace = null;
+
+    private String schemaTargetNamespacePrefix = null;
+
+    private String outputFileName = null;
+
+    private ClassLoader classLoader = null;
+
+    private String serviceName = null;
+
+    private String style = DOCUMENT;
+
+    private String use = LITERAL;
+
+    private String locationUri = DEFAULT_LOCATION_URL;
+
+    private Map schemaLocationMap = null;
+
+    public GenerationParameters(Map cmdLineOptions) throws Exception {
+        this.cmdLineOptions = cmdLineOptions;
+        loadParameters();
+    }
+
+    protected void loadParameters() throws Exception {
+        initializeSourceClassName();
+        resolveFileOutputStream();
+        resolveClassLoader4InputClasspath();
+        loadSchemaLocationMap();
+        initializeOtherParams();
+    }
+
+    private Java2WSDLCommandLineOption loadOption(String shortOption, String longOption) {
+        // short option gets precedence
+        Java2WSDLCommandLineOption option = null;
+        if (longOption != null) {
+            option = (Java2WSDLCommandLineOption) cmdLineOptions.get(longOption);
+            if (option != null) {
+                return option;
+            }
+        }
+        if (shortOption != null) {
+            option = (Java2WSDLCommandLineOption) cmdLineOptions.get(shortOption);
+        }
+
+        return option;
+    }
+
+    protected void initializeSourceClassName() throws Exception {
+        Java2WSDLCommandLineOption option = loadOption(CLASSNAME_OPTION, CLASSNAME_OPTION_LONG);
+        sourceClassName = option == null ? null : option.getOptionValue();
+
+        if (sourceClassName == null || sourceClassName.equals("")) {
+            throw new Exception("class name must be present!");
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    protected void resolveFileOutputStream() throws Exception {
+        File outputFolder;
+        Java2WSDLCommandLineOption option = loadOption(OUTPUT_LOCATION_OPTION, OUTPUT_LOCATION_OPTION_LONG);
+        String outputFolderName = option == null ? System.getProperty("user.dir") : option.getOptionValue();
+
+        outputFolder = new File(outputFolderName);
+        if (!outputFolder.exists()) {
+            outputFolder.mkdirs();
+        } else if (!outputFolder.isDirectory()) {
+            throw new Exception("The specified location " + outputFolderName + "is not a folder");
+        }
+
+        option = loadOption(OUTPUT_FILENAME_OPTION, OUTPUT_FILENAME_OPTION_LONG);
+        String outputFileName = option == null ? null : option.getOptionValue();
+        // derive a file name from the class name if the filename is not specified
+        if (outputFileName == null) {
+            outputFileName = Java2WSDLUtils.getSimpleClassName(sourceClassName) + WSDL_FILENAME_SUFFIX;
+        }
+
+        // first create a file in the given location
+        File outputFile = new File(outputFolder, outputFileName);
+        try {
+            if (!outputFile.exists()) {
+                outputFile.createNewFile();
+            }
+            outputFileStream = new FileOutputStream(outputFile);
+        } catch (IOException e) {
+            throw new Exception(e);
+        }
+    }
+
+    protected void addToSchemaLocationMap(String optionValue) throws Exception {
+        // option value will be of the form [namespace, schemalocation]
+        // hence we take the two substrings starting after '[' and upto ',' and
+        // starting after ',' and upto ']'
+        getSchemaLocationMap().put(optionValue.substring(1, optionValue.indexOf(COMMA)),
+                optionValue.substring(optionValue.indexOf(COMMA) + 1, optionValue.length() - 1));
+    }
+
+    protected void loadSchemaLocationMap() throws Exception {
+        Java2WSDLCommandLineOption option = loadOption(IMPORT_XSD_OPTION, IMPORT_XSD_OPTION_LONG);
+
+        if (option != null) {
+            ArrayList optionValues = option.getOptionValues();
+
+            for (int count = 0; count < optionValues.size(); ++count) {
+                addToSchemaLocationMap(((String) optionValues.get(count)).trim());
+            }
+        }
+    }
+
+    protected void resolveClassLoader4InputClasspath() throws Exception {
+        URL[] urls = null;
+        Java2WSDLCommandLineOption option = loadOption(CLASSPATH_OPTION, CLASSPATH_OPTION_LONG);
+
+        if (option != null) {
+            ArrayList optionValues = option.getOptionValues();
+            urls = new URL[optionValues.size()];
+            String[] classPathEntries = (String[]) optionValues.toArray(new String[optionValues.size()]);
+
+            try {
+                for (int i = 0; i < classPathEntries.length; i++) {
+                    String classPathEntry = classPathEntries[i];
+                    // this should be a file(or a URL)
+                    if (Java2WSDLUtils.isURL(classPathEntry)) {
+                        urls[i] = new URL(classPathEntry);
+                    } else {
+                        urls[i] = new File(classPathEntry).toURL();
+                    }
+                }
+            } catch (MalformedURLException e) {
+                throw new Exception(e);
+            }
+
+        } else {
+            //Default to pwd
+            urls = new URL[1];
+            File pwd = new File(".");
+            urls[0] = pwd.toURL();
+        }
+
+        classLoader = new URLClassLoader(urls, Thread.currentThread().getContextClassLoader());
+    }
+
+    protected void initializeOtherParams() {
+        // set the other parameters to the builder
+        Java2WSDLCommandLineOption option =
+            loadOption(SCHEMA_TARGET_NAMESPACE_OPTION, SCHEMA_TARGET_NAMESPACE_OPTION_LONG);
+        schemaTargetNamespace = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION, SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION_LONG);
+        schemaTargetNamespacePrefix = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(TARGET_NAMESPACE_OPTION, TARGET_NAMESPACE_OPTION_LONG);
+        targetNamespace = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(TARGET_NAMESPACE_PREFIX_OPTION, TARGET_NAMESPACE_PREFIX_OPTION_LONG);
+        targetNamespacePrefix = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(SERVICE_NAME_OPTION, SERVICE_NAME_OPTION_LONG);
+        serviceName = (option == null) ? Java2WSDLUtils.getSimpleClassName(sourceClassName) : option.getOptionValue();
+
+        option = loadOption(STYLE_OPTION, STYLE_OPTION);
+        style = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(LOCATION_OPTION, LOCATION_OPTION);
+        locationUri = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(USE_OPTION, USE_OPTION);
+        use = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(ATTR_FORM_DEFAULT_OPTION, ATTR_FORM_DEFAULT_OPTION_LONG);
+        attrFormDefault = (option == null) ? null : option.getOptionValue();
+
+        option = loadOption(ELEMENT_FORM_DEFAULT_OPTION, ELEMENT_FORM_DEFAULT_OPTION_LONG);
+        elementFormDefault = option == null ? null : option.getOptionValue();
+
+        option = loadOption(TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION, TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION_LONG);
+        extraClasses = option == null ? new ArrayList() : option.getOptionValues();
+
+        option = loadOption(TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION, TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION_LONG);
+        factoryClassNames = option == null ? new ArrayList() : option.getOptionValues();
+    }
+
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
+    public void setClassLoader(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
+    public String getLocationUri() {
+        if (locationUri == null) {
+            locationUri = DEFAULT_LOCATION_URL;
+        }
+        return locationUri;
+    }
+
+    public void setLocationUri(String locationUri) {
+        this.locationUri = locationUri;
+    }
+
+    public FileOutputStream getOutputFileStream() {
+        return outputFileStream;
+    }
+
+    public void setOutputFileStream(FileOutputStream outputFileStream) {
+        this.outputFileStream = outputFileStream;
+    }
+
+    public String getSchemaTargetNamespace() throws Exception {
+        if (schemaTargetNamespace == null || schemaTargetNamespace.trim().equals("")) {
+            // This amounts to assuming we want the wrapper elements in the same TNS
+            // as the WSDL definitions.
+            //
+            // If the user neither specifies a TNS nor a SchemaTNS then both of these two
+            // will continue to default to the same NS calculated from the input class' package name.
+            //
+            // The wrapper elements aren't really interesting outside the context of the WSDL types
+            // section, so it seems reasonable to think that a user who cares to select a non-default
+            // TNS for the WSDL definitions might want the wrapper elements defined in that same
+            // NS.
+            //
+            // The user can always override this default.
+
+            this.schemaTargetNamespace = this.getTargetNamespace();
+        }
+        return schemaTargetNamespace;
+    }
+
+    public void setSchemaTargetNamespace(String schemaTargetNamespace) {
+        this.schemaTargetNamespace = schemaTargetNamespace;
+    }
+
+    public String getSchemaTargetNamespacePrefix() {
+        if (schemaTargetNamespacePrefix == null || schemaTargetNamespacePrefix.trim().equals("")) {
+            this.schemaTargetNamespacePrefix = SCHEMA_NAMESPACE_PRFIX;
+        }
+
+        return schemaTargetNamespacePrefix;
+    }
+
+    public void setSchemaTargetNamespacePrefix(String schemaTargetNamespacePrefix) {
+        this.schemaTargetNamespacePrefix = schemaTargetNamespacePrefix;
+    }
+
+    public String getServiceName() {
+        if (serviceName == null) {
+            serviceName = Java2WSDLUtils.getSimpleClassName(getSourceClassName());
+        }
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getSourceClassName() {
+        return sourceClassName;
+    }
+
+    public void setSourceClassName(String sourceClassName) {
+        this.sourceClassName = sourceClassName;
+    }
+
+    public String getStyle() {
+        if (style == null) {
+            style = DOCUMENT;
+        }
+        return style;
+    }
+
+    public void setStyle(String style) {
+        this.style = style;
+    }
+
+    public String getTargetNamespace() throws Exception {
+        if (targetNamespace == null) {
+            targetNamespace = Java2WSDLUtils.namespaceFromClassName(this.sourceClassName, this.classLoader).toString();
+        }
+        return targetNamespace;
+    }
+
+    public void setTargetNamespace(String targetNamespace) {
+        this.targetNamespace = targetNamespace;
+    }
+
+    public String getTargetNamespacePrefix() {
+        return targetNamespacePrefix;
+    }
+
+    public void setTargetNamespacePrefix(String targetNamespacePrefix) {
+        this.targetNamespacePrefix = targetNamespacePrefix;
+    }
+
+    public String getUse() {
+        if (use == null) {
+            use = LITERAL;
+        }
+        return use;
+    }
+
+    public void setUse(String use) {
+        this.use = use;
+    }
+
+    public Map getSchemaLocationMap() {
+        if (schemaLocationMap == null) {
+            schemaLocationMap = new Hashtable();
+        }
+        return schemaLocationMap;
+    }
+
+    public void setSchemaLocationMap(Map schemaLocationMap) {
+        this.schemaLocationMap = schemaLocationMap;
+    }
+
+    public String getAttrFormDefault() {
+        if (attrFormDefault == null) {
+            attrFormDefault = FORM_DEFAULT_UNQUALIFIED;
+        }
+        return attrFormDefault;
+    }
+
+    public void setAttrFormDefault(String attrFormDefault) {
+        this.attrFormDefault = attrFormDefault;
+    }
+
+    public String getElementFormDefault() {
+        if (elementFormDefault == null) {
+            elementFormDefault = FORM_DEFAULT_QUALIFIED;
+        }
+        return elementFormDefault;
+    }
+
+    public void setElementFormDefault(String elementFormDefault) {
+        this.elementFormDefault = elementFormDefault;
+    }
+
+    public ArrayList getExtraClasses() {
+        return extraClasses;
+    }
+
+    public void setExtraClasses(ArrayList extraClasses) {
+        this.extraClasses = extraClasses;
+    }
+
+    public ArrayList getFactoryClassNames() {
+        return factoryClassNames;
+    }
+
+    public void setFactoryClassNames(ArrayList factoryClassNames) {
+        this.factoryClassNames = factoryClassNames;
+    }
+
+    // Not a command-line parameter, but will be useful for printing status message
+    protected File getOutputFile() {
+        return outputFile;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
new file mode 100644
index 0000000000..a890dd624d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
@@ -0,0 +1,82 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
+
+/**
+ * This class provides the tooling abstraction to Tuscany Java2WSDL and can be
+ * invoked from command line with the following options as with Axis2 Java2WSDL
+ */
+public class Java2WSDL {
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        // parse the cmd line args
+        Java2WSDLCommandLineOptionParser commandLineOptionParser = new Java2WSDLCommandLineOptionParser(args);
+
+        // validate the arguments
+        validateCommandLineOptions(commandLineOptionParser);
+
+        Java2WSDLGeneratorFactory.getInstance().createGenerator().generateWSDL(commandLineOptionParser.getAllOptions());
+
+        // Uncomment the following statement to directly run the Axis2 tool
+        // without
+        // runAxis2Tool(args);
+    }
+
+    private static void runAxis2Tool(String[] args) {
+        org.apache.ws.java2wsdl.Java2WSDL.main(args);
+    }
+
+    private static void validateCommandLineOptions(Java2WSDLCommandLineOptionParser parser) {
+        if (parser.getAllOptions().size() == 0) {
+            printUsage();
+        } else if (parser.getInvalidOptions(new TuscanyJava2WSDLOptionsValidator()).size() > 0) {
+            printUsage();
+        }
+
+    }
+
+    public static void printUsage() {
+        System.out.println("Usage java2wsdl -cn <fully qualified class name> : class file name");
+        System.out.println("-o <output Location> : output file location");
+        System.out.println("-cp <class path uri> : list of classpath entries - (urls)");
+        System.out.println("-tn <target namespace> : target namespace");
+        System.out.println("-tp <target namespace prefix> : target namespace prefix");
+        System.out.println("-stn <schema target namespace> : target namespace for schema");
+        System.out.println("-stp <schema target namespace prefix> : target namespace prefix for schema");
+        System.out.println("-sn <service name> : service name");
+        System.out.println("-of <output file name> : output file name for the WSDL");
+        System.out.println("-st <binding style> : style for the WSDL");
+        System.out.println("-u <binding use> : use for the WSDL");
+        System.out.println("-l <soap address> : address of the port for the WSDL");
+        System.out
+            .println("-ixsd [<schema namespace 1>,<schema loc 1>] [<schema namespace 2>,<schema loc 2>] ... [<schema namespace N>,<schema loc N>]   : schemas to be imported (without a comma in between brackets)");
+        System.out.println("-efd <unqualified> : Setting for elementFormDefault (defaults to qualified)");
+        System.out.println("-afd <unqualified> : Setting for attributeFormDefault (defaults to qualified)");
+        System.out
+            .println("-fcn <Generated SDO Factory classname 1> <Generated SDO Factory classname 2> ...   <Generated SDO Factory classname N> (without a comma in between) ");
+
+        System.out
+            .println("-xc <extra class> : Extra class for which schematype must be generated.  " + "\t\tUse as : -xc class1 -xc class2 ...");
+        System.exit(0);
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
new file mode 100644
index 0000000000..9c8ff9df9e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate;
+
+import java.io.OutputStream;
+import java.util.Map;
+
+/**
+ * This is the Java2WSDL Generator facade that will be used by Tuscany
+ * components for Java to WSDL conversion.
+ * 
+ */
+public interface Java2WSDLGenerator {
+	public void generateWSDL(String[] args);
+
+	public void generateWSDL(Map commandLineOptions);
+
+	public void addWSDLGenListener(WSDLGenListener l);
+
+	public void removeWSDLGenListener(WSDLGenListener l);
+
+	public Map getCommandLineOptions();
+
+	public void setCommandLineOptoins(Map cmdLineOpts);
+
+	public OutputStream getOutputStream();
+
+	public void setOutputStream(OutputStream outStream);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
new file mode 100644
index 0000000000..e8f3db95b0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
@@ -0,0 +1,89 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.util.Vector;
+
+/**
+ * Factory that creates Java2WSDL Generators. Presently the there is a Default
+ * Generator that wraps around the AXIS2 Java2WSDL implementation. The factory
+ * can be extended to create generators that wrap around other implementations
+ * if required.
+ */
+
+public class Java2WSDLGeneratorFactory {
+	/*
+	 * singleton instance of this factory class
+	 */
+	private static Java2WSDLGeneratorFactory factory = null;
+
+	/**
+	 * code for the default generator
+	 */
+	public static final int DEFAULT_GENERATOR = 0;
+
+	/**
+	 * Default Generator class name
+	 */
+	public static final String DEFAULT_GENERATOR_CLASSNAME = "org.apache.tuscany.tools.java2wsdl.generate.Java2WSDLGeneratorImpl";
+
+	/**
+	 * list of generator classnames in a position that corresponds to their
+	 * code. For example the default generator's code is 0 and hence this
+	 * generator's classname is stored at index '0' of the list
+	 */
+	protected Vector<String> generatorClassNames = new Vector<String>();
+
+	/**
+	 * @return the singleton instance of this generator factory
+	 */
+	public static Java2WSDLGeneratorFactory getInstance() {
+		if (factory == null) {
+			factory = new Java2WSDLGeneratorFactory();
+		}
+		return factory;
+	}
+
+	private Java2WSDLGeneratorFactory() {
+		generatorClassNames.addElement(DEFAULT_GENERATOR_CLASSNAME);
+	}
+
+	public Java2WSDLGenerator createGenerator() {
+		return createGenerator(DEFAULT_GENERATOR);
+	}
+
+	/**
+	 * creates an instance of a Java2WSDL Generator based on the input type
+	 * 
+	 * @param genType
+	 *            type of the generator to be created
+	 * @return an instance of a Java2WSDL Generator
+	 */
+	public Java2WSDLGenerator createGenerator(int genType) {
+		try {
+			return (Java2WSDLGenerator) (Class.forName(generatorClassNames
+					.elementAt(genType)).newInstance());
+		} catch (Exception e) {
+			System.out
+					.println(" Unable to create Java2WSDL generator due to .....");
+			System.out.println(e);
+			return null;
+		}
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
new file mode 100644
index 0000000000..bce30a48d3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
@@ -0,0 +1,238 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate;
+
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.ws.java2wsdl.Java2WSDL;
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
+import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * This is an implementation of the Java2WSDLGenerator facade. This
+ * implementation is a decorator around the Axis2 implementation of the
+ * Java2WSDL conversion. The WSDL generation is divided into phases that are
+ * stringed up as a template method. The phases are - User Input Validation -
+ * WSDL Java Model Generation - Serialization of WSDL Java Model The function of
+ * each phase is accomplished by delegation to the appropriate classes in Axis2.
+ * At the start and end of each phase an event is published to subscribers
+ * denoting the start and end of the phase. Such a splitting up of the Java2WSDL
+ * conversion into phases has been designed to enable interceptors to modify the
+ * model or apply transformations to the output. Typically the interceptors can
+ * subscribe to the start and end events of these phases and hence be able to
+ * intercept. Note: This class contains substantial AXIS2 Java2WSDL code
+ * refactored into it. These will be removed as and when the Axis2 code is
+ * fixed.
+ */
+public class Java2WSDLGeneratorImpl implements Java2WSDLGenerator, TuscanyJava2WSDLConstants {
+    private List<WSDLGenListener> genPhaseListeners = new Vector<WSDLGenListener>();
+    private GenerationParameters genParams = null;
+    private Map<String, Java2WSDLCommandLineOption> commandLineOptions = null;
+    private TuscanyJava2WSDLBuilder java2WsdlBuilder;
+    private OutputStream outputStream = null;
+
+    public Java2WSDLGeneratorImpl() {
+
+    }
+
+    private void multicastGenPhaseCompletionEvent(int genPhase) {
+        WSDLGenEvent event = new WSDLGenEvent(this, genPhase);
+        Iterator iterator = genPhaseListeners.iterator();
+        while (iterator.hasNext()) {
+            ((WSDLGenListener)iterator.next()).WSDLGenPhaseCompleted(event);
+        }
+    }
+
+    private void initJava2WSDLBuilder() throws Exception {
+        // Now we are done with loading the basic values - time to create the
+        // builder
+        java2WsdlBuilder = new TuscanyJava2WSDLBuilder(genParams);
+    }
+
+    protected boolean validateInputArgs(String[] args) {
+        boolean isValid = true;
+        Java2WSDLCommandLineOptionParser parser = new Java2WSDLCommandLineOptionParser(args);
+        if (parser.getAllOptions().size() == 0) {
+            Java2WSDL.printUsage();
+            isValid = false;
+        } else if (parser.getInvalidOptions(new Java2WSDLOptionsValidator()).size() > 0) {
+            Java2WSDL.printUsage();
+            isValid = false;
+        }
+
+        if (isValid) {
+            commandLineOptions = parser.getAllOptions();
+        }
+
+        return isValid;
+    }
+
+    public boolean buildWSDLDocument() throws Exception {
+        boolean isComplete = true;
+        initJava2WSDLBuilder();
+        java2WsdlBuilder.buildWSDL();
+
+        return isComplete;
+    }
+
+    public boolean serializeWSDLDocument() throws Exception {
+        boolean isComplete = true;
+
+        if (getOutputStream() == null) {
+            setOutputStream(genParams.getOutputFileStream());
+        }
+
+        // transform the OMElement
+        OMElement om = java2WsdlBuilder.getWsdlDocument();
+        javax.xml.stream.XMLStreamReader stream = om.getXMLStreamReader();
+
+        org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node xform =
+            new org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node();
+
+        Node node = xform.transform(stream, null);
+
+        Document doc = node.getOwnerDocument();
+
+        // pretty-print WSDL document
+        OutputFormat format = new OutputFormat(doc);
+        format.setLineWidth(65);
+        format.setIndenting(true);
+        format.setIndent(2);
+        XMLSerializer serializer = new XMLSerializer(getOutputStream(), format);
+        serializer.serialize(doc);
+
+        return isComplete;
+
+    }
+
+    /*
+     * This is the template method that splits the Java2WSDL generation cycle
+     * into phase / steps.
+     * 
+     * @see tuscany.tools.Java2WSDLGeneratorIfc#generateWSDL(java.lang.String[])
+     */
+    public void generateWSDL(Map commandLineOptions) {
+        try {
+            // load the user options into an easy to access abstraction
+            genParams = new GenerationParameters(commandLineOptions);
+
+            // if the WSDL Model generation was successful
+            if (buildWSDLDocument()) {
+                // multicast event for generation of WSDL model
+                multicastGenPhaseCompletionEvent(WSDLGenListener.WSDL_MODEL_CREATION);
+                // if the Serialization of the generated (and fixed) model
+                // is successful
+                if (serializeWSDLDocument()) {
+                    // multicast event for writing of the WSDL Model to
+                    // supplied output stream
+                    multicastGenPhaseCompletionEvent(WSDLGenListener.WSDL_MODEL_WRITING);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void generateWSDL(String[] args) {
+        // if the argument input are found to be valid
+        if (validateInputArgs(args)) {
+            // multicast event for input args validation complete
+            multicastGenPhaseCompletionEvent(WSDLGenListener.INPUT_ARGS_VALIDATION);
+            generateWSDL(commandLineOptions);
+        }
+    }
+
+    public void addWSDLGenListener(WSDLGenListener l) {
+        genPhaseListeners.add(l);
+
+    }
+
+    public void removeWSDLGenListener(WSDLGenListener l) {
+        genPhaseListeners.remove(l);
+    }
+
+    public Map getCommandLineOptions() {
+        return commandLineOptions;
+    }
+
+    public void setCommandLineOptoins(Map cmdLineOpts) {
+        commandLineOptions = cmdLineOpts;
+    }
+
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+
+    public void setOutputStream(OutputStream outStream) {
+        outputStream = outStream;
+    }
+
+    public TuscanyJava2WSDLBuilder getJava2WsdlBuilder() {
+        return java2WsdlBuilder;
+    }
+
+    public void setJava2WsdlBuilder(TuscanyJava2WSDLBuilder java2WsdlBuilder) {
+        this.java2WsdlBuilder = java2WsdlBuilder;
+    }
+
+    // 
+    // Works recursively with node's entire subtree
+    // There's no tie to fields in this object so I made this public.
+    // 
+    public static void removeTextNodes(Node node) {
+
+        if (node == null)
+            return;
+
+        if (node.getNodeType() == Node.TEXT_NODE) {
+            node.getParentNode().removeChild(node);
+        } else {
+            int origNumNodes;
+            NodeList children = null;
+            do {
+                children = node.getChildNodes();
+                origNumNodes = children.getLength();
+
+                for (int i = 0; i < origNumNodes; i++) {
+                    removeTextNodes(children.item(i));
+                }
+            } while (node.getChildNodes().getLength() != origNumNodes);
+        }
+    }
+
+    protected void printGenerationMessage() {
+        System.out.println("");
+        System.out.println("Generating " + genParams.getOutputFile()
+            + " from Java class "
+            + genParams.getSourceClassName()
+            + ".");
+        System.out.println("");
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
new file mode 100644
index 0000000000..897700ffd9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
@@ -0,0 +1,613 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.io.StringReader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaForm;
+import org.apache.ws.commons.schema.XmlSchemaGroupBase;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaInclude;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.utils.NamespaceMap;
+import org.codehaus.jam.JClass;
+import org.codehaus.jam.JProperty;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Type;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XSDHelper;
+
+public class SchemaBuilder implements TuscanyJava2WSDLConstants {
+    public static final String NAME_SPACE_PREFIX = "stn_";
+
+    private static int prefixCount = 1;
+
+    public static final String MIXED = "mixed";
+
+    public static final String GROUP = "group";
+
+    protected String attrFormDefault = null;
+
+    protected String elementFormDefault = null;
+
+    protected XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
+
+    private Hashtable schemaMap = new Hashtable();
+
+    protected Hashtable targetNamespacePrefixMap = new Hashtable();
+
+    protected TuscanyTypeTable typeTable = new TuscanyTypeTable();
+
+    protected Map schemaLocationMap = null;
+
+    private ClassLoader classLoader = null;
+
+    private ArrayList factoryClassNames = null;
+
+    private HelperContext helperContext = null;
+    
+    private XSDHelper xsdHelper = null;
+
+    private Set<String> registeredSDOFactories = new HashSet<String>();
+    
+    boolean alreadyPrintedDefaultSDOFactoryFound = false;
+    
+    boolean alreadyPrintedDefaultSDOFactoryNotFound = false;
+
+    protected SchemaBuilder(XmlSchemaCollection schemaCollection,
+                            Hashtable schemaMap,
+                            Hashtable nsPrefixMap,
+                            TuscanyTypeTable typeTable,
+                            String attrFormDef,
+                            String eleFormDef,
+                            Map schemaLocMap,
+                            ClassLoader classLoader,
+                            ArrayList factoryClassNames) {
+        this.schemaMap = schemaMap;
+        this.xmlSchemaCollection = schemaCollection;
+        this.targetNamespacePrefixMap = nsPrefixMap;
+        this.typeTable = typeTable;
+        this.schemaLocationMap = schemaLocMap;
+        this.classLoader = classLoader;
+        this.attrFormDefault = attrFormDef;
+        this.elementFormDefault = eleFormDef;
+        this.factoryClassNames = factoryClassNames;
+  
+        // Register the types in the generated SDO factories
+        this.helperContext = org.apache.tuscany.sdo.api.SDOUtil.createHelperContext();
+        this.xsdHelper = helperContext.getXSDHelper();
+
+        Class factoryClass = null;
+        for (Object factoryClassName : this.factoryClassNames) {
+            try {
+                factoryClass = Class.forName((String)factoryClassName, true, classLoader);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace(); 
+                System.out.println("");
+                System.out.println("Generated SDO Factory class with name: " + factoryClassName + " could not be loaded.  Exiting.");
+                throw new IllegalArgumentException(e); 
+            }
+            registerSDOFactory(factoryClass);
+        }
+   }
+
+    private boolean isSDO(JClass javaType) throws Exception {
+
+        Class sdoClass = Class.forName(javaType.getQualifiedName(), true, classLoader);
+
+        return DataObject.class.isAssignableFrom(sdoClass);
+    }
+
+    private void buildComplexTypeContents_JavaType(JClass javaType,
+                                                   XmlSchemaComplexType complexType,
+                                                   XmlSchema xmlSchema) throws Exception {
+        JProperty[] properties = javaType.getDeclaredProperties();
+
+        for (int i = 0; i < properties.length; i++) {
+            JProperty property = properties[i];
+            String propertyName = property.getType().getQualifiedName();
+            boolean isArryType = property.getType().isArrayType();
+            if (isArryType) {
+                propertyName = property.getType().getArrayComponentType().getQualifiedName();
+            }
+
+            if (typeTable.isSimpleType(propertyName)) {
+                XmlSchemaElement elt1 = new XmlSchemaElement();
+                elt1.setName(getCorrectName(property.getSimpleName()));
+                elt1.setSchemaTypeName(typeTable.getSimpleSchemaTypeName(propertyName));
+                ((XmlSchemaGroupBase) complexType.getParticle()).getItems().add(elt1);
+                if (isArryType) {
+                    elt1.setMaxOccurs(Long.MAX_VALUE);
+                    elt1.setMinOccurs(0);
+                }
+            } else {
+                QName schemaTypeName = null;
+                if (isArryType) {
+                    schemaTypeName = generateSchema(property.getType().getArrayComponentType());
+                } else {
+                    schemaTypeName = generateSchema(property.getType());
+                }
+
+                XmlSchemaElement elt1 = new XmlSchemaElement();
+                elt1.setName(getCorrectName(property.getSimpleName()));
+                elt1.setSchemaTypeName(schemaTypeName);
+                ((XmlSchemaGroupBase) complexType.getParticle()).getItems().add(elt1);
+
+                if (isArryType) {
+                    elt1.setMaxOccurs(Long.MAX_VALUE);
+                    elt1.setMinOccurs(0);
+                }
+
+                addImports(xmlSchema,
+                           schemaTypeName);
+            }
+        }
+    }
+
+    protected QName buildSchema_JavaType(JClass javaType) throws Exception {
+        QName schemaTypeName = typeTable.getComplexSchemaTypeName(javaType, this.classLoader);
+        if (schemaTypeName == null) {
+            String simpleName = javaType.getSimpleName(); 
+
+            String packageName = javaType.getContainingPackage().getQualifiedName();
+
+            String targetNameSpace = 
+            	Java2WSDLUtils.schemaNamespaceFromClassName(javaType.getQualifiedName(), this.classLoader)
+                                                   .toString();
+
+            XmlSchema xmlSchema = getXmlSchema(targetNameSpace);
+            String targetNamespacePrefix = (String) targetNamespacePrefixMap.get(targetNameSpace);
+
+            schemaTypeName = new QName(targetNameSpace, simpleName, targetNamespacePrefix);
+            XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+            complexType.setName(simpleName);
+
+            XmlSchemaSequence sequence = new XmlSchemaSequence();
+            complexType.setParticle(sequence);
+
+            createGlobalElement(xmlSchema,
+                                complexType,
+                                schemaTypeName);
+            xmlSchema.getItems().add(complexType);
+            xmlSchema.getSchemaTypes().add(schemaTypeName,
+                                           complexType);
+
+            // adding this type to the table
+            // typeTable.addComplexScheam(name, complexType.getQName());
+            typeTable.addComplexSchemaType(targetNameSpace,
+                                           simpleName,
+                                           schemaTypeName);
+            buildComplexTypeContents_JavaType(javaType,
+                                              complexType,
+                                              xmlSchema);
+        }
+        return schemaTypeName;
+    }
+
+    protected QName buildSchema_SDO(Type dataType) // throws Exception
+    {
+        QName schemaTypeName = typeTable.getComplexSchemaTypeName(dataType.getURI(),
+                                                                  dataType.getName());
+
+        if (schemaTypeName == null) {
+            // We can't load the XSDs into an XSDHelper and match them against the static SDOs; they will
+            // never match.  Instead let's take an all-or-nothing approach and say, if we've got this NS
+            // in our map then we assume we have this Type as well in the corresponding XSD file.  
+            //
+            boolean inXSDForm = schemaLocationMap.get(dataType.getURI()) != null;
+
+            if (inXSDForm) {
+                // if schemalocations for XSD has been specified, include them
+
+                // External XSDs will be handled in processing the schema TNS of the wrapper elements.
+                // This is partly because SDO codegen needs some modification in this area 
+                // So we won't bother including the external XSDs here at all.
+                //
+                //  includeExtXSD(dataType);
+            } else {
+                List<Type> typeList = new Vector<Type>();
+                typeList.add(dataType);
+
+                // the xsdhelper returns a string that contains the schemas for this type
+                String schemaDefns = xsdHelper.generate(typeList, schemaLocationMap);
+
+                // extract the schema elements and store them in the schema map
+                extractSchemas(schemaDefns);
+            }
+            // since the XSDHelper will not return the type name, create it and store it in typetable
+            schemaTypeName = new QName(dataType.getURI(), dataType.getName(), generatePrefix());
+            typeTable.addComplexSchemaType(dataType.getURI(),
+                                           dataType.getName(),
+                                           schemaTypeName);
+
+        }
+        return schemaTypeName;
+    }
+
+    /**
+     * Identify the java type (pojo versus sdo) and build the schema accordingly
+     * 
+     * @param javaType reference to the class
+     * @return
+     * @throws Exception
+     */
+    public QName generateSchema(JClass javaType) throws Exception {
+        if (isSDO(javaType)) {
+            Type dataType = createDataObject(javaType).getType();
+            return buildSchema_SDO(dataType);
+        } else {
+            return buildSchema_JavaType(javaType);
+        }
+    }
+
+    private XmlSchema getXmlSchema(String targetNamespace) {
+        XmlSchema xmlSchema;
+
+        if ((xmlSchema = (XmlSchema) schemaMap.get(targetNamespace)) == null) {
+            String targetNamespacePrefix = generatePrefix();
+
+            xmlSchema = new XmlSchema(targetNamespace, xmlSchemaCollection);
+            xmlSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
+            xmlSchema.setElementFormDefault(getElementFormDefaultSetting());
+
+            targetNamespacePrefixMap.put(targetNamespace, targetNamespacePrefix);
+            schemaMap.put(targetNamespace, xmlSchema);
+
+            NamespaceMap prefixmap = new NamespaceMap();
+            prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX, TuscanyTypeTable.XML_SCHEMA_URI);
+            prefixmap.put(targetNamespacePrefix, targetNamespace);
+            xmlSchema.setNamespaceContext(prefixmap);
+        }
+        return xmlSchema;
+    }
+
+    /**
+     * JAM convert first name of an attribute into UpperCase as an example if there is a instance variable called foo in a bean , then Jam give that
+     * as Foo so this method is to correct that error
+     * 
+     * @param wrongName
+     * @return the right name, using English as the locale for case conversion
+     */
+    public static String getCorrectName(String wrongName) {
+        if (wrongName.length() > 1) {
+            return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH) + wrongName.substring(1, wrongName.length());
+        } else {
+            return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH);
+        }
+    }
+
+    private String addImports(XmlSchema xmlSchema, QName schemaTypeName) {
+        String prefix = null;
+        String[] prefixes = xmlSchema.getNamespaceContext().getDeclaredPrefixes();
+        for (int count = 0; count < prefixes.length; ++count) {
+            if (schemaTypeName.getNamespaceURI().
+                    equals(xmlSchema.getNamespaceContext().getNamespaceURI(prefixes[count])) ) {
+                return prefixes[count];
+            }
+        }
+
+        XmlSchemaImport importElement = new XmlSchemaImport();
+        importElement.setNamespace(schemaTypeName.getNamespaceURI());
+        xmlSchema.getItems().add(importElement);
+        prefix = generatePrefix();
+        //it is safe to cast like this since it was this class that instantiated the
+        //NamespaceContext and assigned it to an instance of a NamespaceMap (see method getXmlSchema)
+        ((NamespaceMap)xmlSchema.getNamespaceContext()).put(prefix,
+                                                schemaTypeName.getNamespaceURI());
+
+        return prefix;
+    }
+
+    private String formGlobalElementName(String typeName) {
+        String firstChar = typeName.substring(0, 1);
+        return typeName.replaceFirst(firstChar, firstChar.toLowerCase());
+    }
+
+    private void createGlobalElement(XmlSchema xmlSchema, XmlSchemaComplexType complexType, QName elementName) {
+        XmlSchemaElement globalElement = new XmlSchemaElement();
+        globalElement.setSchemaTypeName(complexType.getQName());
+        globalElement.setName(formGlobalElementName(complexType.getName()));
+        globalElement.setQName(elementName);
+
+        xmlSchema.getItems().add(globalElement);
+        xmlSchema.getElements().add(elementName, globalElement);
+    }
+
+    private DataObject createDataObject(JClass sdoClass) throws Exception {
+        Class sdoType = Class.forName(sdoClass.getQualifiedName(), true, classLoader);
+
+        //register the factory
+        detectAndRegisterFactory(sdoType);
+        
+        //create data object
+        Constructor constructor = sdoType.getDeclaredConstructor(new Class[0]);
+        constructor.setAccessible(true);
+        Object instance = constructor.newInstance(new Object[0]);
+        return (DataObject) instance;
+    }
+
+    private String generatePrefix() {
+        return NAME_SPACE_PREFIX + prefixCount++;
+    }
+
+    private void includeExtXSD(Type dataType) {
+        // now we know there is a type for which the XSD must come from outside
+        // create a schema for the namespace of this type and add an include in it for
+        // the xsd that is defined externally
+        XmlSchema xmlSchema = getXmlSchema(dataType.getURI());
+
+        // ideally there could be more than one external schema definitions for a namespace
+        // and hence schemalocations will be a list of locations
+        // List schemaLocations = (List)schemaLocationMap.get(dataType.getURI());
+
+        // since as per the specs the input to XSDHelper is a map of <String, String> allowing
+        // only one schemalocation for a namespace. So for now this single location will be
+        // picked up and put into a list
+        List schemaLocations = new Vector();
+
+        if (schemaLocationMap.get(dataType.getURI()) != null) {
+            schemaLocations.add(schemaLocationMap.get(dataType.getURI()));
+        }
+
+        if (schemaLocations.size() <= 0) {
+            schemaLocations.add(DEFAULT_SCHEMA_LOCATION);
+        }
+
+        Iterator includesIterator = xmlSchema.getIncludes().getIterator();
+        Iterator schemaLocIterator = schemaLocations.iterator();
+        String aSchemaLocation = null;
+        boolean includeExists = false;
+        // include all external schema locations
+        while (schemaLocIterator.hasNext()) {
+            aSchemaLocation = (String) schemaLocIterator.next();
+            while (includesIterator.hasNext()) {
+                if (!includeExists
+                        && aSchemaLocation.equals(((XmlSchemaInclude) includesIterator.next()).getSchemaLocation())) {
+                    includeExists = true;
+                }
+            }
+
+            if (!includeExists) {
+                XmlSchemaInclude includeElement = new XmlSchemaInclude();
+                includeElement.setSchemaLocation(aSchemaLocation);
+                xmlSchema.getIncludes().add(includeElement);
+                xmlSchema.getItems().add(includeElement);
+            }
+        }
+
+    }
+
+    private void extractSchemas(String schemaDefns) {
+        // load each schema element and add it to the schema map
+
+        String token = getToken(schemaDefns);
+        int curIndex = schemaDefns.indexOf(token);
+        int nextIndex = schemaDefns.indexOf(token,
+                                            curIndex + token.length());
+
+        while (curIndex != -1) {
+            StringReader sr = null;
+            if (nextIndex != -1)
+                sr = new StringReader(schemaDefns.substring(curIndex,
+                                                            nextIndex));
+            else
+                sr = new StringReader(schemaDefns.substring(curIndex));
+
+            XmlSchemaCollection collection = new XmlSchemaCollection();
+            XmlSchema aSchema = collection.read(sr,
+                                                null);
+            addSchemaToMap(aSchema);
+
+            curIndex = nextIndex;
+            nextIndex = schemaDefns.indexOf(token,
+                                            curIndex + token.length());
+        }
+    }
+
+    private void addSchemaToMap(XmlSchema extractedSchema) {
+        // check if a Schema object already exists in schema map for targetNamespace of this schema element
+        // if it does then copy the contents of this schema element to the existing one, ensuring that
+        // duplicate elements are not created. i.e. before adding some child element like 'include' or 'import'
+        // check if it already exists, if it does don't add this
+        XmlSchema existingSchema = (XmlSchema) schemaMap.get(extractedSchema.getTargetNamespace());
+
+        if (existingSchema == null) {
+            extractedSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
+            extractedSchema.setElementFormDefault(getElementFormDefaultSetting());
+            schemaMap.put(extractedSchema.getTargetNamespace(), extractedSchema);
+
+        } else {
+            copySchemaItems(existingSchema,
+                            extractedSchema);
+        }
+    }
+
+    private void copySchemaItems(XmlSchema existingSchema, XmlSchema aSchema) {
+        // items to copy are imports, includes, elements, types ...
+        // each item is checked if it is a duplicate entry and copied only if it isn't
+        Iterator itemsIterator = aSchema.getItems().getIterator();
+        Object schemaObject = null;
+        XmlSchemaElement schemaElement = null;
+        XmlSchemaType schemaType = null;
+        XmlSchemaInclude schemaInclude = null;
+        QName qName = null;
+        List existingIncludes = getExistingIncludes(existingSchema);
+
+        while (itemsIterator.hasNext()) {
+            schemaObject = itemsIterator.next();
+            if (schemaObject instanceof XmlSchemaElement) {
+                schemaElement = (XmlSchemaElement) schemaObject;
+                qName = schemaElement.getQName();
+                // if the element does not exist in the existing schema
+                if (existingSchema.getElementByName(qName) == null) {
+                    // add it to the existing schema
+                    existingSchema.getElements().add(qName, schemaElement);
+                    existingSchema.getItems().add(schemaElement);
+                }
+            } else if (schemaObject instanceof XmlSchemaType) {
+                schemaType = (XmlSchemaType) itemsIterator.next();
+                qName = schemaType.getQName();
+                // if the element does not exist in the existing schema
+                if (existingSchema.getElementByName(qName) == null) {
+                    // add it to the existing schema
+                    existingSchema.getSchemaTypes().add(qName, schemaType);
+                    existingSchema.getItems().add(schemaType);
+                    // add imports
+                    addImports(existingSchema, qName);
+                }
+            } else if (schemaObject instanceof XmlSchemaInclude) {
+                schemaInclude = (XmlSchemaInclude) itemsIterator.next();
+                if (!existingIncludes.contains(schemaInclude.getSchemaLocation())) {
+                    existingSchema.getIncludes().add(schemaInclude);
+                    existingSchema.getItems().add(schemaInclude);
+                }
+            }
+        }
+    }
+
+    private List getExistingIncludes(XmlSchema xmlSchema) {
+        List includeSchemaLocations = new Vector();
+        Iterator iterator = xmlSchema.getIncludes().getIterator();
+
+        while (iterator.hasNext()) {
+            includeSchemaLocations.add(((XmlSchemaInclude) iterator.next()).getSchemaLocation());
+        }
+        return includeSchemaLocations;
+    }
+
+    private XmlSchemaForm getAttrFormDefaultSetting() {
+        if (FORM_DEFAULT_UNQUALIFIED.equals(getAttrFormDefault())) {
+            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+        } else {
+            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+        }
+    }
+
+    private XmlSchemaForm getElementFormDefaultSetting() {
+        if (FORM_DEFAULT_UNQUALIFIED.equals(getElementFormDefault())) {
+            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+        } else {
+            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+        }
+    }
+
+    private String getToken(String s) {
+        // get the schema element name e.g. <xs:schema or <xsd:schema. We only know that 'schema' will be used
+        // but not sure what suffix is used. Hence this method to get the actual element name used
+        int i = s.indexOf(SCHEMA_ELEMENT_NAME);
+        int j = s.substring(0,
+                            i).lastIndexOf("<");
+        return s.substring(j,
+                           i + SCHEMA_ELEMENT_NAME.length());
+    }
+
+    public String getAttrFormDefault() {
+        return attrFormDefault;
+    }
+
+    public void setAttrFormDefault(String attrFormDefault) {
+        this.attrFormDefault = attrFormDefault;
+    }
+
+    public String getElementFormDefault() {
+        return elementFormDefault;
+    }
+
+    public void setElementFormDefault(String elementFormDefault) {
+        this.elementFormDefault = elementFormDefault;
+    }
+
+    private static String getPackageName(Class<?> cls) {
+        String name = cls.getName();
+        int index = name.lastIndexOf('.');
+        return index == -1 ? "" : name.substring(0, index);
+    }
+    
+    /**
+     * Recognize the pattern of generated SDO type names vs. SDO factory names.
+     * E.g. SDO class:   test.sca.w2j.gen.Company will be associated with 
+     *      SDO factory: test.sca.w2j.gen.GenFactory
+     */
+    private void detectAndRegisterFactory(Class sdoClass) {
+        String pkgName = getPackageName(sdoClass);
+
+        // Find last segment, e.g. from 'test.sca.w2j.gen' produce 'gen'.
+        int lastDot = pkgName.lastIndexOf('.');
+        String lastSegment = pkgName.substring(lastDot+1);
+
+        String rest = lastSegment.substring(1);
+        String firstChar = lastSegment.substring(0,1).toUpperCase();
+
+        String factoryBaseName = pkgName + "." + firstChar + rest + "Factory";
+
+        Class factoryClass = null;
+        try {
+            factoryClass = Class.forName(factoryBaseName, true, classLoader);
+            if (!alreadyPrintedDefaultSDOFactoryFound) {
+                System.out.println("Found default generated SDO Factory with name: " + factoryBaseName + "; Registering.");
+                alreadyPrintedDefaultSDOFactoryFound = true;
+            }
+            registerSDOFactory(factoryClass);
+        } catch (ClassNotFoundException e) {
+            if (!alreadyPrintedDefaultSDOFactoryNotFound) {
+                System.out.println("Did not find default generated SDO Factory with name: " + factoryBaseName + "; Continue." );
+                alreadyPrintedDefaultSDOFactoryNotFound = true;
+            }
+        }
+    }
+
+    private void registerSDOFactory(Class factoryClass) {
+        String factoryClassName = factoryClass.getName();
+        if (!registeredSDOFactories.contains(factoryClassName)) {
+            try {                
+                Field field = factoryClass.getField("INSTANCE");
+                Object factoryImpl = field.get(null);
+                Method method = factoryImpl.getClass().getMethod("register", new Class[] {HelperContext.class});
+                method.invoke(factoryImpl, new Object[] {this.helperContext});
+            } catch (Exception e) { 
+                e.printStackTrace(); 
+                System.out.println("");
+                System.out.println("Fatal error registering factoryClassName = " + factoryClassName);
+                throw new IllegalArgumentException(e); 
+            }
+            registeredSDOFactories.add(factoryClassName);
+        }
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
new file mode 100644
index 0000000000..fd10c77f8b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
@@ -0,0 +1,429 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.codehaus.jam.JMethod;
+
+public class TuscanyJava2OMBuilder implements TuscanyJava2WSDLConstants {
+
+    private TuscanyTypeTable typeTable = null;
+
+    private static int prefixCount = 1;
+
+    private static final String NAMESPACE_PREFIX = "ns";
+
+    private JMethod method[];
+
+    private Collection schemaCollection;
+
+    private GenerationParameters generationParams;
+
+    private OMNamespace ns1;
+
+    private OMNamespace soap;
+
+    private OMNamespace soap12;
+
+    private OMNamespace tns;
+
+    private OMNamespace wsdl;
+
+    private OMNamespace mime;
+
+    private OMNamespace http;
+
+    public TuscanyJava2OMBuilder(JMethod[] method,
+                                 Collection schemaCollection,
+                                 TuscanyTypeTable typeTab,
+                                 GenerationParameters genParams) {
+        this.method = method;
+        this.schemaCollection = schemaCollection;
+        this.typeTable = typeTab;
+        this.generationParams = genParams;
+    }
+
+    public OMElement generateOM() throws Exception {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        wsdl = fac.createOMNamespace(WSDL_NAMESPACE, DEFAULT_WSDL_NAMESPACE_PREFIX);
+        OMElement ele = fac.createOMElement("definitions", wsdl);
+
+        ele.addAttribute("targetNamespace", generationParams.getTargetNamespace(), null);
+        generateNamespaces(fac, ele);
+        generateTypes(fac, ele);
+        generateMessages(fac, ele);
+        generatePortType(fac, ele);
+        generateBinding(fac, ele);
+        generateService(fac, ele);
+        return ele;
+    }
+
+    private void generateNamespaces(OMFactory fac, OMElement defintions) throws Exception {
+        soap = defintions.declareNamespace(URI_WSDL11_SOAP, SOAP11_PREFIX);
+        tns =
+            defintions.declareNamespace(generationParams.getTargetNamespace(), generationParams
+                .getTargetNamespacePrefix());
+        soap12 = defintions.declareNamespace(URI_WSDL12_SOAP, SOAP12_PREFIX);
+        http = defintions.declareNamespace(HTTP_NAMESPACE, HTTP_PREFIX);
+        mime = defintions.declareNamespace(MIME_NAMESPACE, MIME_PREFIX);
+    }
+
+    private void generateTypes(OMFactory fac, OMElement defintions) throws Exception {
+        OMElement wsdlTypes = fac.createOMElement("types", wsdl);
+        StringWriter writer = new StringWriter();
+
+        // wrap the Schema elements with this start and end tags to create a
+        // document root
+        // under which the schemas can fall into
+        writer.write("<xmlSchemas>");
+        writeSchemas(writer);
+        writer.write("</xmlSchemas>");
+
+        XMLStreamReader xmlReader =
+            XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(writer.toString().getBytes()));
+
+        StAXOMBuilder staxOMBuilders = new StAXOMBuilder(fac, xmlReader);
+        OMElement documentElement = staxOMBuilders.getDocumentElement();
+
+        Iterator iterator = documentElement.getChildElements();
+        while (iterator.hasNext()) {
+            wsdlTypes.addChild((OMNode)iterator.next());
+        }
+        defintions.addChild(wsdlTypes);
+    }
+
+    private void writeSchemas(StringWriter writer) {
+        Iterator iterator = schemaCollection.iterator();
+        XmlSchema xmlSchema = null;
+
+        while (iterator.hasNext()) {
+            xmlSchema = (XmlSchema)iterator.next();
+            // typeIterator = xmlSchema.getSchemaTypes().getValues();
+            /*
+             * while (typeIterator.hasNext()) {
+             * xmlSchema.getItems().add((XmlSchemaObject) typeIterator.next()); }
+             */
+            xmlSchema.write(writer);
+        }
+    }
+
+    private void generateMessages(OMFactory fac, OMElement definitions) throws Exception {
+        Hashtable namespaceMap = new Hashtable();
+        String namespacePrefix = null;
+        String namespaceURI = null;
+        QName messagePartType = null;
+        for (int i = 0; i < method.length; i++) {
+            JMethod jmethod = method[i];
+
+            if (jmethod.isPublic()) {
+                // Request Message
+                OMElement requestMessge = fac.createOMElement(MESSAGE_LOCAL_NAME, wsdl);
+                requestMessge.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + MESSAGE_SUFFIX, null);
+                definitions.addChild(requestMessge);
+
+                // only if a type for the message part has already been defined
+                if ((messagePartType =
+                    typeTable.getComplexSchemaTypeName(generationParams.getSchemaTargetNamespace(), jmethod
+                        .getSimpleName())) != null) {
+                    namespaceURI = messagePartType.getNamespaceURI();
+                    // avoid duplicate namespaces
+                    if ((namespacePrefix = (String)namespaceMap.get(namespaceURI)) == null) {
+                        namespacePrefix = generatePrefix();
+                        namespaceMap.put(namespaceURI, namespacePrefix);
+                    }
+
+                    OMElement requestPart = fac.createOMElement(PART_ATTRIBUTE_NAME, wsdl);
+                    requestMessge.addChild(requestPart);
+                    requestPart.addAttribute(ATTRIBUTE_NAME, "part1", null);
+
+                    requestPart.addAttribute(ELEMENT_ATTRIBUTE_NAME, namespacePrefix + COLON_SEPARATOR
+                        + jmethod.getSimpleName(), null);
+                }
+
+                // only if a type for the message part has already been defined
+                if ((messagePartType =
+                    typeTable.getComplexSchemaTypeName(generationParams.getSchemaTargetNamespace(), jmethod
+                        .getSimpleName() + RESPONSE)) != null) {
+                    namespaceURI = messagePartType.getNamespaceURI();
+                    if ((namespacePrefix = (String)namespaceMap.get(namespaceURI)) == null) {
+                        namespacePrefix = generatePrefix();
+                        namespaceMap.put(namespaceURI, namespacePrefix);
+                    }
+                    // Response Message
+                    OMElement responseMessge = fac.createOMElement(MESSAGE_LOCAL_NAME, wsdl);
+                    responseMessge.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + RESPONSE_MESSAGE, null);
+                    definitions.addChild(responseMessge);
+                    OMElement responsePart = fac.createOMElement(PART_ATTRIBUTE_NAME, wsdl);
+                    responseMessge.addChild(responsePart);
+                    responsePart.addAttribute(ATTRIBUTE_NAME, "part1", null);
+
+                    responsePart.addAttribute(ELEMENT_ATTRIBUTE_NAME, namespacePrefix + COLON_SEPARATOR
+                        + jmethod.getSimpleName()
+                        + RESPONSE, null);
+                }
+            }
+        }
+
+        // now add these unique namespaces to the the definitions element
+        Enumeration enumeration = namespaceMap.keys();
+        while (enumeration.hasMoreElements()) {
+            namespaceURI = (String)enumeration.nextElement();
+            definitions.declareNamespace(namespaceURI, (String)namespaceMap.get(namespaceURI));
+        }
+    }
+
+    /**
+     * Generate the porttypes
+     */
+    private void generatePortType(OMFactory fac, OMElement defintions) {
+        JMethod jmethod = null;
+        OMElement operation = null;
+        OMElement message = null;
+        OMElement portType = fac.createOMElement(PORT_TYPE_LOCAL_NAME, wsdl);
+        defintions.addChild(portType);
+        // changed default PortType name to match Java interface name
+        // instead of appending "PortType".
+        portType.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName(), null);
+        // adding message refs
+        for (int i = 0; i < method.length; i++) {
+            jmethod = method[i];
+
+            if (jmethod.isPublic()) {
+                operation = fac.createOMElement(OPERATION_LOCAL_NAME, wsdl);
+                portType.addChild(operation);
+                operation.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName(), null);
+
+                message = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
+                message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
+                    + jmethod.getSimpleName()
+                    + MESSAGE_SUFFIX, null);
+                operation.addChild(message);
+
+                if (!jmethod.getReturnType().isVoidType() ||
+                    jmethod.getAnnotation("org.osoa.sca.annotations.OneWay") == null) {
+                    message = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
+                    message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
+                        + jmethod.getSimpleName()
+                        + RESPONSE_MESSAGE, null);
+                    operation.addChild(message);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Generate the service
+     */
+    public void generateService(OMFactory fac, OMElement defintions) {
+        OMElement service = fac.createOMElement(SERVICE_LOCAL_NAME, wsdl);
+        defintions.addChild(service);
+        // Add "WebService" to the end of WSDL service name
+        service.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + WSDL_SERVICE_SUFFIX, null);
+        OMElement port = fac.createOMElement(PORT, wsdl);
+        service.addChild(port);
+        port.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + SOAP11PORT, null);
+        port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
+            + generationParams.getServiceName()
+            + BINDING_NAME_SUFFIX, null);
+        addExtensionElement(fac,
+                            port,
+                            soap,
+                            SOAP_ADDRESS,
+                            LOCATION,
+                            generationParams.getLocationUri() + generationParams.getServiceName());
+
+        port = fac.createOMElement(PORT, wsdl);
+        service.addChild(port);
+        port.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + SOAP12PORT, null);
+        port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
+            + generationParams.getServiceName()
+            + SOAP12BINDING_NAME_SUFFIX, null);
+        addExtensionElement(fac,
+                            port,
+                            soap12,
+                            SOAP_ADDRESS,
+                            LOCATION,
+                            generationParams.getLocationUri() + generationParams.getServiceName());
+    }
+
+    /**
+     * Generate the bindings
+     */
+    private void generateBinding(OMFactory fac, OMElement defintions) throws Exception {
+        generateSoap11Binding(fac, defintions);
+        generateSoap12Binding(fac, defintions);
+    }
+
+    private void generateSoap11Binding(OMFactory fac, OMElement defintions) throws Exception {
+        OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
+        defintions.addChild(binding);
+        binding.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + BINDING_NAME_SUFFIX, null);
+        // changed default PortType name to match Java interface name
+        // instead of appending "PortType".
+        binding.addAttribute("type", tns.getPrefix() + COLON_SEPARATOR + generationParams.getServiceName(), null);
+
+        addExtensionElement(fac, binding, soap, BINDING_LOCAL_NAME, TRANSPORT, TRANSPORT_URI, STYLE, generationParams
+            .getStyle());
+
+        for (int i = 0; i < method.length; i++) {
+            JMethod jmethod = method[i];
+            if (jmethod.isPublic()) {
+                OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME, wsdl);
+                binding.addChild(operation);
+
+                addExtensionElement(fac,
+                                    operation,
+                                    soap,
+                                    OPERATION_LOCAL_NAME,
+                                    SOAP_ACTION,
+                                    URN_PREFIX + COLON_SEPARATOR + jmethod.getSimpleName(),
+                                    STYLE,
+                                    generationParams.getStyle());
+                operation.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName(), null);
+
+                OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
+                addExtensionElement(fac,
+                                    input,
+                                    soap,
+                                    SOAP_BODY,
+                                    SOAP_USE,
+                                    generationParams.getUse(),
+                                    "namespace",
+                                    generationParams.getTargetNamespace());
+                operation.addChild(input);
+
+                if (!jmethod.getReturnType().isVoidType()) {
+                    OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
+                    addExtensionElement(fac,
+                                        output,
+                                        soap,
+                                        SOAP_BODY,
+                                        SOAP_USE,
+                                        generationParams.getUse(),
+                                        "namespace",
+                                        generationParams.getTargetNamespace());
+                    operation.addChild(output);
+                }
+            }
+        }
+    }
+
+    private void generateSoap12Binding(OMFactory fac, OMElement defintions) throws Exception {
+        OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
+        defintions.addChild(binding);
+        binding.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + SOAP12BINDING_NAME_SUFFIX, null);
+        // changed default PortType name to match Java interface name
+        // instead of appending "PortType".
+        binding.addAttribute("type", tns.getPrefix() + COLON_SEPARATOR + generationParams.getServiceName(), null);
+
+        addExtensionElement(fac, binding, soap12, BINDING_LOCAL_NAME, TRANSPORT, TRANSPORT_URI, STYLE, generationParams
+            .getStyle());
+
+        for (int i = 0; i < method.length; i++) {
+            JMethod jmethod = method[i];
+
+            if (jmethod.isPublic()) {
+                OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME, wsdl);
+                binding.addChild(operation);
+                operation.declareNamespace(URI_WSDL12_SOAP, SOAP12_PREFIX);
+
+                addExtensionElement(fac,
+                                    operation,
+                                    soap12,
+                                    OPERATION_LOCAL_NAME,
+                                    SOAP_ACTION,
+                                    URN_PREFIX + COLON_SEPARATOR + jmethod.getSimpleName(),
+                                    STYLE,
+                                    generationParams.getStyle());
+                operation.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName(), null);
+
+                OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
+                addExtensionElement(fac,
+                                    input,
+                                    soap12,
+                                    SOAP_BODY,
+                                    SOAP_USE,
+                                    generationParams.getUse(),
+                                    "namespace",
+                                    generationParams.getTargetNamespace());
+                operation.addChild(input);
+
+                if (!jmethod.getReturnType().isVoidType()) {
+                    OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
+                    addExtensionElement(fac,
+                                        output,
+                                        soap12,
+                                        SOAP_BODY,
+                                        SOAP_USE,
+                                        generationParams.getUse(),
+                                        "namespace",
+                                        generationParams.getTargetNamespace());
+                    operation.addChild(output);
+                }
+            }
+        }
+    }
+
+    private void addExtensionElement(OMFactory fac,
+                                     OMElement element,
+                                     OMNamespace namespace,
+                                     String name,
+                                     String att1Name,
+                                     String att1Value,
+                                     String att2Name,
+                                     String att2Value) {
+        OMElement soapbinding = fac.createOMElement(name, namespace);
+        element.addChild(soapbinding);
+        soapbinding.addAttribute(att1Name, att1Value, null);
+        soapbinding.addAttribute(att2Name, att2Value, null);
+    }
+
+    private void addExtensionElement(OMFactory fac,
+                                     OMElement element,
+                                     OMNamespace namespace,
+                                     String name,
+                                     String att1Name,
+                                     String att1Value) {
+        OMElement soapbinding = fac.createOMElement(name, namespace);
+        element.addChild(soapbinding);
+        soapbinding.addAttribute(att1Name, att1Value, null);
+    }
+
+    private String generatePrefix() {
+        return NAMESPACE_PREFIX + prefixCount++;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
new file mode 100644
index 0000000000..18cfafa4e3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
@@ -0,0 +1,81 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+
+public class TuscanyJava2WSDLBuilder implements Java2WSDLConstants {
+
+    private OutputStream out;
+    private String className;
+    private ClassLoader classLoader;
+    private String wsdlPrefix = "wsdl";
+
+    // these apply for the WSDL
+    private GenerationParameters generationParams;
+
+    private OMElement wsdlDocument = null;
+
+    public String getWsdlPrefix() {
+        return wsdlPrefix;
+    }
+
+    public void setWsdlPrefix(String wsdlPrefix) {
+        this.wsdlPrefix = wsdlPrefix;
+    }
+
+    public TuscanyJava2WSDLBuilder(GenerationParameters genParams) {
+        this.generationParams = genParams;
+    }
+
+    /**
+     * Externally visible generator method
+     * 
+     * @throws Exception
+     */
+    public void buildWSDL() throws Exception {
+        ArrayList excludeOpeartion = new ArrayList();
+        excludeOpeartion.add("init");
+        excludeOpeartion.add("setOperationContext");
+        excludeOpeartion.add("destroy");
+
+        TuscanyWSDLTypesGenerator typesGenerator = new TuscanyWSDLTypesGenerator(generationParams);
+        typesGenerator.setExcludeMethods(excludeOpeartion);
+        Collection schemaCollection = typesGenerator.buildWSDLTypes();
+
+        TuscanyJava2OMBuilder java2OMBuilder =
+            new TuscanyJava2OMBuilder(typesGenerator.getMethods(), schemaCollection, typesGenerator
+                .getTypeTable(), generationParams);
+
+        wsdlDocument = java2OMBuilder.generateOM();
+    }
+
+    public OMElement getWsdlDocument() {
+        return wsdlDocument;
+    }
+
+    public void setWsdlDocument(OMElement wsdlDocument) {
+        this.wsdlDocument = wsdlDocument;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
new file mode 100644
index 0000000000..3750dc27f5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
@@ -0,0 +1,56 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+
+/**
+ * This is a extension from the Axis2 Java2WSDLConstants to handle additions specific to Tuscany.
+ * This class can be done away with once Axis2 is also enhanced to support these 
+ * additional options. 
+ *
+ */
+public interface TuscanyJava2WSDLConstants extends Java2WSDLConstants 
+{
+    public static final char OPEN_BRACKET = '[';
+    public static final char COMMA = ',';
+    public static final char CLOSE_BRACKET = ']';
+    public static final String DEFAULT_SCHEMA_LOCATION = "*.xsd";
+    public static final String SCHEMA_ELEMENT_NAME = "schema";
+    
+    String FORM_DEFAULT_QUALIFIED = "qualified";
+    String FORM_DEFAULT_UNQUALIFIED = "unqualified";
+    
+    //short options
+    String IMPORT_XSD_OPTION = "ixsd";      //option for importing XSDs
+    String ATTR_FORM_DEFAULT_OPTION = "afd";
+    String ELEMENT_FORM_DEFAULT_OPTION = "efd";
+    String EXTRA_CLASSES_DEFAULT_OPTION = "xc";
+    String FACTORY_CLASSNAMES_OPTION = "fcn";
+    
+    //long options
+    String IMPORT_XSD_OPTION_LONG = "import_xsd";       //option for importing XSDs
+    String ATTR_FORM_DEFAULT_OPTION_LONG = "attributeFormDefault";
+    String ELEMENT_FORM_DEFAULT_OPTION_LONG = "elementFormDefault";
+    String EXTRA_CLASSES_DEFAULT_OPTION_LONG = "extraClasses";
+    String FACTORY_CLASSNAMES_OPTION_LONG = "factoryClassNames";
+    
+    //  This is a new creation, not an override.
+    String WSDL_SERVICE_SUFFIX = "WebService";
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
new file mode 100644
index 0000000000..d6cd8a7f57
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
@@ -0,0 +1,73 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.util.ArrayList;
+
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
+
+/**
+ * This class is an extension from the Axis2 implementation in order to handle
+ * additional options specific to Tuscany. This class can be done away with once
+ * Axis2 is also enhanced to support these additional options.
+ */
+public class TuscanyJava2WSDLOptionsValidator extends Java2WSDLOptionsValidator implements TuscanyJava2WSDLConstants {
+    @Override
+    public boolean isInvalid(Java2WSDLCommandLineOption option) {
+        boolean invalid;
+        String optionType = option.getOptionType();
+
+        invalid =
+            !((IMPORT_XSD_OPTION).equalsIgnoreCase(optionType) || (IMPORT_XSD_OPTION_LONG).equalsIgnoreCase(optionType)
+                || (TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION_LONG).equalsIgnoreCase(optionType)
+                || (TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION).equalsIgnoreCase(optionType)
+                || (TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION_LONG).equalsIgnoreCase(optionType)
+                || (TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION).equalsIgnoreCase(optionType) || !super
+                .isInvalid(option));
+
+        invalid = validateImportXSDOption(invalid, option);
+
+        return invalid;
+    }
+
+    private boolean validateImportXSDOption(boolean invalid, Java2WSDLCommandLineOption option) {
+        String optionType = option.getOptionType();
+        String schemaNSLocationPair = null;
+
+        if (!invalid && (IMPORT_XSD_OPTION).equalsIgnoreCase(optionType)
+            || (IMPORT_XSD_OPTION_LONG).equalsIgnoreCase(optionType)) {
+            ArrayList optionValues = option.getOptionValues();
+
+            for (int count = 0; count < optionValues.size(); ++count) {
+                schemaNSLocationPair = ((String)optionValues.get(count)).trim();
+                if ((schemaNSLocationPair.charAt(0) != OPEN_BRACKET) || (schemaNSLocationPair
+                    .charAt(schemaNSLocationPair.length() - 1) != CLOSE_BRACKET)
+                    || (schemaNSLocationPair.indexOf(COMMA) == -1))
+
+                {
+                    System.out.println("Schema Namespace-Location pair option not specified properly!!");
+                    invalid = true;
+                }
+            }
+        }
+
+        return invalid;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
new file mode 100644
index 0000000000..03291428a2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
@@ -0,0 +1,348 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.description.java2wsdl.bytecode.MethodTable;
+import org.apache.tuscany.sdo.util.DataObjectUtil;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaForm;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaInclude;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.utils.NamespaceMap;
+import org.codehaus.jam.JClass;
+import org.codehaus.jam.JMethod;
+import org.codehaus.jam.JParameter;
+import org.codehaus.jam.JamClassIterator;
+import org.codehaus.jam.JamService;
+import org.codehaus.jam.JamServiceFactory;
+import org.codehaus.jam.JamServiceParams;
+
+public class TuscanySchemaGenerator implements TuscanyJava2WSDLConstants {
+    public static final String NAME_SPACE_PREFIX = "stn_";
+    public static final String PERIOD_SEPARATOR = ".";
+    private static int prefixCount = 1;
+
+    protected String attrFormDefault = null;
+    protected String elementFormDefault = null;
+    protected Hashtable targetNamespacePrefixMap = new Hashtable();
+    protected Hashtable schemaMap = new Hashtable();
+    protected Hashtable sdoAnnoMap = new Hashtable();
+    protected XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
+    private TuscanyTypeTable typeTable = new TuscanyTypeTable();
+    protected SchemaBuilder schemaBuilder = null;
+    protected Map schemaLocationMap = null;
+
+    private ClassLoader classLoader;
+    private String className;
+
+    // to keep loaded method using JAM
+    private JMethod methods[];
+
+    // to store byte code method using Axis 1.x codes
+    private MethodTable methodTable;
+    private String schemaTargetNameSpace;
+    private String schema_namespace_prefix;
+    private Class clazz;
+    private ArrayList excludeMethods = new ArrayList();
+
+    public TuscanySchemaGenerator(ClassLoader loader,
+                                  String className,
+                                  String schematargetNamespace,
+                                  String schematargetNamespacePrefix,
+                                  Map schemaLocMap) throws Exception {
+        DataObjectUtil.initRuntime();
+        this.classLoader = loader;
+        this.className = className;
+        clazz = Class.forName(className, true, loader);
+        methodTable = new MethodTable(clazz);
+        this.schemaTargetNameSpace = schematargetNamespace;
+        this.schema_namespace_prefix = schematargetNamespacePrefix;
+        this.schemaLocationMap = schemaLocMap;
+
+        initializeSchemaMap(this.schemaTargetNameSpace, this.schema_namespace_prefix);
+        schemaBuilder =
+            new SchemaBuilder(xmlSchemaCollection, schemaMap, targetNamespacePrefixMap, typeTable,
+                              getAttrFormDefault(), getElementFormDefault(), schemaLocMap, this.classLoader, null);
+    }
+
+    /**
+     * Generates schema for all the parameters in method. First generates schema
+     * for all different parameter type and later refers to them.
+     * 
+     * @return Returns XmlSchema.
+     * @throws Exception
+     */
+    public Collection buildWSDLTypes() throws Exception {
+        JamServiceFactory factory = JamServiceFactory.getInstance();
+        JamServiceParams jam_service_parms = factory.createServiceParams();
+        // setting the classLoder
+        // jam_service_parms.setParentClassLoader(factory.createJamClassLoader(classLoader));
+        // it can possible to add the classLoader as well
+        jam_service_parms.addClassLoader(classLoader);
+        jam_service_parms.includeClass(className);
+        JamService service = factory.createService(jam_service_parms);
+
+        JamClassIterator jClassIter = service.getClasses();
+        // all most all the time the ittr will have only one class in it
+        while (jClassIter.hasNext()) {
+            JClass jclass = (JClass)jClassIter.next();
+            // serviceName = jclass.getSimpleName();
+            // todo in the future , when we support annotation we can use this
+            // JAnnotation[] annotations = jclass.getAnnotations();
+
+            /**
+             * Schema generation done in two stage 1. Load all the methods and
+             * create type for methods parameters (if the parameters are Bean
+             * then it will create Complex types for those , and if the
+             * parameters are simple type which describe in SimpleTypeTable
+             * nothing will happen) 2. In the next stage for all the methods
+             * messages and port types will be created
+             */
+            methods = jclass.getDeclaredMethods();
+
+            // since we do not support overload
+            HashMap uniqueMethods = new HashMap();
+            XmlSchemaComplexType methodSchemaType = null;
+            XmlSchemaSequence sequence = null;
+            for (int i = 0; i < methods.length; i++) {
+                String methodName = methods[i].getSimpleName();
+                JMethod jMethod = methods[i];
+                // no need to think about this method , since that is system
+                // config method
+                if (excludeMethods.contains(jMethod.getSimpleName())) {
+                    continue;
+                }
+                // if (jMethod.getSimpleName().equals("init")
+                // || "setOperationContext".equals(jMethod.getSimpleName())
+                // || "destroy".equals(jMethod.getSimpleName()))
+                // continue;
+                if (uniqueMethods.get(jMethod.getSimpleName()) != null) {
+                    throw new Exception(" Sorry we don't support methods overloading !!!! ");
+                }
+
+                if (!jMethod.isPublic()) {
+                    // no need to generate Schema for non public methods
+                    continue;
+                }
+
+                uniqueMethods.put(jMethod.getSimpleName(), jMethod);
+                JParameter[] paras = jMethod.getParameters();
+                String parameterNames[] = null;
+                if (paras.length > 0) {
+                    parameterNames = methodTable.getParameterNames(methodName);
+                    sequence = new XmlSchemaSequence();
+
+                    // create the schema type for the method wrapper
+                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName());
+                    methodSchemaType.setParticle(sequence);
+                }
+
+                for (int j = 0; j < paras.length; j++) {
+                    JParameter methodParameter = paras[j];
+                    JClass paraType = methodParameter.getType();
+                    generateSchemaForType(sequence, paraType, (parameterNames != null && parameterNames[j] != null)
+                        ? parameterNames[j] : methodParameter.getSimpleName());
+                }
+                // for its return type
+                JClass returnType = jMethod.getReturnType();
+                if (!returnType.isVoidType()) {
+                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName() + RESPONSE);
+                    sequence = new XmlSchemaSequence();
+                    methodSchemaType.setParticle(sequence);
+                    generateSchemaForType(sequence, returnType, "return");
+                }
+            }
+            // generateWrapperElements(methods);
+        }
+        return schemaMap.values();
+    }
+
+    private QName generateSchemaForType(XmlSchemaSequence sequence, JClass type, String partName) throws Exception {
+        boolean isArrayType = type.isArrayType();
+        if (isArrayType) {
+            type = type.getArrayComponentType();
+        }
+
+        String classTypeName = type.getQualifiedName();
+
+        QName schemaTypeName = typeTable.getSimpleSchemaTypeName(classTypeName);
+        if (schemaTypeName == null) {
+            schemaTypeName = schemaBuilder.generateSchema(type);
+            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
+            addImportORInclude((XmlSchema)schemaMap.get(schemaTargetNameSpace), schemaTypeName);
+
+        } else {
+            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
+        }
+
+        return schemaTypeName;
+    }
+
+    private void addContentToMethodSchemaType(XmlSchemaSequence sequence,
+                                              QName schemaTypeName,
+                                              String paraName,
+                                              boolean isArray) {
+        XmlSchemaElement elt1 = new XmlSchemaElement();
+        elt1.setName(paraName);
+        elt1.setSchemaTypeName(schemaTypeName);
+        sequence.getItems().add(elt1);
+
+        if (isArray) {
+            elt1.setMaxOccurs(Long.MAX_VALUE);
+            elt1.setMinOccurs(0);
+        }
+    }
+
+    private XmlSchemaComplexType createSchemaTypeForMethodPart(String localPartName) {
+        XmlSchema xmlSchema = (XmlSchema)schemaMap.get(schemaTargetNameSpace);
+        QName elementName = new QName(this.schemaTargetNameSpace, localPartName, this.schema_namespace_prefix);
+        XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+
+        XmlSchemaElement globalElement = new XmlSchemaElement();
+        globalElement.setSchemaType(complexType);
+        globalElement.setName(formGlobalElementName(localPartName));
+        globalElement.setQName(elementName);
+
+        xmlSchema.getItems().add(globalElement);
+        xmlSchema.getElements().add(elementName, globalElement);
+
+        typeTable.addComplexSchemaType(this.schemaTargetNameSpace, globalElement.getName(), elementName);
+
+        return complexType;
+    }
+
+    private String formGlobalElementName(String typeName) {
+        String firstChar = typeName.substring(0, 1);
+        return typeName.replaceFirst(firstChar, firstChar.toLowerCase());
+    }
+
+    public TuscanyTypeTable getTypeTable() {
+        return typeTable;
+    }
+
+    public JMethod[] getMethods() {
+        return methods;
+    }
+
+    private String generatePrefix() {
+        return NAME_SPACE_PREFIX + prefixCount++;
+    }
+
+    public void setExcludeMethods(ArrayList excludeMethods) {
+        this.excludeMethods = excludeMethods;
+    }
+
+    private void initializeSchemaMap(String targetNamespace, String targetNamespacePrefix) {
+        XmlSchema xmlSchema = new XmlSchema(targetNamespace, xmlSchemaCollection);
+        xmlSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
+        xmlSchema.setElementFormDefault(getElementFormDefaultSetting());
+
+        targetNamespacePrefixMap.put(targetNamespace, targetNamespacePrefix);
+        schemaMap.put(targetNamespace, xmlSchema);
+
+        NamespaceMap prefixmap = new NamespaceMap();
+        prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX, TuscanyTypeTable.XML_SCHEMA_URI);
+        prefixmap.put(targetNamespacePrefix, targetNamespace);
+        xmlSchema.setNamespaceContext(prefixmap);
+    }
+
+    private void setFormDefaults() {
+
+    }
+
+    public Hashtable getSdoAnnoMap() {
+        return sdoAnnoMap;
+    }
+
+    public void setSdoAnnoMap(Hashtable sdoAnnoMap) {
+        this.sdoAnnoMap = sdoAnnoMap;
+    }
+
+    private void addImportORInclude(XmlSchema xmlSchema, QName schemaTypeName) {
+        // decide whether there must be an import or an include
+        if (xmlSchema.getTargetNamespace().equals(schemaTypeName.getNamespaceURI())) {
+            XmlSchema containingSchema = (XmlSchema)schemaMap.get(schemaTypeName.getNamespaceURI());
+            // if the type is not defined in the Schema then include
+            if (containingSchema.getTypeByName(schemaTypeName) == null) {
+                String schemaLocation = null;
+                if ((schemaLocation = (String)schemaLocationMap.get(schemaTypeName.getNamespaceURI())) != null) {
+                    schemaLocation = DEFAULT_SCHEMA_LOCATION;
+                }
+
+                XmlSchemaInclude includeElement = new XmlSchemaInclude();
+                includeElement.setSchemaLocation(schemaLocation);
+
+                if (!xmlSchema.getIncludes().contains(includeElement)) {
+                    xmlSchema.getIncludes().add(includeElement);
+                }
+            }
+        } else {
+            if (!((NamespaceMap)xmlSchema.getNamespaceContext()).values().contains(schemaTypeName.getNamespaceURI())) {
+                XmlSchemaImport importElement = new XmlSchemaImport();
+                importElement.setNamespace(schemaTypeName.getNamespaceURI());
+                xmlSchema.getItems().add(importElement);
+                ((NamespaceMap)xmlSchema.getNamespaceContext()).put(generatePrefix(), schemaTypeName.getNamespaceURI());
+            }
+        }
+    }
+
+    private XmlSchemaForm getAttrFormDefaultSetting() {
+        if (FORM_DEFAULT_UNQUALIFIED.equals(getAttrFormDefault())) {
+            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+        } else {
+            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+        }
+    }
+
+    private XmlSchemaForm getElementFormDefaultSetting() {
+        if (FORM_DEFAULT_UNQUALIFIED.equals(getElementFormDefault())) {
+            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+        } else {
+            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+        }
+    }
+
+    public String getAttrFormDefault() {
+        return attrFormDefault;
+    }
+
+    public void setAttrFormDefault(String attrFormDefault) {
+        this.attrFormDefault = attrFormDefault;
+    }
+
+    public String getElementFormDefault() {
+        return elementFormDefault;
+    }
+
+    public void setElementFormDefault(String elementFormDefault) {
+        this.elementFormDefault = elementFormDefault;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
new file mode 100644
index 0000000000..cb41c56b94
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
@@ -0,0 +1,220 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
+import org.codehaus.jam.JClass;
+
+import commonj.sdo.DataObject;
+
+public class TuscanyTypeTable 
+{
+    public static final String XML_SCHEMA_URI = "http://www.w3.org/2001/XMLSchema";
+    public static final String XS_URI_PREFIX = "xs";
+    public static final QName XS_QNAME = new QName(XML_SCHEMA_URI, "schema", XS_URI_PREFIX);
+    public static final String DELIMITER = "#";
+    
+    private Hashtable<String, QName> simpleXSDTypes;
+    private Hashtable<String, QName> complexXSDTypes;
+    
+    public static String asQualifiedName(String uri, String typeName)
+    {
+        return (uri + DELIMITER + typeName);
+    }
+
+    
+    public  TuscanyTypeTable() 
+    {
+        simpleXSDTypes = new Hashtable<String, QName>();
+        complexXSDTypes = new Hashtable<String, QName>();
+        populateSimpleXSDTypes();
+        populateStdSDOTypes();
+    }
+
+    private void populateStdSDOTypes() 
+    {
+        simpleXSDTypes.put("Boolean",
+                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
+        simpleXSDTypes.put("Byte",
+                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
+        simpleXSDTypes.put("Bytes",
+                new QName(XML_SCHEMA_URI, "hexBinary", XS_URI_PREFIX));
+        simpleXSDTypes.put("Character",
+                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
+        simpleXSDTypes.put("DataObject",
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+        simpleXSDTypes.put("Date",
+                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
+        simpleXSDTypes.put("Day",
+                new QName(XML_SCHEMA_URI, "gDay", XS_URI_PREFIX));
+        simpleXSDTypes.put("Decimal",
+                new QName(XML_SCHEMA_URI, "decimal", XS_URI_PREFIX));
+        simpleXSDTypes.put("Double",
+                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
+        simpleXSDTypes.put("Duration",
+                new QName(XML_SCHEMA_URI, "duration", XS_URI_PREFIX));
+        simpleXSDTypes.put("Float",
+                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
+        simpleXSDTypes.put("Int",
+                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
+        simpleXSDTypes.put("Integer",
+                new QName(XML_SCHEMA_URI, "integer", XS_URI_PREFIX));
+        simpleXSDTypes.put("Long",
+                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
+        simpleXSDTypes.put("Month",
+                new QName(XML_SCHEMA_URI, "gMonth", XS_URI_PREFIX));
+        simpleXSDTypes.put("monthDay",
+                new QName(XML_SCHEMA_URI, "gMonthDay", XS_URI_PREFIX));
+        simpleXSDTypes.put("Object",
+                new QName(XML_SCHEMA_URI, "anySimpleType", XS_URI_PREFIX));
+        simpleXSDTypes.put("Short",
+                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
+        simpleXSDTypes.put("String",
+                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
+        simpleXSDTypes.put("Strings",
+                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
+        simpleXSDTypes.put("Time",
+                new QName(XML_SCHEMA_URI, "time", XS_URI_PREFIX));
+        simpleXSDTypes.put("Year",
+                new QName(XML_SCHEMA_URI, "gYear", XS_URI_PREFIX));
+        simpleXSDTypes.put("YearMonth",
+                new QName(XML_SCHEMA_URI, "gYearMonth", XS_URI_PREFIX));
+        simpleXSDTypes.put("YearMonthDay",
+                new QName(XML_SCHEMA_URI, "date", XS_URI_PREFIX));
+        simpleXSDTypes.put("URI",
+                new QName(XML_SCHEMA_URI, "anyURI", XS_URI_PREFIX));
+    }
+    
+    private void populateSimpleXSDTypes() {
+        //todo pls use the types from org.apache.ws.commons.schema.constants.Constants
+        simpleXSDTypes.put("int",
+                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.String",
+                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
+        simpleXSDTypes.put("boolean",
+                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
+        simpleXSDTypes.put("float",
+                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
+        simpleXSDTypes.put("double",
+                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
+        simpleXSDTypes.put("short",
+                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
+        simpleXSDTypes.put("long",
+                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
+        simpleXSDTypes.put("byte",
+                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
+        simpleXSDTypes.put("char",
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Integer",
+                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Double",
+                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Float",
+                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Long",
+                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Character",
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Boolean",
+                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Byte",
+                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Short",
+                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.util.Date",
+                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.util.Calendar",
+                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.lang.Object",
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+        simpleXSDTypes.put("java.math.BigDecimal",
+                new QName(XML_SCHEMA_URI, "decimal", XS_URI_PREFIX));
+
+        // Any types
+        simpleXSDTypes.put(OMElement.class.getName(),
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+        simpleXSDTypes.put(ArrayList.class.getName(),
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+        simpleXSDTypes.put(Vector.class.getName(),
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+        simpleXSDTypes.put(List.class.getName(),
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+
+        // I'm unsure what populateStdSDOTypes is supposed to be setting up,
+        // given that I still have to do this to map "commonj.sdo.DataObject" 
+        // to xsd:anyType, but I'll do it anyway.
+        //
+        simpleXSDTypes.put(DataObject.class.getName(),
+                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
+    }
+    
+    public QName getStdSdoType(String typename) {
+        return (QName) simpleXSDTypes.get(typename);
+    }
+
+    public QName getComplexSchemaTypeName(String sdoURI, String sdoTypeName) {
+        return (QName) complexXSDTypes.get(asQualifiedName(sdoURI, sdoTypeName));
+    }
+
+    public QName getComplexSchemaTypeName(JClass javaClass, ClassLoader cl) throws Exception {
+        String namespace = Java2WSDLUtils.schemaNamespaceFromClassName(javaClass.getQualifiedName(), cl).toString();
+        return (QName) complexXSDTypes.get(asQualifiedName(namespace, javaClass.getSimpleName()));
+    }
+
+    public boolean isSimpleType(String typeName) {
+        Iterator keys = simpleXSDTypes.keySet().iterator();
+        while (keys.hasNext()) {
+            String s = (String) keys.next();
+            if (s.equals(typeName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    public QName getSimpleSchemaTypeName(String typename) {
+        return (QName) simpleXSDTypes.get(typename);
+    }
+
+    public void addSimpleSchemaType(String typeName, QName schemaType) {
+        simpleXSDTypes.put(typeName, schemaType);
+    }
+
+    public void addComplexSchemaType(String namespaceURI, String name, QName schemaType) {
+        complexXSDTypes.put(asQualifiedName(namespaceURI, name), schemaType);
+    }
+
+    public QName getQNamefortheType(String namespaceURI, String typeName) {
+        if (XML_SCHEMA_URI.equals(namespaceURI)) {
+            return getSimpleSchemaTypeName(typeName);
+        } else {
+            return getComplexSchemaTypeName(namespaceURI, typeName);
+        }
+    }
+}
+
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
new file mode 100644
index 0000000000..66c9100ef9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
@@ -0,0 +1,370 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.description.java2wsdl.bytecode.MethodTable;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaForm;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaInclude;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.utils.NamespaceMap;
+import org.codehaus.jam.JClass;
+import org.codehaus.jam.JMethod;
+import org.codehaus.jam.JParameter;
+import org.codehaus.jam.JamClassIterator;
+import org.codehaus.jam.JamService;
+import org.codehaus.jam.JamServiceFactory;
+import org.codehaus.jam.JamServiceParams;
+
+public class TuscanyWSDLTypesGenerator implements TuscanyJava2WSDLConstants {
+    public static final String NAME_SPACE_PREFIX = "stn_";
+
+    public static final String PERIOD_SEPARATOR = ".";
+
+    private static int prefixCount = 1;
+
+    protected GenerationParameters generationParams;
+
+    protected Hashtable targetNamespacePrefixMap = new Hashtable();
+
+    protected Hashtable schemaMap = new Hashtable();
+
+    protected XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
+
+    private TuscanyTypeTable typeTable = new TuscanyTypeTable();
+
+    protected SchemaBuilder schemaBuilder = null;
+
+    protected Map schemaLocationMap = null;
+
+    // to keep loaded method using JAM
+    private JMethod methods[];
+
+    // to store byte code method using Axis 1.x codes
+    private MethodTable methodTable;
+
+    private Class clazz;
+
+    private ArrayList excludeMethods = new ArrayList();
+
+    boolean alreadyPrintedArrayWarningMessage = false;
+
+    public TuscanyWSDLTypesGenerator(GenerationParameters genParams) throws Exception {
+        this.generationParams = genParams;
+
+        String inputClassName = generationParams.getSourceClassName();
+
+        try {
+            clazz = Class.forName(inputClassName, true, generationParams.getClassLoader());
+        } catch (ClassNotFoundException cfne) {
+            printInputSourceClassNotFoundMessage(inputClassName);
+            throw new IllegalArgumentException("Input className not found:" + inputClassName, cfne);
+        }
+
+        methodTable = new MethodTable(clazz);
+
+        initializeSchemaMap(generationParams.getSchemaTargetNamespace(), generationParams
+            .getSchemaTargetNamespacePrefix());
+
+        this.schemaLocationMap = generationParams.getSchemaLocationMap();
+        schemaBuilder =
+            new SchemaBuilder(xmlSchemaCollection, schemaMap, targetNamespacePrefixMap, typeTable, generationParams
+                .getAttrFormDefault(), generationParams.getElementFormDefault(), generationParams
+                .getSchemaLocationMap(), generationParams.getClassLoader(), generationParams.getFactoryClassNames());
+    }
+
+    /**
+     * Generates schema for all the parameters in method. First generates schema
+     * for all different parameter type and later refers to them.
+     * 
+     * @return Returns XmlSchema.
+     * @throws Exception
+     */
+    public Collection buildWSDLTypes() throws Exception {
+        JamServiceFactory factory = JamServiceFactory.getInstance();
+        JamServiceParams jam_service_parms = factory.createServiceParams();
+        // setting the classLoder
+        // jam_service_parms.setParentClassLoader(factory.createJamClassLoader(classLoader));
+        // it can possible to add the classLoader as well
+        jam_service_parms.addClassLoader(generationParams.getClassLoader());
+        jam_service_parms.includeClass(generationParams.getSourceClassName());
+
+        for (int count = 0; count < generationParams.getExtraClasses().size(); ++count) {
+            jam_service_parms.includeClass((String)generationParams.getExtraClasses().get(count));
+        }
+
+        JamService service = factory.createService(jam_service_parms);
+        QName extraSchemaTypeName = null;
+        JamClassIterator jClassIter = service.getClasses();
+        // all most all the time the ittr will have only one class in it
+        while (jClassIter.hasNext()) {
+            JClass jclass = (JClass)jClassIter.next();
+            // serviceName = jclass.getSimpleName();
+            // todo in the future , when we support annotation we can use this
+            // JAnnotation[] annotations = jclass.getAnnotations();
+
+            if (jclass.getQualifiedName().equals(generationParams.getSourceClassName())) {
+                /**
+                 * Schema generation done in two stage 1. Load all the methods
+                 * and create type for methods parameters (if the parameters are
+                 * Bean then it will create Complex types for those , and if the
+                 * parameters are simple type which describe in SimpleTypeTable
+                 * nothing will happen) 2. In the next stage for all the methods
+                 * messages and port types will be created
+                 */
+                methods = jclass.getDeclaredMethods();
+                // short the elements in the array
+                Arrays.sort(methods);
+
+                // since we do not support overload
+                HashMap uniqueMethods = new HashMap();
+                XmlSchemaComplexType methodSchemaType;
+                XmlSchemaSequence sequence = null;
+
+                for (int i = 0; i < methods.length; i++) {
+                    JMethod jMethod = methods[i];
+
+                    String methodName = methods[i].getSimpleName();
+                    // no need to think about this method , since that is system
+                    // config method
+                    if (excludeMethods.contains(jMethod.getSimpleName())) {
+                        continue;
+                    }
+
+                    if (uniqueMethods.get(jMethod.getSimpleName()) != null) {
+                        throw new Exception(" Sorry we don't support methods overloading !!!! ");
+                    }
+
+                    if (!jMethod.isPublic()) {
+                        // no need to generate Schema for non public methods
+                        continue;
+                    }
+                    uniqueMethods.put(jMethod.getSimpleName(), jMethod);
+                    // create the schema type for the method wrapper
+
+                    uniqueMethods.put(jMethod.getSimpleName(), jMethod);
+                    JParameter[] paras = jMethod.getParameters();
+                    String parameterNames[] = null;
+                    // better to handle void types too
+                    parameterNames = methodTable.getParameterNames(methodName);
+                    sequence = new XmlSchemaSequence();
+
+                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName());
+                    methodSchemaType.setParticle(sequence);
+
+                    for (int j = 0; j < paras.length; j++) {
+                        JParameter methodParameter = paras[j];
+                        JClass paraType = methodParameter.getType();
+                        generateSchemaForType(sequence, paraType, (parameterNames != null && parameterNames[j] != null)
+                            ? parameterNames[j] : methodParameter.getSimpleName());
+                    }
+                    // for its return type
+                    JClass returnType = jMethod.getReturnType();
+
+                    // better to handle void types too
+                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName() + RESPONSE);
+                    sequence = new XmlSchemaSequence();
+                    methodSchemaType.setParticle(sequence);
+                    generateSchemaForType(sequence, returnType, "return");
+                }
+            } else {
+                // generate the schema type for extra classes
+                extraSchemaTypeName = typeTable.getSimpleSchemaTypeName(jclass.getQualifiedName());
+                if (extraSchemaTypeName == null) {
+                    extraSchemaTypeName = schemaBuilder.generateSchema(jclass);
+                }
+            }
+        }
+        return schemaMap.values();
+    }
+
+    private QName generateSchemaForType(XmlSchemaSequence sequence, JClass type, String partName) throws Exception {
+        if (type.isVoidType()) {
+            return null;
+        }
+        boolean isArrayType = type.isArrayType();
+        if (isArrayType) {
+            type = type.getArrayComponentType();
+        }
+
+        String classTypeName = type.getQualifiedName();
+
+        QName schemaTypeName = typeTable.getSimpleSchemaTypeName(classTypeName);
+        if (schemaTypeName == null) {
+            schemaTypeName = schemaBuilder.generateSchema(type);
+            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
+            addImportORInclude((XmlSchema)schemaMap.get(generationParams.getSchemaTargetNamespace()), schemaTypeName);
+
+        } else {
+            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
+        }
+
+        return schemaTypeName;
+    }
+
+    private void addContentToMethodSchemaType(XmlSchemaSequence sequence,
+                                              QName schemaTypeName,
+                                              String paraName,
+                                              boolean isArray) {
+        XmlSchemaElement elt1 = new XmlSchemaElement();
+        elt1.setName(paraName);
+        elt1.setSchemaTypeName(schemaTypeName);
+        sequence.getItems().add(elt1);
+
+        if (isArray) {
+            // FIXME: lresende to check this
+            if (!alreadyPrintedArrayWarningMessage) {
+                alreadyPrintedArrayWarningMessage = true;
+                System.out.println("Warning!: Array type detected as Java method parameter. The WSDL");
+                System.out.println("will be generated anyway in spite of the fact that round-trip (WSDL2Java)");
+                System.out.println("may not be handled in the expected manner.  There may be runtime issues as ");
+                System.out.println("well as array types are not necessarily supported yet.");
+                System.out.println("");
+            }
+            elt1.setMaxOccurs(Long.MAX_VALUE);
+            elt1.setMinOccurs(0);
+        }
+    }
+
+    private XmlSchemaComplexType createSchemaTypeForMethodPart(String localPartName) throws Exception {
+        XmlSchema xmlSchema = (XmlSchema)schemaMap.get(generationParams.getSchemaTargetNamespace());
+        QName elementName =
+            new QName(generationParams.getSchemaTargetNamespace(), localPartName, generationParams
+                .getSchemaTargetNamespacePrefix());
+        XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+
+        XmlSchemaElement globalElement = new XmlSchemaElement();
+        globalElement.setSchemaType(complexType);
+        globalElement.setName(localPartName);
+        globalElement.setQName(elementName);
+
+        xmlSchema.getItems().add(globalElement);
+        xmlSchema.getElements().add(elementName, globalElement);
+
+        typeTable.addComplexSchemaType(generationParams.getSchemaTargetNamespace(),
+                                       globalElement.getName(),
+                                       elementName);
+
+        return complexType;
+    }
+
+    public TuscanyTypeTable getTypeTable() {
+        return typeTable;
+    }
+
+    public JMethod[] getMethods() {
+        return methods;
+    }
+
+    private String generatePrefix() {
+        return NAME_SPACE_PREFIX + prefixCount++;
+    }
+
+    public void setExcludeMethods(ArrayList excludeMethods) {
+        this.excludeMethods = excludeMethods;
+    }
+
+    private void initializeSchemaMap(String targetNamespace, String targetNamespacePrefix) {
+        XmlSchema xmlSchema = new XmlSchema(targetNamespace, xmlSchemaCollection);
+        xmlSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
+        xmlSchema.setElementFormDefault(getElementFormDefaultSetting());
+
+        targetNamespacePrefixMap.put(targetNamespace, targetNamespacePrefix);
+        schemaMap.put(targetNamespace, xmlSchema);
+
+        NamespaceMap prefixmap = new NamespaceMap();
+        prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX, TuscanyTypeTable.XML_SCHEMA_URI);
+        prefixmap.put(targetNamespacePrefix, targetNamespace);
+        xmlSchema.setNamespaceContext(prefixmap);
+    }
+
+    /*
+     * Adds to 'xmlSchema' an import or include of the XMLSchema containing
+     * 'schemaTypeName'
+     */
+    private void addImportORInclude(XmlSchema xmlSchema, QName schemaTypeName) {
+        // decide whether there must be an import or an include
+        if (xmlSchema.getTargetNamespace().equals(schemaTypeName.getNamespaceURI())) {
+            XmlSchema containingSchema = (XmlSchema)schemaMap.get(schemaTypeName.getNamespaceURI());
+            // if the type is not defined in the Schema then include
+            if (containingSchema.getTypeByName(schemaTypeName) == null) {
+                String schemaLocation = null;
+                // This looked backwards so I flipped it
+                if ((schemaLocation = (String)schemaLocationMap.get(schemaTypeName.getNamespaceURI())) != null) {
+                    schemaLocation = DEFAULT_SCHEMA_LOCATION;
+                }
+
+                XmlSchemaInclude includeElement = new XmlSchemaInclude();
+                includeElement.setSchemaLocation(schemaLocation);
+
+                if (!xmlSchema.getIncludes().contains(includeElement)) {
+                    xmlSchema.getIncludes().add(includeElement);
+                    // Add this so it will be serialized
+                    xmlSchema.getItems().add(includeElement);
+                }
+            }
+        } else {
+            if (!((NamespaceMap)xmlSchema.getNamespaceContext()).values().contains(schemaTypeName.getNamespaceURI())) {
+                XmlSchemaImport importElement = new XmlSchemaImport();
+                importElement.setNamespace(schemaTypeName.getNamespaceURI());
+
+                // Add schemaLocation on imports
+                String schemaLocation = (String)schemaLocationMap.get(schemaTypeName.getNamespaceURI());
+                importElement.setSchemaLocation(schemaLocation);
+                xmlSchema.getItems().add(importElement);
+                ((NamespaceMap)xmlSchema.getNamespaceContext()).put(generatePrefix(), schemaTypeName.getNamespaceURI());
+            }
+        }
+    }
+
+    private XmlSchemaForm getAttrFormDefaultSetting() {
+        if (FORM_DEFAULT_UNQUALIFIED.equals(generationParams.getAttrFormDefault())) {
+            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+        } else {
+            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+        }
+    }
+
+    private XmlSchemaForm getElementFormDefaultSetting() {
+        if (FORM_DEFAULT_UNQUALIFIED.equals(generationParams.getElementFormDefault())) {
+            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+        } else {
+            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+        }
+    }
+
+    private void printInputSourceClassNotFoundMessage(String inputClassName) {
+        System.out.println("ERROR!!:  The input class: " + inputClassName + " could not be found.");
+        System.out.println("Please check the value you provided for the -cp <class path uri> option.");
+        System.out.println("");
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
new file mode 100644
index 0000000000..e30ada3af5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate;
+
+import java.util.EventObject;
+
+public class WSDLGenEvent extends EventObject {
+	/**
+     * 
+     */
+    private static final long serialVersionUID = -356100754190514245L;
+    private int generationPhase = WSDLGenListener.UNKNOWN;
+
+	public WSDLGenEvent(Object source, int genPhase) {
+		super(source);
+		this.generationPhase = genPhase;
+	}
+
+	public int getGenerationPhase() {
+		return generationPhase;
+	}
+
+	public void setGenerationPhase(int generationPhase) {
+		this.generationPhase = generationPhase;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
new file mode 100644
index 0000000000..788d162f34
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
@@ -0,0 +1,39 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+public interface WSDLGenListener {
+	public static int UNKNOWN = 0;
+
+	public static int INPUT_ARGS_PARSING = 1;
+
+	public static int INPUT_ARGS_VALIDATION = 2;
+
+	public static int WSDL_MODEL_CREATION = 3;
+
+	public static int WSDL_MODEL_WRITING = 4;
+
+	public static String[] phaseAsString = { "Unknown",
+			"Input Arguments Parsing", "Input Arguments Validation",
+			"WSDL Model Creation", "WSDL Model Writing" };
+
+	public void WSDLGenPhaseStarted(WSDLGenEvent event);
+
+	public void WSDLGenPhaseCompleted(WSDLGenEvent event);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
new file mode 100644
index 0000000000..b30b8cd62b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
@@ -0,0 +1,143 @@
+/*
+ * 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.tools.java2wsdl.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class XMLNameUtil {
+
+    /**
+     * Returns a valid Java name from an XML Name.
+     *
+     * @param name
+     * @param isUpperCase
+     * @return a valid Java name from an XML Name
+     */
+    public static String getJavaNameFromXMLName(String name, boolean isUpperCase) {
+        List<String> parsedName = parseName(name, '_');
+        StringBuilder result = new StringBuilder(64 * parsedName.size());
+        for (String nameComponent: parsedName) {
+            if (nameComponent.length() > 0) {
+                if (result.length() > 0 || isUpperCase) {
+                    result.append(Character.toUpperCase(nameComponent.charAt(0)));
+                    result.append(nameComponent.substring(1));
+                } else {
+                    result.append(nameComponent);
+                }
+            }
+        }
+    
+        if (result.length() == 0) {
+            return "_";
+        }
+        if (Character.isJavaIdentifierStart(result.charAt(0))) {
+            return isUpperCase ? result.toString() : decapitalizeName(result.toString());
+        }
+        return "_" + result;
+    }
+
+    /**
+     * Decapitalize a name.
+     * @param name
+     * @return a decapitalized name
+     */
+    public static String decapitalizeName(String name) {
+        if (name.length() == 0) {
+            return name;
+        } else {
+            String lowerName = name.toLowerCase();
+            int i;
+            for (i = 0; i < name.length(); i++) {
+                if (name.charAt(i) == lowerName.charAt(i)) {
+                    break;
+                }
+            }
+            if (i > 1 && i < name.length()) {
+                --i;
+            }
+            return name.substring(0, i).toLowerCase() + name.substring(i);
+        }
+    }
+
+    /**
+     * Parse the given name.
+     *
+     * @param sourceName
+     * @param separator
+     * @return some stuff parsed from the name
+     */
+    private static List<String> parseName(String sourceName, char separator) {
+        List<String> result = new ArrayList<String>();
+        if (sourceName != null) {
+            StringBuilder currentWord = new StringBuilder(64);
+            boolean lastIsLower = false;
+            int index;
+            int length;
+            for (index = 0, length = sourceName.length(); index < length; ++index) {
+                char curChar = sourceName.charAt(index);
+                if (!Character.isJavaIdentifierPart(curChar)) {
+                    curChar = separator;
+                }
+                if (Character.isUpperCase(curChar)
+                    || (!lastIsLower && Character.isDigit(curChar))
+                    || curChar == separator) {
+                    
+                    if (lastIsLower && currentWord.length() > 1 
+                        || curChar == separator && currentWord.length() > 0) {
+                        result.add(currentWord.toString());
+                        currentWord = new StringBuilder(64);
+                    }
+                    lastIsLower = false;
+                } else {
+                    if (!lastIsLower) {
+                        int currentWordLength = currentWord.length();
+                        if (currentWordLength > 1) {
+                            char lastChar = currentWord.charAt(--currentWordLength);
+                            currentWord.setLength(currentWordLength);
+                            result.add(currentWord.toString());
+                            currentWord = new StringBuilder(64);
+                            currentWord.append(lastChar);
+                        }
+                    }
+                    lastIsLower = true;
+                }
+    
+                if (curChar != separator) {
+                    currentWord.append(curChar);
+                }
+            }
+    
+            result.add(currentWord.toString());
+        }
+        return result;
+    }
+    
+    /**
+     * Return an EPackage name for the given namespace.
+     *
+     * @param namespace
+     * @return an EPackage name for the given namespace
+     */
+    public static String getPackageNameFromNamespace(String namespace) {
+       return org.apache.tuscany.sdo.helper.SDOXSDEcoreBuilder.getDefaultPackageName(namespace);
+    }
+
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000..0084319535
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 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, serviceDefinition 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/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
new file mode 100644
index 0000000000..135b374357
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate;
+
+import org.apache.tuscany.tools.java2wsdl.generate.customer.Customer;
+
+public class CustomerValue {
+
+    public int getValue(String custId, String stockSymbol) {
+        return 0;
+    }
+
+    public Customer getCustomerDetails(String custId) {
+        return new Customer();
+    }
+
+    public String noArgsServiceMethod() {
+        return new String();
+    }
+
+    private void privateServiceMethod() {
+
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
new file mode 100644
index 0000000000..dfebd77215
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate;
+
+import org.apache.tuscany.tools.java2wsdl.generate.account.Account;
+import org.apache.tuscany.tools.java2wsdl.generate.customer.Customer;
+
+public class CustomerWithAccount {
+
+    private Customer customer = new Customer();
+
+    private Account[] accounts;
+
+    public int getValue(String custId, String stockSymbol) {
+        return 123;
+    }
+
+    public Customer getCustomerDetails(String custId) {
+        return customer;
+    }
+
+    public Account getCustomerAccount(String custId, String accountId) {
+        return accounts[0];
+    }
+
+    public Account[] getAccounts() {
+        return accounts;
+    }
+
+    public void setAccounts(Account[] accounts) {
+        this.accounts = accounts;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
new file mode 100644
index 0000000000..5406025643
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.tools.java2wsdl.generate;

+

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

+

+public interface ExampleService {

+

+    void sayHelloTwoWay(String name);

+

+    @OneWay

+    void sayHelloOneWay(String name);

+    

+    String getGreeting();

+}

diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
new file mode 100644
index 0000000000..c587252d23
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
@@ -0,0 +1,114 @@
+/*
+ * 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.tools.java2wsdl.generate;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+/**
+ * A JUnit test case to test the Tuscany Java 2 WSDL Generation
+ */
+public class TuscanyJava2WSDLTestCase extends TestCase {
+
+    /**
+     * setup the pre-requisites for the test case to run
+     * 
+     * @exception Exception
+     */
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    /**
+     * @exception Exception
+     */
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Simple WSDL generation test.
+     */
+    public void testSimpleWSDLGeneration() {
+        String[] arguments =
+            new String[] {"-cn", "org.apache.tuscany.tools.java2wsdl.generate.CustomerValue", 
+                          "-o",  "target/java2wsdl-source", "-xc",
+                          "org.apache.tuscany.tools.java2wsdl.generate.extra.GoldCustomer"};
+
+        Java2WSDL.main(arguments);
+
+        File file = new File("target/java2wsdl-source/CustomerValue.wsdl");
+        assertTrue(file.exists() && file.isFile());
+    }
+
+    /**
+     * Test WSDL generation where a parameter Object[] is involved.
+     */
+    public void testWsdlGeneration2() {
+
+        String[] arguments =
+            new String[] {"-cn", "org.apache.tuscany.tools.java2wsdl.generate.CustomerWithAccount", 
+                          "-o", "target/java2wsdl-source",};
+        Java2WSDL.main(arguments);
+
+        File file = new File("target/java2wsdl-source/CustomerWithAccount.wsdl");
+        assertTrue(file.exists() && file.isFile());
+    }
+
+    public void testWsdlGeneration_SDO_Static() {
+        // tests for SDOs where XSD exist. Hence no XSDs must be generated
+        String[] arguments =
+            new String[] {"-cn", "org.soapinterop.CreditScoreDocLit",
+                          "-o", "target/java2wsdl-source",
+                          "-ixsd", "[http://www.example.org/creditscore/doclit/," + "http://www.example.org/creditscore/doclit/xsd]"};
+        Java2WSDL.main(arguments);
+
+        File file = new File("target/java2wsdl-source/CreditScoreDocLit.wsdl");
+        assertTrue(file.exists() && file.isFile());
+    }
+
+    /**
+     * Test WSDL generation for a service interface.
+     */
+    public void testServiceWSDLGeneration() {
+        String[] arguments =
+            new String[] {"-cn", "org.apache.tuscany.tools.java2wsdl.generate.ExampleService", 
+                          "-o",  "target/java2wsdl-source"};
+
+        Java2WSDL.main(arguments);
+
+        File file = new File("target/java2wsdl-source/ExampleService.wsdl");
+        assertTrue(file.exists() && file.isFile());
+    }
+
+    /**
+     * Test WSDL generation from a java interface and then generate the java
+     * interface using the generated WSDL.
+     */
+    public void _testRoundTrip() {
+        // TODO implement round trip
+        // this should re-generate java interfaces from the generated wsdl
+        // and compile (?) the generated java code.
+        // fail();
+
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
new file mode 100644
index 0000000000..bf49d98888
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
@@ -0,0 +1,53 @@
+/*
+ * 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.tools.java2wsdl.generate.account;
+
+import java.math.BigDecimal;
+
+public class Account {
+    int accountType;
+
+    String accountNo;
+
+    BigDecimal balance;
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public int getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(int accountType) {
+        this.accountType = accountType;
+    }
+
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
new file mode 100644
index 0000000000..cf83095852
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate.customer;
+
+public class Customer {
+    private String name = "";
+
+    public int custType = 0;
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
new file mode 100644
index 0000000000..901da8e551
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.tools.java2wsdl.generate.extra;
+
+import org.apache.tuscany.tools.java2wsdl.generate.customer.Customer;
+
+public class GoldCustomer extends Customer {
+    public String goldCustNumber = "";
+
+    public String getGoldCustNumber() {
+        return goldCustNumber;
+    }
+
+    public void setGoldCustNumber(String goldCustNumber) {
+        this.goldCustNumber = goldCustNumber;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
new file mode 100644
index 0000000000..78a64dcc64
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.soapinterop;
+
+public interface CreditScoreDocLit {
+    public org.example.creditscore.doclit.CreditReport getCreditScore(org.example.creditscore.doclit.Customer param0)
+        throws java.rmi.RemoteException;
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/AccountService.wsdl
new file mode 100644
index 0000000000..6f2fed1e2a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/AccountService.wsdl
@@ -0,0 +1,242 @@
+<?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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

+                  xmlns:tns="http://www.bigbank.com/Account/"

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

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

+                  xmlns:account="http://www.bigbank.com/Account/"

+                  targetNamespace="http://www.bigbank.com/Account/"
+                  name="AccountService">

+

+    <wsdl:types>

+        <xsd:schema targetNamespace="http://www.bigbank.com/Account/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:account="http://www.bigbank.com/Account/"
+		xmlns:sdojava="commonj.sdo/java"
+		sdojava:package="org.apache.tuscany.samples.bigbank.account">

+

+            <xsd:element name="getAccountReportWrapped0">

+                <xsd:complexType>

+                    <xsd:sequence>

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+            <xsd:element name="getAccountReportWrapped0Response">

+                <xsd:complexType>

+                    <xsd:sequence>

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+

+            <xsd:element name="getAccountReportWrapped1">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="customerID" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>

+            <xsd:element name="getAccountReportWrapped1Response">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="accountReport" type="account:AccountReport"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+

+            <xsd:element name="getAccountReportWrappedN">

+                <xsd:complexType>

+                    <xsd:sequence>

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

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

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+            <xsd:element name="getAccountReportWrappedNResponse">

+                <xsd:complexType>

+                    <xsd:sequence>

+                        <xsd:element name="accountReport" type="account:AccountReport"/>

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+            

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

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

+            

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

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

+            

+            <xsd:element name="getAccountReportBare1Complex" type="account:AccountRequest"/>

+            <xsd:element name="getAccountReportBare1ComplexResponse" type="account:AccountReport"/>

+

+            <xsd:complexType name="AccountRequest">

+                <xsd:sequence>

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

+                </xsd:sequence>

+            </xsd:complexType>

+            

+            <xsd:complexType name="AccountReport">

+                <xsd:sequence>

+                    <xsd:element name="accountSummaries" type="account:AccountSummary" maxOccurs="unbounded"/>

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:complexType name="AccountSummary">

+                <xsd:attribute name="accountNumber" type="xsd:string"/>

+                <xsd:attribute name="accountType" type="xsd:string"/>

+                <xsd:attribute name="balance" type="xsd:float"/>

+            </xsd:complexType>

+

+        </xsd:schema>

+    </wsdl:types>

+

+    <wsdl:message name="getAccountReportWrapped0Request">

+        <wsdl:part element="account:getAccountReportWrapped0" name="getAccountReportWrapped0Request"/>

+    </wsdl:message>

+    <wsdl:message name="getAccountReportWrapped0Response">

+        <wsdl:part element="account:getAccountReportWrapped0Response" name="getAccountReportWrapped0Response"/>

+    </wsdl:message>

+

+    <wsdl:message name="getAccountReportWrapped1Request">

+        <wsdl:part element="account:getAccountReportWrapped1" name="getAccountReportWrapped1Request"/>

+    </wsdl:message>

+    <wsdl:message name="getAccountReportWrapped1Response">

+        <wsdl:part element="account:getAccountReportWrapped1Response" name="getAccountReportWrapped1Response"/>

+    </wsdl:message>

+

+    <wsdl:message name="getAccountReportWrappedNRequest">

+        <wsdl:part element="account:getAccountReportWrappedN" name="getAccountReportWrappedNRequest"/>

+    </wsdl:message>

+    <wsdl:message name="getAccountReportWrappedNResponse">

+        <wsdl:part element="account:getAccountReportWrappedNResponse" name="getAccountReportWrappedNResponse"/>

+    </wsdl:message>

+

+    <wsdl:message name="getAccountReportBare0Request">

+    </wsdl:message>

+    <wsdl:message name="getAccountReportBare0Response">

+    </wsdl:message>

+

+    <wsdl:message name="getAccountReportBare1SimpleRequest">

+        <wsdl:part element="account:getAccountReportBare1Simple" name="getAccountReportBare1SimpleRequest"/>

+    </wsdl:message>

+    <wsdl:message name="getAccountReportBare1SimpleResponse">

+        <wsdl:part element="account:getAccountReportBare1SimpleResponse" name="getAccountReportBare1SimpleResponse"/>

+    </wsdl:message>

+

+    <wsdl:message name="getAccountReportBare1ComplexRequest">

+        <wsdl:part element="account:getAccountReportBare1Complex" name="getAccountReportBare1ComplexRequest"/>

+    </wsdl:message>

+    <wsdl:message name="getAccountReportBare1ComplexResponse">

+        <wsdl:part element="account:getAccountReportBare1ComplexResponse" name="getAccountReportBare1ComplexResponse"/>

+    </wsdl:message>

+

+    <wsdl:portType name="Account_Service">

+        <wsdl:operation name="getAccountReportWrapped0">

+            <wsdl:input message="tns:getAccountReportWrapped0Request"/>

+            <wsdl:output message="tns:getAccountReportWrapped0Response"/>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportWrapped1">

+            <wsdl:input message="tns:getAccountReportWrapped1Request"/>

+            <wsdl:output message="tns:getAccountReportWrapped1Response"/>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportWrappedN">

+            <wsdl:input message="tns:getAccountReportWrappedNRequest"/>

+            <wsdl:output message="tns:getAccountReportWrappedNResponse"/>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportBare0">

+            <wsdl:input message="tns:getAccountReportBare0Request"/>

+            <wsdl:output message="tns:getAccountReportBare0Response"/>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportBare1Simple">

+            <wsdl:input message="tns:getAccountReportBare1SimpleRequest"/>

+            <wsdl:output message="tns:getAccountReportBare1SimpleResponse"/>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportBare1Complex">

+            <wsdl:input message="tns:getAccountReportBare1ComplexRequest"/>

+            <wsdl:output message="tns:getAccountReportBare1ComplexResponse"/>

+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="AccountServiceSOAP" type="tns:Account_Service">

+        <soap:binding style="document"

+                      transport="http://schemas.xmlsoap.org/soap/http"/>

+        <wsdl:operation name="getAccountReportWrapped0">

+            <soap:operation

+                    soapAction="http://www.bigbank.com/Account/getAccountReportWrapped0"/>

+            <wsdl:input>

+                <soap:body use="literal"/>

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal"/>

+            </wsdl:output>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportWrapped1">

+            <soap:operation

+                    soapAction="http://www.bigbank.com/Account/getAccountReportWrapped1"/>

+            <wsdl:input>

+                <soap:body use="literal"/>

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal"/>

+            </wsdl:output>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportWrappedN">

+            <soap:operation

+                    soapAction="http://www.bigbank.com/Account/getAccountReportWrappedN"/>

+            <wsdl:input>

+                <soap:body use="literal"/>

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal"/>

+            </wsdl:output>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportBare0">

+            <soap:operation

+                    soapAction="http://www.bigbank.com/Account/getAccountReportBare0"/>

+            <wsdl:input>

+                <soap:body use="literal"/>

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal"/>

+            </wsdl:output>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportBare1Simple">

+            <soap:operation

+                    soapAction="http://www.bigbank.com/Account/getAccountReportBare1Simple"/>

+            <wsdl:input>

+                <soap:body use="literal"/>

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal"/>

+            </wsdl:output>

+        </wsdl:operation>

+        <wsdl:operation name="getAccountReportBare1Complex">

+            <soap:operation

+                    soapAction="http://www.bigbank.com/Account/getAccountReportBare1Complex"/>

+            <wsdl:input>

+                <soap:body use="literal"/>

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal"/>

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="AccountService">

+        <wsdl:port binding="tns:AccountServiceSOAP"

+                   name="AccountServiceSOAP">

+            <soap:address location="http://localhost:8085/sample-account/services/AccountService"/>

+        </wsdl:port>

+    </wsdl:service>

+</wsdl:definitions>

diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
new file mode 100644
index 0000000000..09d1a58589
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.

+

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

+ -->

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

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

+	xmlns:tns="http://www.example.org/creditscore/doclit/"

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

+	targetNamespace="http://www.example.org/creditscore/doclit/">

+	<wsdl:types>

+		<xsd:schema

+			targetNamespace="http://www.example.org/creditscore/doclit/"

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

+			<xsd:element name="getCreditScoreRequest" type="tns:Customer" />

+			<xsd:complexType name="Customer">

+				<xsd:sequence>

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

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

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

+				</xsd:sequence>

+			</xsd:complexType>				

+			<xsd:element name="getCreditScoreResponse" type="tns:CreditReport"/>

+			<xsd:complexType name="CreditReport">

+				<xsd:sequence>

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

+				</xsd:sequence>

+			</xsd:complexType>				

+		</xsd:schema>

+	</wsdl:types>

+	<wsdl:message name="getCreditScoreResponse">

+		<wsdl:part element="tns:getCreditScoreResponse"

+			name="getCreditScoreResponse" />

+	</wsdl:message>

+	<wsdl:message name="getCreditScoreRequest">

+		<wsdl:part element="tns:getCreditScoreRequest"

+			name="getCreditScoreRequest" />

+	</wsdl:message>

+	<wsdl:portType name="CreditScoreDocLit">

+		<wsdl:operation name="getCreditScore">

+			<wsdl:input message="tns:getCreditScoreRequest" />

+			<wsdl:output message="tns:getCreditScoreResponse" />

+		</wsdl:operation>

+	</wsdl:portType>

+	<wsdl:binding name="CreditScoreDocLitSOAP" type="tns:CreditScoreDocLit">

+		<soap:binding style="document"

+			transport="http://schemas.xmlsoap.org/soap/http" />

+		<wsdl:operation name="getCreditScore">

+			<soap:operation

+				soapAction="http://www.example.org/creditscore/doclit/getCreditScore" />

+			<wsdl:input>

+				<soap:body parts="getCreditScoreRequest" use="literal" />

+			</wsdl:input>

+			<wsdl:output>

+				<soap:body parts="getCreditScoreResponse" use="literal" />

+			</wsdl:output>

+		</wsdl:operation>

+	</wsdl:binding>

+	<wsdl:service name="CreditScore">

+		<wsdl:port binding="tns:CreditScoreDocLitSOAP"

+			name="CreditScoreDocLitSOAP">

+			<soap:address location="http://www.example.org/" />

+		</wsdl:port>

+	</wsdl:service>

+</wsdl:definitions>

diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/helloworld.wsdl
new file mode 100644
index 0000000000..051f604bb2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/helloworld.wsdl
@@ -0,0 +1,121 @@
+<?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://helloworldaxis.samples.tuscany.apache.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://helloworldaxis.samples.tuscany.apache.org" xmlns:intf="http://helloworldaxis.samples.tuscany.apache.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="stockquote">
+    <!--WSDL created by Apache Axis version: 1.2.1
+Built on Jun 14, 2005 (09:15:57 EDT)-->
+    <wsdl:types>
+        <schema elementFormDefault="qualified" 
+        	xmlns:hello="http://helloworldaxis.samples.tuscany.apache.org" 
+        	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        	targetNamespace="http://helloworldaxis.samples.tuscany.apache.org" xmlns="http://www.w3.org/2001/XMLSchema">
+        	<complexType name="ComplexGreetings">
+                <sequence>
+                    <element name="greet1" type="xsd:string"/>
+                    <element name="greet2" type="xsd:double"/>
+                </sequence>
+        	</complexType>
+        	<element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="in0" type="xsd:string"/>
+                        <element name="in1" type="xsd:double"/>
+                        <element name="in2" type="hello:ComplexGreetings"/>
+                    </sequence>
+                    <xsd:attribute name="language" type="xsd:string"/>
+                </complexType>
+            </element>
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+
+        <wsdl:part element="impl:getGreetings" name="parameters"/>
+
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+
+        <wsdl:part element="impl:getGreetingsResponse" name="parameters"/>
+
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorldServiceImpl">
+
+        <wsdl:operation name="getGreetings">
+
+            <wsdl:input message="impl:getGreetingsRequest" name="getGreetingsRequest"/>
+
+            <wsdl:output message="impl:getGreetingsResponse" name="getGreetingsResponse"/>
+
+        </wsdl:operation>
+
+    </wsdl:portType>
+
+    <wsdl:binding name="helloworldSoapBinding" type="impl:HelloWorldServiceImpl">
+
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <wsdl:operation name="getGreetings">
+
+            <wsdlsoap:operation soapAction=""/>
+
+            <wsdl:input name="getGreetingsRequest">
+
+                <wsdlsoap:body use="literal"/>
+
+            </wsdl:input>
+
+            <wsdl:output name="getGreetingsResponse">
+
+                <wsdlsoap:body use="literal"/>
+
+            </wsdl:output>
+
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldServiceImplService">
+
+        <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
+
+            <!-- Tuscany SCA Service -->
+<!--
+            <wsdlsoap:address location="http://localhost:8080/tuscany-samples-helloworldws-service/services/HelloWorldService"/>
+-->
+            <wsdlsoap:address location="http://localhost:9876/tuscany-samples-helloworldws-service/services/HelloWorldService"/>
+
+            <!-- Axis Web Service -->
+            <!--
+            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc-incubating-M1/services/helloworld"/>
+            -->
+
+        </wsdl:port>
+
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/interopdoc.wsdl
new file mode 100644
index 0000000000..820c26ca34
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/interopdoc.wsdl
@@ -0,0 +1,180 @@
+<?xml version="1.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.    
+ -->
+<definitions name="InteropTestDoc" targetNamespace="http://soapinterop.org/"
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:tns="http://soapinterop.org/"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+	<types>
+
+		<xsd:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/" xmlns:interop="http://soapinterop.org/">
+
+			<xsd:element name="SingleTag">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+
+			<xsd:complexType name="SingleTag"/>
+			<xsd:element name="SingleTagResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="SimpleDocument">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:complexType name="SimpleDocument">
+				<xsd:simpleContent>
+					<xsd:extension base="xsd:string"/>
+				</xsd:simpleContent>
+			</xsd:complexType>
+			<xsd:element name="SimpleDocumentResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="ComplexDocument">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:complexType name="ComplexDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument"/>
+					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument"/>
+				</xsd:sequence>
+				<xsd:attribute name="AnAttribute" type="xsd:string"/>
+			</xsd:complexType>
+			<xsd:complexType name="ArrayOfSimpleDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument"/>
+				</xsd:sequence>
+			</xsd:complexType>
+			<xsd:complexType name="ChildDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument"/>
+				</xsd:sequence>
+			</xsd:complexType>
+			<xsd:element name="ComplexDocumentResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+
+		</xsd:schema>
+
+	</types>
+
+	<message name="SingleTagSoapIn">
+		<part name="parameters" element="tns:SingleTag"/>
+	</message>
+	<message name="SingleTagSoapOut">
+		<part name="outputDoc" element="tns:SingleTagResponse"/>
+	</message>
+	<message name="SimpleDocumentSoapIn">
+		<part name="parameters" element="tns:SimpleDocument"/>
+	</message>
+	<message name="SimpleDocumentSoapOut">
+		<part name="outputDoc" element="tns:SimpleDocumentResponse"/>
+	</message>
+	<message name="ComplexDocumentSoapIn">
+		<part name="parameters" element="tns:ComplexDocument"/>
+	</message>
+	<message name="ComplexDocumentSoapOut">
+		<part name="outputDoc" element="tns:ComplexDocumentResponse"/>
+	</message>
+
+	<portType name="DocTestPortType">
+
+		<operation name="SingleTag">
+			<input message="tns:SingleTagSoapIn"/>
+			<output message="tns:SingleTagSoapOut"/>
+		</operation>
+		<operation name="SimpleDocument">
+			<input message="tns:SimpleDocumentSoapIn"/>
+			<output message="tns:SimpleDocumentSoapOut"/>
+		</operation>
+		<operation name="ComplexDocument">
+			<input message="tns:ComplexDocumentSoapIn"/>
+			<output message="tns:ComplexDocumentSoapOut"/>
+		</operation>
+
+	</portType>
+
+	<binding name="doc_test_binding" type="tns:DocTestPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+		<operation name="SingleTag">
+			<soap:operation soapAction="http://soapinterop.org/SingleTag"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation> 
+
+		<operation name="SimpleDocument">
+			<soap:operation soapAction="http://soapinterop.org/SimpleDocument"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation> 
+
+		<operation name="ComplexDocument">
+			<soap:operation soapAction="http://soapinterop.org/ComplexDocument"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation> 
+	</binding>
+
+	<service name="interopDocSvc">
+
+  		<port name="interopDocPort" binding="tns:doc_test_binding">
+    			<soap:address location="http://www.whitemesa.net/interopdoc"/>
+  		</port>
+
+	</service>
+
+</definitions>
diff --git a/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/sequences.xsd
new file mode 100644
index 0000000000..a565f3fa65
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.1/tools/java2wsdl/src/test/resources/sequences.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ -->
+<xsd:schema xmlns:seq="http://www.example.com/sequences"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.example.com/sequences">
+
+	<xsd:element name="mixedStockQuote" type="seq:MixedQuote" />
+	<xsd:element name="rc" type="seq:RepeatingChoice" />
+	<xsd:element name="mrc" type="seq:MixedRepeatingChoice" />
+	<xsd:element name="rc2" type="seq:TwoRCs" />
+	<xsd:element name="mrc2" type="seq:TwoRCsMixed" />
+
+
+
+	<xsd:complexType mixed="true" name="MixedQuote">
+		<xsd:sequence>
+			<xsd:element name="symbol" type="xsd:string" />
+			<xsd:element name="companyName" type="xsd:string" />
+			<xsd:element name="price" type="xsd:decimal" />
+			<xsd:element name="open1" type="xsd:decimal" />
+			<xsd:element name="high" type="xsd:decimal" />
+			<xsd:element name="low" type="xsd:decimal" />
+			<xsd:element name="volume" type="xsd:double" />
+			<xsd:element name="change1" type="xsd:double" />
+			<xsd:element maxOccurs="unbounded" minOccurs="0"
+				name="quotes" type="seq:MixedQuote" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="RepeatingChoice">
+		<xsd:choice maxOccurs="unbounded" minOccurs="0">
+			<xsd:element name="a" type="xsd:string" />
+			<xsd:element name="b" type="xsd:int" />
+		</xsd:choice>
+	</xsd:complexType>
+
+
+	<xsd:complexType mixed="true" name="MixedRepeatingChoice">
+		<xsd:choice maxOccurs="unbounded" minOccurs="0">
+			<xsd:element name="a" type="xsd:string" />
+			<xsd:element name="b" type="xsd:int" />
+		</xsd:choice>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="TwoRCs">
+		<xsd:sequence>
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="a" type="xsd:string" />
+				<xsd:element name="b" type="xsd:int" />
+			</xsd:choice>
+
+			<xsd:element name="split" type="xsd:string" />
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="y" type="xsd:string" />
+				<xsd:element name="z" type="xsd:int" />
+			</xsd:choice>
+
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType mixed="true" name="TwoRCsMixed">
+		<xsd:sequence>
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="a" type="xsd:string" />
+				<xsd:element name="b" type="xsd:int" />
+			</xsd:choice>
+
+			<xsd:element name="split" type="xsd:string" />
+
+			<xsd:choice maxOccurs="unbounded" minOccurs="0">
+				<xsd:element name="y" type="xsd:string" />
+				<xsd:element name="z" type="xsd:int" />
+			</xsd:choice>
+
+		</xsd:sequence>
+	</xsd:complexType>
+
+</xsd:schema>