Moving 1.x branches

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

43 files changed, 0 insertions, 8419 deletions

diff --git a/branches/sca-java-M2/sca/tools/pom.xml b/branches/sca-java-M2/sca/tools/pom.xml
deleted file mode 100644
index dfbcc827fa..0000000000
--- a/branches/sca-java-M2/sca/tools/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-incubator-M2-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>sca-tools</artifactId>
-    <name>Apache Tuscany SCA Tools</name>
-    <description>SCA Tools.</description>
-
-    <repositories>
-        <repository>
-            <id>eclipse.emf</id>
-            <url>http://download.eclipse.org/tools/emf/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.0-incubator-M2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-            <version>2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-java2wsdl</artifactId>
-            <version>${axis2Version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-codegen</artifactId>
-            <version>${axis2Version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen</artifactId>
-            <version>2.2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen-ecore</artifactId>
-            <version>2.2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>annogen</groupId>
-            <artifactId>annogen</artifactId>
-            <version>0.1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
deleted file mode 100644
index 3cb699681c..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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.ws.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 FileOutputStream outputFileStream = null;
-	private String sourceClassName = null;
-	
-    private ArrayList extraClasses;
-    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 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 
-	{
-        Java2WSDLCommandLineOption option = 
-            loadOption(CLASSPATH_OPTION, CLASSPATH_OPTION_LONG);
-        		
-		if (option != null) {
-            ArrayList optionValues = option.getOptionValues();
-            URL[] 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);
-            }
-
-            classLoader = new URLClassLoader(urls, Thread.currentThread().getContextClassLoader());
-
-        } else {
-            classLoader = 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();
-	}
-	
-	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.schemaTargetNamespace = Java2WSDLUtils
-                    .schemaNamespaceFromClassName(getSourceClassName(), getClassLoader()).toString();
-        }
-        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_QUALIFIED;
-        }
-        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;
-    }
-}
-	
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
deleted file mode 100644
index 8855c3f6e9..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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 follwing 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>, <schema location>] : schemas to be imported (and not generated)");
-            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("-xc <extra class> : Extra class for which schematype must be generated.  " +
-            "\t\tUse as : -xc class1 -xc class2 ...");
-            System.exit(0);
-        }
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
deleted file mode 100644
index 3323113af4..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
deleted file mode 100644
index e8f3db95b0..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
deleted file mode 100644
index 9d1a9df438..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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.ws.java2wsdl.Java2WSDL;
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
-import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
-
-/**
- * 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 subcribers
- * denoting the start and end of the phase.
- * 
- * Such a spliting 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());
-		}
-		
-        java2WsdlBuilder.getWsdlDocument().serialize(getOutputStream());
-		getOutputStream().flush();
-		getOutputStream().close();;
-
-		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 successul
-			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();
-		}
-
-		// TODO Auto-generated method stub
-
-	}
-
-	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);
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see tuscany.tools.Java2WSDLGeneratorIfc#addWSDLGenListener(tuscany.tools.WSDLGenListener)
-	 */
-	public void addWSDLGenListener(WSDLGenListener l) {
-		genPhaseListeners.add(l);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see tuscany.tools.Java2WSDLGeneratorIfc#removeWSDLGenListener(tuscany.tools.WSDLGenListener)
-	 */
-	public void removeWSDLGenListener(WSDLGenListener l) {
-		genPhaseListeners.remove(l);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see tuscany.tools.Java2WSDLGeneratorIfc#getCommandLineOptions()
-	 */
-	public Map getCommandLineOptions() {
-		return commandLineOptions;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see tuscany.tools.Java2WSDLGeneratorIfc#setCommandLineOptoins(java.util.Map)
-	 */
-	public void setCommandLineOptoins(Map cmdLineOpts) {
-		commandLineOptions = cmdLineOpts;
-	}
-
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see tuscany.tools.Java2WSDLGeneratorIfc#getOutputStream()
-	 */
-	public OutputStream getOutputStream() {
-		// TODO Auto-generated method stub
-		return outputStream;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see tuscany.tools.Java2WSDLGeneratorIfc#setOutputStream(java.io.OutputStream)
-	 */
-	public void setOutputStream(OutputStream outStream) {
-		outputStream = outStream;
-	}
-
-	
-	public TuscanyJava2WSDLBuilder getJava2WsdlBuilder()
-	{
-		return java2WsdlBuilder;
-	}
-
-	public void setJava2WsdlBuilder(TuscanyJava2WSDLBuilder java2WsdlBuilder)
-	{
-		this.java2WsdlBuilder = java2WsdlBuilder;
-	}
-
-	
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
deleted file mode 100644
index 67609445ae..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.java2wsdl.generate;
-
-import java.io.StringReader;
-import java.lang.reflect.Constructor;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sdo.util.SDOUtil;
-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.apache.ws.java2wsdl.Java2WSDLUtils;
-import org.codehaus.jam.JClass;
-import org.codehaus.jam.JProperty;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-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;
-
-    protected SchemaBuilder(XmlSchemaCollection schemaCollection,
-                            Hashtable schemaMap,
-                            Hashtable nsPrefixMap,
-                            TuscanyTypeTable typeTable,
-                            String attrFormDef,
-                            String eleFormDef,
-                            Map schemaLocMap,
-                            ClassLoader classLoader) {
-        this.schemaMap = schemaMap;
-        this.xmlSchemaCollection = schemaCollection;
-        this.targetNamespacePrefixMap = nsPrefixMap;
-        this.typeTable = typeTable;
-        this.schemaLocationMap = schemaLocMap;
-        this.classLoader = classLoader;
-        this.attrFormDefault = attrFormDef;
-        this.elementFormDefault = eleFormDef;
-    }
-
-    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) {
-            // invoke XSDHelper to generate schema for this sdo type
-            XSDHelper xsdHelper = SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
-            // it is better to check if XSDHelper can generate the schema
-            if (xsdHelper.isXSD(dataType)) {
-                // if schemalocations for xsd has been specified, include them
-                includeExtXSD(dataType);
-            } else {
-                List typeList = new Vector();
-                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;
-    }
-
-    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];
-            }
-        }
-
-        // the following lines are executed only if a prefix was not found which implies that the
-        // schemaTypeName was not imported earlier and also it does not belong to the targetnamespace
-        String schemaLocation = null;
-        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);
-
-        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 defintions 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 eg. <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;
-    }
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
deleted file mode 100644
index e58d729981..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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.apache.ws.java2wsdl.Java2WSDLConstants;
-import org.codehaus.jam.JMethod;
-
-public class TuscanyJava2OMBuilder implements Java2WSDLConstants {
-
-    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);
-        portType.addAttribute(ATTRIBUTE_NAME,
-                              generationParams.getServiceName() + PORT_TYPE_SUFFIX,
-                              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()) {
-                    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);
-        service.addAttribute(ATTRIBUTE_NAME,
-                             generationParams.getServiceName(),
-                             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);
-        binding.addAttribute("type",
-                             tns.getPrefix() + COLON_SEPARATOR + generationParams.getServiceName()
-                                     + PORT_TYPE_SUFFIX,
-                             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);
-        binding.addAttribute("type",
-                             tns.getPrefix() + COLON_SEPARATOR + generationParams.getServiceName()
-                                     + PORT_TYPE_SUFFIX,
-                             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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
deleted file mode 100644
index b23726f6fa..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.java2wsdl.generate;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.ws.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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
deleted file mode 100644
index cde870fff4..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.java2wsdl.generate;
-
-import org.apache.ws.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";
-    
-    //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";
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
deleted file mode 100644
index 6411327abf..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.java2wsdl.generate;
-
-import java.util.ArrayList;
-
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
-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 optoins
- * 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 {
-    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) 
-                    || !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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
deleted file mode 100644
index 4f3371126d..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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.apache.ws.java2wsdl.Java2WSDLConstants;
-import org.apache.ws.java2wsdl.SchemaGenerator;
-import org.apache.ws.java2wsdl.bytecode.MethodTable;
-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 static final Log log = LogFactory.getLog(SchemaGenerator.class);
-    private ClassLoader classLoader;
-    private String className;
-
-    // to keep loadded 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 );
-    }
-
-    /**
-     * 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 posible 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 genertaion 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 decribe in SimpleTypeTable
-             * nothing will happen) 2. In the next stage for all the methods
-             * messages and port types will be creteated
-             */
-            methods = jclass.getDeclaredMethods();
-
-            // since we do not support overload
-            HashMap uniqueMethods = new HashMap();
-            XmlSchemaComplexType methodSchemaType = null;
-            XmlSchemaSequence sequence = null;
-            QName methodPartSchemaTypeName = null;
-            for (int i = 0; i < methods.length; i++) 
-            {
-                String methodName = methods[i].getSimpleName();
-                JMethod jMethod = methods[i];
-                // no need to think abt 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();
-                QName methodReturnSchemaTypeName = null;
-                
-                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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
deleted file mode 100644
index 4abd7a7ce7..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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.ws.java2wsdl.Java2WSDLUtils;
-import org.codehaus.jam.JClass;
-
-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 simpleXSDTypes;
-    private Hashtable complexXSDTypes;
-    
-    public static String asQualifiedName(String uri, String typeName)
-    {
-        return (uri + DELIMITER + typeName);
-    }
-
-    
-    public  TuscanyTypeTable() 
-    {
-        simpleXSDTypes = new Hashtable();
-        complexXSDTypes = new Hashtable();
-        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));
-    }
-    
-    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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
deleted file mode 100644
index a742e8913d..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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.apache.ws.java2wsdl.Java2WSDLConstants;
-import org.apache.ws.java2wsdl.SchemaGenerator;
-import org.apache.ws.java2wsdl.bytecode.MethodTable;
-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;
-
-    private static final Log log = LogFactory.getLog(SchemaGenerator.class);
-
-    // to keep loadded 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();
-
-    public TuscanyWSDLTypesGenerator(GenerationParameters genParams) throws Exception {
-        DataObjectUtil.initRuntime();
-        this.generationParams = genParams;
-
-        clazz = Class.forName(generationParams.getSourceClassName(),
-                              true,
-                              generationParams.getClassLoader());
-        methodTable = new MethodTable(clazz);
-
-        initializeSchemaMap(generationParams.getSchemaTargetNamespace(),
-                            generationParams.getSchemaTargetNamespacePrefix());
-        schemaBuilder = new SchemaBuilder(xmlSchemaCollection,
-                                          schemaMap,
-                                          targetNamespacePrefixMap,
-                                          typeTable,
-                                          generationParams.getAttrFormDefault(),
-                                          generationParams.getElementFormDefault(),
-                                          generationParams.getSchemaLocationMap(),
-                                          generationParams.getClassLoader());
-    }
-
-    /**
-     * 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 posible 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 genertaion 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 decribe in SimpleTypeTable
-                 * nothing will happen) 2. In the next stage for all the methods
-                 * messages and port types will be creteated
-                 */
-                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 abt 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;
-                    if (paras.length > 0) {
-                        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();
-    
-                    if (!returnType.isVoidType()) {
-                        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 {
-        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) {
-            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(formGlobalElementName(localPartName));
-        globalElement.setQName(elementName);
-
-        xmlSchema.getItems().add(globalElement);
-        xmlSchema.getElements().add(elementName,
-                                    globalElement);
-
-        typeTable.addComplexSchemaType(generationParams.getSchemaTargetNamespace(),
-                                       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 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(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);
-        }
-    }
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
deleted file mode 100644
index 26b3d092de..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.java2wsdl.generate;
-
-import java.util.EventObject;
-
-public class WSDLGenEvent extends EventObject {
-	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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
deleted file mode 100644
index 788d162f34..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
deleted file mode 100644
index b30b8cd62b..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
deleted file mode 100644
index 22383e99db..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.wsdl2java.generate;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.description.AxisMessage;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.util.FileWriter;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.codegen.emitter.JavaEmitter;
-import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
-import org.apache.axis2.wsdl.databinding.TypeMapper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import static org.apache.tuscany.tools.java2wsdl.util.XMLNameUtil.getJavaNameFromXMLName;
-
-/**
- * Overrides the Axis2 JavaEmitter to generate unwrapped methods.
- */
-public class JavaInterfaceEmitter extends JavaEmitter {
-    
-    private CodeGenConfiguration codegenConfiguration;
-    private TypeMapper typeMapper;
-
-    public void setCodeGenConfiguration(CodeGenConfiguration configuration) {
-        super.setCodeGenConfiguration(configuration);
-        codegenConfiguration=configuration;
-    }
-    
-    public void setMapper(TypeMapper typeMapper) {
-        super.setMapper(typeMapper);
-        this.typeMapper = typeMapper;
-    }
-    
-    private List getParameterElementList(Document doc, AxisMessage message, boolean wrapped) {
-        List parameterElementList = new ArrayList();
-        
-        if (message != null && message.getElementQName()!=null) {
-
-            SDODataBindingTypeMappingEntry typeMappingEntry =
-                (SDODataBindingTypeMappingEntry)this.typeMapper.getTypeMappingObject(message.getElementQName());
-            List typeMappings;
-            if (wrapped) {
-                typeMappings = (List)typeMappingEntry.getPropertyClassNames();
-            } else {
-                typeMappings = new ArrayList();
-                typeMappings.add(typeMappingEntry.getClassName());
-            }
-            
-            for (int i=0; i<typeMappings.size(); i++) {
-                Element param = doc.createElement("param");
-                parameterElementList.add(param);
-                
-                String typeMapping = (String)typeMappings.get(i);
-    
-                addAttribute(doc, "name", this.typeMapper.getParameterName(message.getElementQName()), param);
-                addAttribute(doc, "type", (typeMapping == null)
-                        ? ""
-                        : typeMapping, param);
-    
-                // add an extra attribute to say whether the type mapping is the default
- //               if (TypeMapper.DEFAULT_CLASS_NAME.equals(typeMapping)) {
-                 if (typeMapper.getDefaultMappingName().equals(typeMapping)) {
-    
-                    addAttribute(doc, "default", "yes", param);
-                }
-    
-                addAttribute(doc, "value", null, param);
-    
-                // add this as a body parameter
-                addAttribute(doc, "location", "body", param);
-    
-            }
-        }
-
-        return parameterElementList;
-    }
-    
-    public List getParameterElementList(Document doc, List parameters, String location) {
-        List parameterElementList = new ArrayList();
-
-        if ((parameters != null) && !parameters.isEmpty()) {
-            int count = parameters.size();
-
-            for (int i = 0; i < count; i++) {
-                Element param = doc.createElement("param");
-                QName name = (QName) parameters.get(i);
-
-                addAttribute(doc, "name", this.typeMapper.getParameterName(name), param);
-
-                String typeMapping = this.typeMapper.getTypeMappingName(name);
-                String typeMappingStr = (typeMapping == null)
-                        ? ""
-                        : typeMapping;
-
-                addAttribute(doc, "type", typeMappingStr, param);
-                addAttribute(doc, "location", location, param);
-                parameterElementList.add(param);
-            }
-        }
-
-        return parameterElementList;
-    }
-    
-    protected boolean isWrapped(AxisOperation operation) {
-        boolean wrapped = false;
-
-        if (isInputPresentForMEP(operation.getMessageExchangePattern())) {
-            QName qname = operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getElementQName();
-            if (qname != null && qname.getLocalPart().equals(operation.getName().getLocalPart())) {
-                
-                SDODataBindingTypeMappingEntry typeMappingEntry =
-                            (SDODataBindingTypeMappingEntry)this.typeMapper.getTypeMappingObject(qname);
-                if (typeMappingEntry.isAnonymous()) {
-                    wrapped = true;
-                }
-            }
-        }
-        
-        return wrapped;
-    }
-
-    private boolean isInputPresentForMEP(String MEP) {
-        
-   
-        return
-        WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP) ||
-                WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
-                WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
-                WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP) ||
-
-                WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP) ||
-                WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
-                WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
-                WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(MEP) ||
-                
-                WSDLConstants.WSDL_MESSAGE_DIRECTION_IN.endsWith(MEP);
-
-                
-                
-        
-    }
-
-    protected Element getInputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
-        return getElement(doc, "input", operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE), isWrapped(operation), headerParameterQNameList);
-    }
-    
-    protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
-        return getElement(doc, "output", operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE), isWrapped(operation), headerParameterQNameList);
-    }
-
-    protected Element getElement(Document doc, String elementName, AxisMessage message, boolean wrapped, List headerParameterQNameList) {
-        Element element = doc.createElement(elementName);
-
-        List parameterElementList = getParameterElementList(doc, message, wrapped);
-        for (int i = 0; i < parameterElementList.size(); i++) {
-            element.appendChild((Element) parameterElementList.get(i));
-        }
-
-        List outputElementList = getParameterElementList(doc, headerParameterQNameList, "header");
-
-        for (int i = 0; i < outputElementList.size(); i++) {
-            element.appendChild((Element) outputElementList.get(i));
-        }
-
-        return element;
-    }
-    
-    protected void writeInterface(boolean writeDatabinders) throws Exception {
-        Document interfaceModel = createDOMDocumentForInterface(writeDatabinders);
-        if (!codegenConfiguration.getOutputLocation().exists()) {
-            codegenConfiguration.getOutputLocation().mkdirs();
-        }
-        InterfaceWriter interfaceWriter = new RemotableInterfaceWritter(this.codegenConfiguration
-            .getOutputLocation(), this.codegenConfiguration.getOutputLanguage());
-
-        String packageName = interfaceModel.getDocumentElement().getAttribute("package");
-        String className = interfaceModel.getDocumentElement().getAttribute("name");
-
-        System.out.println(">>  Generating Java class " + packageName + "." + className);
-        File outputFile = FileWriter.createClassFile(this.codegenConfiguration.getOutputLocation(),
-                                                     packageName, className, ".java");
-        if (outputFile.exists()) {
-            outputFile.delete();
-        }
-
-        writeClass(interfaceModel, interfaceWriter);
-    }
-
-    protected String makeJavaClassName(String word) {
-        //return XMLNameUtil.getJavaNameFromXMLName(word, true);
-        return getJavaNameFromXMLName(word, true);
-    }
-
-    
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
deleted file mode 100644
index b68277566a..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.wsdl2java.generate;
-
-import static org.apache.tuscany.tools.java2wsdl.util.XMLNameUtil.getPackageNameFromNamespace;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
-import org.apache.axis2.util.XMLUtils;
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
-import org.apache.axis2.wsdl.codegen.extension.DefaultDatabindingExtension;
-import org.apache.axis2.wsdl.codegen.extension.PackageFinder;
-import org.apache.axis2.wsdl.codegen.extension.WSDLValidatorExtension;
-import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-public class JavaInterfaceGenerator {
-
-    private List codegenExtensions = new ArrayList();
-    private List<CodeGenConfiguration> codegenConfigurations= new LinkedList<CodeGenConfiguration>();
-    
-    
-
-
-    public JavaInterfaceGenerator(String uri, String ports[], String outputLocation, String packageName,
-                                  Map<QName, SDODataBindingTypeMappingEntry> typeMapping) throws CodeGenerationException {
-        
-        Definition definition;
-        try {
-            definition = readWSDL(uri);
-        } catch (WSDLException e) {
-            throw new CodeGenerationException(e);
-        }
-        
-        HashSet interestedPorts= ports == null ? null : new HashSet(Arrays.asList(ports));
-        
-       // Service service=(Service)definition.getServices().values().().next();
-        
-        HashSet<QName> donePortTypes= new HashSet<QName>();
-        
-        for (Iterator sIter  = definition.getServices().values().iterator(); sIter.hasNext(); ) {
-            Service service = (Service) sIter.next();
-            
-            QName serviceQname = service.getQName();
-             for (Iterator pIter= service.getPorts().values().iterator(); pIter.hasNext(); ) {
-                 Port port= (Port) pIter.next();
-                if(interestedPorts != null && ! interestedPorts.contains(port.getName())) continue;//not iterested.
-                 PortType portType= getPortType(port);
-                 if(null == portType) continue; // not connected.
-                 QName pQName= portType.getQName();
-                 if(donePortTypes.contains(pQName)) continue; //allready did it.
-                 donePortTypes.add(pQName);
-              
-                if (packageName == null) {
-                                        
-                    packageName = getPackageNameFromNamespace(definition.getTargetNamespace());
-                }
-                JavaTypeMapper typeMapper = new JavaTypeMapper();
-                for (Map.Entry<QName, SDODataBindingTypeMappingEntry> e : typeMapping.entrySet()) {
-                    typeMapper.addTypeMappingObject(e.getKey(), e.getValue());
-                }
-                AxisService axisService;
-                try {
-                    axisService = new WSDL11ToAxisServiceBuilder(definition, serviceQname, port.getName()).populateService();
-                } catch (AxisFault e) {
-                    throw new CodeGenerationException(e);
-                }
-                axisService.setName(port.getBinding().getPortType().getQName().getLocalPart());
-                CodeGenConfiguration codegenConfiguration = new CodeGenConfiguration(Collections.EMPTY_MAP);
-                codegenConfigurations.add(codegenConfiguration);
-                codegenConfiguration.setAxisService(axisService);
-                codegenConfiguration.setAdvancedCodeGenEnabled(false);
-                codegenConfiguration.setAsyncOn(false);
-                codegenConfiguration.setDatabindingType("sdo");
-                codegenConfiguration.setGenerateAll(true);
-                codegenConfiguration.setGenerateDeployementDescriptor(false);
-                codegenConfiguration.setOutputLanguage("java");
-                codegenConfiguration.setOutputLocation(new File(outputLocation));
-                codegenConfiguration.setPackageName(packageName);
-                codegenConfiguration.setPackClasses(false);
-                codegenConfiguration.setPolicyMap(Collections.EMPTY_MAP);
-                codegenConfiguration.setPortName(port.getName());
-                codegenConfiguration.setServerSide(false);
-                codegenConfiguration.setServiceName(service.getQName().getLocalPart());
-                codegenConfiguration.setSyncOn(true);
-                codegenConfiguration.setTypeMapper(typeMapper);
-                codegenConfiguration.setWriteMessageReceiver(false);
-                codegenConfiguration.setWriteTestCase(false);
-                addExtension(new WSDLValidatorExtension(), codegenConfiguration);
-                addExtension(new PackageFinder(), codegenConfiguration);
-                addExtension(new SDODataBindingCodegenExtension(typeMapper), codegenConfiguration);
-                addExtension(new DefaultDatabindingExtension(), codegenConfiguration);
-            }            
-        }        
-    }
-
-
-    private PortType getPortType(Port port) {
-       Binding binding = port.getBinding();
-       if(null != binding){
-          return binding.getPortType();
-       }
-       return null;
-        
-    }
-
-
-    @SuppressWarnings("unchecked")
-    private void addExtension(CodeGenExtension ext, CodeGenConfiguration codegenConfiguration) {
-        //ext.init(codegenConfiguration);
-        codegenExtensions.add(new Object[]{ext, codegenConfiguration});
-    }
-
-    public void generate() throws CodeGenerationException {
-        try {
-            for (int i = 0; i < codegenExtensions.size(); i++) {
-                //CodeGenExtension 
-                Object[] pair = (Object[])codegenExtensions.get(i);
-                
-                CodeGenExtension cge= (CodeGenExtension) pair[0];
-                CodeGenConfiguration cgf= (CodeGenConfiguration)pair[1];
-                
-                cge.engage(cgf);
-               
-            }
-
-            for(CodeGenConfiguration codegenConfiguration : codegenConfigurations){
-            JavaInterfaceEmitter emitter = new JavaInterfaceEmitter();
-            emitter.setCodeGenConfiguration(codegenConfiguration);
-            emitter.setMapper(codegenConfiguration.getTypeMapper());
-
-            emitter.writeInterface(false);
-            }
-
-        } catch (Exception e) {
-            throw new CodeGenerationException(e);
-        }
-    }
-
-    /**
-     * Read the WSDL file
-     * @param uri
-     * @return
-     * @throws WSDLException
-     */
-    private Definition readWSDL(String uri) throws WSDLException {
-
-        WSDLReader reader =
-                WSDLFactory.newInstance().newWSDLReader();
-        reader.setFeature("javax.wsdl.importDocuments", true);
-
-        File file = new File(uri);
-        String baseURI;
-
-        if (uri.startsWith("http://")){
-            baseURI = uri;
-        } else{
-            if(file.getParentFile() == null){
-               try {
-                    baseURI = new File(".").getCanonicalFile().toURI().toString();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            } else {
-                baseURI = file.getParentFile().toURI().toString();
-            }
-        }
-
-        Document doc;
-        try {
-            doc = XMLUtils.newDocument(uri);
-        } catch (ParserConfigurationException e) {
-            throw new WSDLException(WSDLException.PARSER_ERROR,
-                    "Parser Configuration Error",
-                    e);
-        } catch (SAXException e) {
-            throw new WSDLException(WSDLException.PARSER_ERROR,
-                    "Parser SAX Error",
-                    e);
-
-        } catch (IOException e) {
-            throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
-        }
-
-        return reader.readWSDL(baseURI, doc);
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
deleted file mode 100644
index cb413bca50..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.wsdl2java.generate;
-
-import java.io.File;
-
-import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
-
-/**
- * @author lresende
- */
-public class RemotableInterfaceWritter extends InterfaceWriter {
-    private static final String REMOTABLE_INTERFACE_TEMPLATE="/RemotableInterfaceTemplate.xsl";
-
-    public RemotableInterfaceWritter(String outputFileLocation) {
-        super(outputFileLocation);
-    }
-
-    public RemotableInterfaceWritter(File outputFileLocation, String language) {
-        super(outputFileLocation, language);
-    }
-    
-    /**
-     * Loads the template.
-     */
-    @Override
-    public void loadTemplate() throws CodeGenerationException {
-        // the default behavior for the class writers is to use the property map from the languge specific types
-        // The properties are arranged in the following order
-        // <lang-name>.* .template=<write-class>,<template-name>
-
-        //overrida original behaviour to always load the template we specified
-        this.xsltStream = this.getClass().getResourceAsStream(REMOTABLE_INTERFACE_TEMPLATE);
-
-    }
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
deleted file mode 100644
index 075959f985..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.wsdl2java.generate;
-
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.extension.AbstractDBProcessingExtension;
-import org.apache.axis2.wsdl.databinding.TypeMapper;
-
-/**
- * SDO data binding codegen extension.
- */
-public class SDODataBindingCodegenExtension extends AbstractDBProcessingExtension {
-
-    private TypeMapper typeMapper;
-    
-    public SDODataBindingCodegenExtension(TypeMapper typeMapper) {
-        this.typeMapper=typeMapper;
-    }
-    
-    protected boolean testFallThrough(String dbFrameworkName) {
-        return !dbFrameworkName.equals("sdo");
-    }
-
-//    public void engage() {
-//        if (testFallThrough(configuration.getDatabindingType())) {
-//            return;
-//        }
-//        
-//        // Set the type mapper into the config
-//        configuration.setTypeMapper(typeMapper);
-//
-//    }
-
-    public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
-        // TODO Auto-generated method stub
-        if (testFallThrough(configuration.getDatabindingType())) {
-            return;
-        }
-        
-        // Set the type mapper into the config
-        configuration.setTypeMapper(typeMapper);
-
-        
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
deleted file mode 100644
index 2d81ef12bf..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.wsdl2java.generate;
-
-import java.util.List;
-
-/**
- * This represents a type mapping entry, used by the JavaInterfaceEmitter to generate
- * method signatures.  
- */
-public class SDODataBindingTypeMappingEntry {
-
-    private final boolean anonymous;
-    private final List<String> propertyClassNames;
-    private final String className;
-
-    public SDODataBindingTypeMappingEntry(String className, boolean anonymous, List<String> propertyClassNames) {
-        this.className = className;
-        this.anonymous = anonymous;
-        this.propertyClassNames = propertyClassNames;
-    }
-
-    public boolean isAnonymous() {
-        return anonymous;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public List<String> getPropertyClassNames() {
-        return propertyClassNames;
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
deleted file mode 100644
index 3fe87db153..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.wsdl2java.generate;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sdo.helper.XSDHelperImpl;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModelFactory;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.helper.XSDHelper;
-
-public class WSDL2JavaGenerator {
-
-    /**
-     * Generate Java interfaces from WSDL Usage arguments: [ -targetDirectory
-     * <target-root-directory> ] [ -javaPackage <java-package-name> ]
-     * <wsdl-file> For example: generate somedir/somefile.wsdl Basic options:
-     * -targetDirectory Generates the Java source code in the specified
-     * directory. By default, the code is generated in the same directory as the
-     * input wsdl file. -javaPackage Overrides the Java package for the
-     * generated classes. By default the package name is derived from the
-     * targetNamespace of the WSDL definition being generated. For example, if
-     * the targetNamespace is "http://www.example.com/simple", the default
-     * package will be "com.example.simple".
-     */
-    public static void main(String args[]) {
-        if (args.length == 0) {
-            printUsage();
-            return;
-        }
-
-        String portName = null;
-        String targetDirectory = null;
-        String wsdlJavaPackage = null;
-        String xsdJavaPackage = null;
-
-        int index = 0;
-        for (; index < args.length && args[index].startsWith("-"); ++index) {
-            if (args[index].equalsIgnoreCase("-port")) {
-                portName = args[++index];
-            } else if (args[index].equalsIgnoreCase("-targetDirectory")) {
-                targetDirectory = args[++index];
-            } else if (args[index].equalsIgnoreCase("-javaPackage")) {
-                wsdlJavaPackage = args[++index];
-            }
-            // else if (...)
-            else {
-                printUsage();
-                return;
-            }
-        }
-
-        String wsdlFileName = args[index];
-        if (wsdlFileName == null || targetDirectory == null) {
-            printUsage();
-            return;
-        }
-
-        generateFromWSDL(wsdlFileName, portName!=null? new String[]{portName}:null, targetDirectory, wsdlJavaPackage, xsdJavaPackage, 0);
-
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void generateFromWSDL(String wsdlFileName, String targetDirectory,
-            String wsdlJavaPackage,
-            String xsdJavaPackage, int genOptions){
-        generateFromWSDL( wsdlFileName, null, targetDirectory,
-                wsdlJavaPackage,
-                xsdJavaPackage, genOptions);
-        
-    }
-    
-    
-    @SuppressWarnings("unchecked")
-      public static void generateFromWSDL(String wsdlFileName, String[] ports,
-                 String targetDirectory, String wsdlJavaPackage,
-                 String xsdJavaPackage, int genOptions) 
-     {
-
-        // Initialize the SDO runtime
-        DataObjectUtil.initRuntime();
-        EPackage.Registry packageRegistry = new EPackageRegistryImpl(EPackage.Registry.INSTANCE);
-        ExtendedMetaData extendedMetaData = new BasicExtendedMetaData(packageRegistry);
-        XSDHelper xsdHelper = new XSDHelperImpl(extendedMetaData);
-
-        try {
-            
-            // Load the WSDL file
-            File inputFile = new File(wsdlFileName).getAbsoluteFile();
-            InputStream inputStream = new FileInputStream(inputFile);
-            
-            // Define SDO metadata
-            xsdHelper.define(inputStream, inputFile.toURI().toString());
-
-            if (targetDirectory == null) {
-                targetDirectory = new File(wsdlFileName).getCanonicalFile().getParent();
-            } else {
-                targetDirectory = new File(targetDirectory).getCanonicalPath();
-            }
-
-            // Populate the typeMapping table that will be given to the Axis2 WSDL2Java 
-            Map<QName, SDODataBindingTypeMappingEntry> typeMapping =
-                                    new HashMap<QName, SDODataBindingTypeMappingEntry>();
-            if (!packageRegistry.values().isEmpty()) {
-                ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-
-                // Populate list of GenPackages and a map of GenClasses keyed by EClass 
-                List<GenPackage> genPackages = new ArrayList<GenPackage>();
-                Map<EClass, GenClass> genClasses = new HashMap<EClass, GenClass>();
-                for (Iterator iter = packageRegistry.values().iterator(); iter.hasNext();) {
-                    EPackage currentEPackage = (EPackage)iter.next();
-                    String currentBasePackage = extractBasePackageName(currentEPackage, xsdJavaPackage);
-                    String currentPrefix = CodeGenUtil.capName(currentEPackage.getName());
-
-                    GenPackage currentGenPackage = createGenPackage(currentEPackage, currentBasePackage,
-                                                                    currentPrefix, genOptions, resourceSet);
-                    genPackages.add(currentGenPackage);
-                    for (GenClass genClass : (List<GenClass>)currentGenPackage.getGenClasses()) {
-                        genClasses.put(genClass.getEcoreClass(), genClass);
-                    }
-
-                }
-
-                // Process all the SDO packages
-                // Populate the qname -> interfaceName typeMapping table
-                for (GenPackage currentGenPackage : genPackages) {
-                    EPackage currentEPackage = currentGenPackage.getEcorePackage();
-                    
-                    // Populate the type mappings for all the complex types
-                    for (GenClass genClass : (List<GenClass>)currentGenPackage.getGenClasses()) {
-                        QName qname = new QName(extendedMetaData.getNamespace(currentEPackage),
-                                                extendedMetaData.getName(genClass.getEcoreClass()));
-                        String interfaceName = currentGenPackage.getInterfacePackageName() + '.'
-                                               + genClass.getInterfaceName();
-                        SDODataBindingTypeMappingEntry typeMappingEntry =
-                                new SDODataBindingTypeMappingEntry(interfaceName, false, null);
-                        typeMapping.put(qname, typeMappingEntry);
-                    }
-
-                    // Process all the global XSD elements
-                    EClass documentRoot = extendedMetaData.getDocumentRoot(currentEPackage);
-                    if (documentRoot != null) {
-                        for (EStructuralFeature element : (List<EStructuralFeature>)extendedMetaData
-                            .getElements(documentRoot)) {
-                            EClassifier elementType = element.getEType();
-                            
-                            // Handle a complex type
-                            if (elementType instanceof EClass) {
-                                EClass eClass = (EClass)elementType;
-
-                                GenClass genClass = genClasses.get(elementType);
-                                QName qname = new QName(extendedMetaData.getNamespace(currentEPackage),
-                                        extendedMetaData.getName(element));
-                                String interfaceName = genClass.getGenPackage().getInterfacePackageName()
-                                + '.' + genClass.getInterfaceName();
-                                boolean anonymous = extendedMetaData.isAnonymous(eClass);
-                                
-                                // Build list of property class names
-                                List<String> propertyClassNames=new ArrayList<String>();
-                                for (EStructuralFeature feature : (List<EStructuralFeature>)eClass.getEStructuralFeatures()) {
-                                    EClassifier propertyType = feature.getEType();
-                                    if (propertyType instanceof EClass) {
-                                        GenClass propertyGenClass = genClasses.get(propertyType);
-                                        String propertyClassName = propertyGenClass.getGenPackage().getInterfacePackageName()
-                                                               + '.' + propertyGenClass.getInterfaceName();
-                                        propertyClassNames.add(propertyClassName);
-                                    } else if (propertyType instanceof EClassifier) {
-                                        String propertyClassName = propertyType.getInstanceClass().getName();
-                                        propertyClassNames.add(propertyClassName);
-                                    }
-                                }
-
-                                SDODataBindingTypeMappingEntry typeMappingEntry = 
-                                    new SDODataBindingTypeMappingEntry(interfaceName, anonymous, propertyClassNames);
-                                typeMapping.put(qname, typeMappingEntry);
-                                
-                            } else {
-                                
-                                // Handle a simple type
-                                QName qname = new QName(extendedMetaData.getNamespace(currentEPackage),
-                                                        extendedMetaData.getName(element));
-                                String className = elementType.getInstanceClass().getName();
-                                SDODataBindingTypeMappingEntry typeMappingEntry = 
-                                        new SDODataBindingTypeMappingEntry(className, false, null);
-                                typeMapping.put(qname, typeMappingEntry);
-                            }
-                        }
-                    }
-                }
-            }
-
-            try {
-                JavaInterfaceGenerator codeGenerator = new JavaInterfaceGenerator(wsdlFileName,
-                                                                                  ports,
-                                                                                  targetDirectory,
-                                                                                  wsdlJavaPackage,
-                                                                                  typeMapping);
-                codeGenerator.generate();
-            } catch (Exception e) {
-                throw new IllegalArgumentException(e);
-            }
-
-        } catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static GenPackage createGenPackage(EPackage ePackage, String basePackage, String prefix,
-                                              int genOptions, ResourceSet resourceSet) {
-        GenModel genModel = ecore2GenModel(ePackage, basePackage, prefix, genOptions);
-
-        URI ecoreURI = URI.createURI("file:///" + ePackage.getName() + ".ecore");
-        URI genModelURI = ecoreURI.trimFileExtension().appendFileExtension("genmodel");
-
-        Resource ecoreResource = resourceSet.createResource(ecoreURI);
-        ecoreResource.getContents().add(ePackage);
-
-        Resource genModelResource = resourceSet.createResource(genModelURI);
-        genModelResource.getContents().add(genModel);
-
-        return (GenPackage)genModel.getGenPackages().get(0);
-    }
-
-    public static GenModel ecore2GenModel(EPackage ePackage, String basePackage,
-                                          String prefix, int genOptions) {
-        GenModel genModel = GenModelFactory.eINSTANCE.createGenModel();
-        genModel.initialize(Collections.singleton(ePackage));
-
-        genModel.setRootExtendsInterface("");
-        genModel.setRootImplementsInterface("commonj.sdo.DataObject");
-        genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.DataObjectImpl");
-        genModel.setFeatureMapWrapperInterface("commonj.sdo.Sequence");
-        genModel.setFeatureMapWrapperInternalInterface("org.apache.tuscany.sdo.util.BasicSequence");
-        genModel.setFeatureMapWrapperClass("org.apache.tuscany.sdo.util.BasicSequence");
-        genModel.setSuppressEMFTypes(true);
-        genModel.setSuppressEMFMetaData(true);
-        genModel.setSuppressEMFModelTags(true);
-        genModel.setCanGenerate(true);
-        // FIXME workaround java.lang.NoClassDefFoundError:
-        // org/eclipse/jdt/core/jdom/IDOMNode with 02162006 build
-        genModel.setFacadeHelperClass("Hack");
-        genModel.setForceOverwrite(true);
-
-        GenPackage genPackage = (GenPackage)genModel.getGenPackages().get(0);
-
-        if (basePackage != null) {
-            genPackage.setBasePackage(basePackage);
-        }
-        if (prefix != null) {
-            genPackage.setPrefix(prefix);
-        }
-
-        return genModel;
-    }
-
-    public static String extractBasePackageName(EPackage ePackage, String javaPackage) {
-        String qualifiedName = javaPackage != null ? javaPackage : ePackage.getName();
-        String name = /* CodeGenUtil. */shortName(qualifiedName);
-        String baseName = qualifiedName.substring(0, qualifiedName.length() - name.length());
-        if (javaPackage != null || !name.equals(qualifiedName)) {
-            ePackage.setName(name);
-        }
-        return baseName != null ? /* CodeGenUtil. */safeQualifiedName(baseName) : null;
-    }
-
-    public static String shortName(String qualifiedName) {
-        int index = qualifiedName.lastIndexOf(".");
-        return index != -1 ? qualifiedName.substring(index + 1) : qualifiedName;
-    }
-
-    public static String safeQualifiedName(String qualifiedName) {
-        StringBuffer safeQualifiedName = new StringBuffer();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(qualifiedName, ".");
-            stringTokenizer.hasMoreTokens();) {
-            String name = stringTokenizer.nextToken();
-            safeQualifiedName.append(CodeGenUtil.safeName(name));
-            if (stringTokenizer.hasMoreTokens()) {
-                safeQualifiedName.append('.');
-            }
-        }
-        return safeQualifiedName.toString();
-    }
-
-    protected static void printDiagnostic(Diagnostic diagnostic, String indent) {
-        System.out.print(indent);
-        System.out.println(diagnostic.getMessage());
-        for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext();) {
-            printDiagnostic((Diagnostic)i.next(), indent + "  ");
-        }
-    }
-
-    protected static void printUsage() {
-        System.out.println("Usage arguments:");
-        System.out.println("  [ -targetDirectory <target-root-directory> ]");
-        System.out.println("  [ -javaPackage <java-package-name> ]");
-        System.out.println("  <wsdl-file>");
-        System.out.println("");
-        System.out.println("For example:");
-        System.out.println("");
-        System.out.println("  generate somedir/somefile.wsdl");
-    }
-
-
-}
diff --git a/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/LICENSE.txt b/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 25d78feeac..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,1277 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany distribution includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
-
-===============================================================================
-
-For the Eclipse Modeling Framework component and the Celtix binding:
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-
-For the Rhino JavaScript container component:
-
-Mozilla Public License 1.1 (MPL 1.1)
-
-1. Definitions.
-
-      1.0.1. "Commercial Use" means distribution or otherwise making the
-Covered Code available to a third party.
-
-      1.1. "Contributor" means each entity that creates or contributes to
-the creation of Modifications.
-
-      1.2. "Contributor Version" means the combination of the Original Code,
-prior Modifications used by a Contributor, and the Modifications made by that
-particular Contributor.
-
-      1.3. "Covered Code" means the Original Code or Modifications or the
-combination of the Original Code and Modifications, in each case including
-portions thereof.
-
-      1.4. "Electronic Distribution Mechanism" means a mechanism generally
-accepted in the software development community for the electronic transfer of
-data.
-
-      1.5. "Executable" means Covered Code in any form other than Source
-Code.
-
-      1.6. "Initial Developer" means the individual or entity identified as
-the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. "Larger Work" means a work which combines Covered Code or
-portions thereof with code not governed by the terms of this License.
-
-      1.8. "License" means this document.
-
-      1.8.1. "Licensable" means having the right to grant, to the maximum
-extent possible, whether at the time of the initial grant or subsequently
-acquired, any and all of the rights conveyed herein.
-
-      1.9. "Modifications" means any addition to or deletion from the
-substance or structure of either the Original Code or any previous
-Modifications. When Covered Code is released as a series of files, a
-Modification is:
-            A. Any addition to or deletion from the contents of a file
-containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or
-previous Modifications.
-             
-      1.10. "Original Code" means Source Code of computer software code
-which is described in the Source Code notice required by Exhibit A as Original
-Code, and which, at the time of its release under this License is not already
-Covered Code governed by this License.
-
-      1.10.1. "Patent Claims" means any patent claim(s), now owned or
-hereafter acquired, including without limitation,  method, process, and
-apparatus claims, in any patent Licensable by grantor.
-
-      1.11. "Source Code" means the preferred form of the Covered Code for
-making modifications to it, including all modules it contains, plus any
-associated interface definition files, scripts used to control compilation and
-installation of an Executable, or source code differential comparisons against
-either the Original Code or another well known, available Covered Code of the
-Contributor's choice. The Source Code can be in a compressed or archival form,
-provided the appropriate decompression or de-archiving software is widely
-available for no charge.
-
-      1.12. "You" (or "Your")  means an individual or a legal entity
-exercising rights under, and complying with all of the terms of, this License
-or a future version of this License issued under Section 6.1. For legal
-entities, "You" includes any entity which controls, is controlled by, or is
-under common control with You. For purposes of this definition, "control"
-means (a) the power, direct or indirect, to cause the direction or management
-of such entity, whether by contract or otherwise, or (b) ownership of more
-than fifty percent (50%) of the outstanding shares or beneficial ownership of
-such entity.
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free,
-non-exclusive license, subject to third party intellectual property claims:
-            (a)  under intellectual property rights (other than patent or
-trademark) Licensable by Initial Developer to use, reproduce, modify, display,
-perform, sublicense and distribute the Original Code (or portions thereof)
-with or without Modifications, and/or as part of a Larger Work; and
-
-            (b) under Patents Claims infringed by the making, using or selling
-of Original Code, to make, have made, use, practice, sell, and offer for sale,
-and/or otherwise dispose of the Original Code (or portions thereof).
-                          (c) the licenses granted in this Section 2.1(a) and
-(b) are effective on the date Initial Developer first distributes Original
-Code under the terms of this License.
-
-            (d) Notwithstanding Section 2.1(b) above, no patent license is
-granted: 1) for code that You delete from the Original Code; 2) separate from
-the Original Code;  or 3) for infringements caused by: i) the modification of
-the Original Code or ii) the combination of the Original Code with other
-software or devices.
-             
-      2.2. Contributor Grant.
-      Subject to third party intellectual property claims, each Contributor
-hereby grants You a world-wide, royalty-free, non-exclusive license
-             
-            (a)  under intellectual property rights (other than patent or
-trademark) Licensable by Contributor, to use, reproduce, modify, display,
-perform, sublicense and distribute the Modifications created by such
-Contributor (or portions thereof) either on an unmodified basis, with other
-Modifications, as Covered Code and/or as part of a Larger Work; and
-
-            (b) under Patent Claims infringed by the making, using, or selling
-of  Modifications made by that Contributor either alone and/or in combination
-with its Contributor Version (or portions of such combination), to make, use,
-sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications
-made by that Contributor (or portions thereof); and 2) the combination of
-Modifications made by that Contributor with its Contributor Version (or
-portions of such combination).
-
-            (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-effective on the date Contributor first makes Commercial Use of the Covered
-Code.
-
-            (d)    Notwithstanding Section 2.2(b) above, no patent license is
-granted: 1) for any code that Contributor has deleted from the Contributor
-Version; 2)  separate from the Contributor Version;  3)  for infringements
-caused by: i) third party modifications of Contributor Version or ii)  the
-combination of Modifications made by that Contributor with other software
-(except as part of the Contributor Version) or other devices; or 4) under
-Patent Claims infringed by Covered Code in the absence of Modifications made
-by that Contributor.
-
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are
-governed by the terms of this License, including without limitation Section
-2.2. The Source Code version of Covered Code may be distributed only under the
-terms of this License or a future version of this License released under
-Section 6.1, and You must include a copy of this License with every copy of
-the Source Code You distribute. You may not offer or impose any terms on any
-Source Code version that alters or restricts the applicable version of this
-License or the recipients' rights hereunder. However, You may include an
-additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be
-made available in Source Code form under the terms of this License either on
-the same media as an Executable version or via an accepted Electronic
-Distribution Mechanism to anyone to whom you made an Executable version
-available; and if made available via Electronic Distribution Mechanism, must
-remain available for at least twelve (12) months after the date it initially
-became available, or at least six (6) months after a subsequent version of
-that particular Modification has been made available to such recipients. You
-are responsible for ensuring that the Source Code version remains available
-even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which You contribute to contain a
-file documenting the changes You made to create that Covered Code and the date
-of any change. You must include a prominent statement that the Modification is
-derived, directly or indirectly, from Original Code provided by the Initial
-Developer and including the name of the Initial Developer in (a) the Source
-Code, and (b) in any notice in an Executable version or related documentation
-in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-            (a) Third Party Claims.
-            If Contributor has knowledge that a license under a third party's
-intellectual property rights is required to exercise the rights granted by
-such Contributor under Sections 2.1 or 2.2, Contributor must include a text
-file with the Source Code distribution titled "LEGAL" which describes the
-claim and the party making the claim in sufficient detail that a recipient
-will know whom to contact. If Contributor obtains such knowledge after the
-Modification is made available as described in Section 3.2, Contributor shall
-promptly modify the LEGAL file in all copies Contributor makes available
-thereafter and shall take other steps (such as notifying appropriate mailing
-lists or newsgroups) reasonably calculated to inform those who received the
-Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Contributor's Modifications include an application programming
-interface and Contributor has knowledge of patent licenses which are
-reasonably necessary to implement that API, Contributor must also include this
-information in the LEGAL file.
-             
-                (c)    Representations.
-            Contributor represents that, except as disclosed pursuant to
-Section 3.4(a) above, Contributor believes that Contributor's Modifications
-are Contributor's original creation(s) and/or Contributor has sufficient
-rights to grant the rights conveyed by this License.
-
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source
-Code.  If it is not possible to put such notice in a particular Source Code
-file due to its structure, then You must include such notice in a location
-(such as a relevant directory) where a user would be likely to look for such a
-notice.  If You created one or more Modification(s) You may add your name as a
-Contributor to the notice described in Exhibit A.  You must also duplicate
-this License in any documentation for the Source Code where You describe
-recipients' rights or ownership rights relating to Covered Code.  You may
-choose to offer, and to charge a fee for, warranty, support, indemnity or
-liability obligations to one or more recipients of Covered Code. However, You
-may do so only on Your own behalf, and not on behalf of the Initial Developer
-or any Contributor. You must make it absolutely clear than any such warranty,
-support, indemnity or liability obligation is offered by You alone, and You
-hereby agree to indemnify the Initial Developer and every Contributor for any
-liability incurred by the Initial Developer or such Contributor as a result of
-warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the
-requirements of Section 3.1-3.5 have been met for that Covered Code, and if
-You include a notice stating that the Source Code version of the Covered Code
-is available under the terms of this License, including a description of how
-and where You have fulfilled the obligations of Section 3.2. The notice must
-be conspicuously included in any notice in an Executable version, related
-documentation or collateral in which You describe recipients' rights relating
-to the Covered Code. You may distribute the Executable version of Covered Code
-or ownership rights under a license of Your choice, which may contain terms
-different from this License, provided that You are in compliance with the
-terms of this License and that the license for the Executable version does not
-attempt to limit or alter the recipient's rights in the Source Code version
-from the rights set forth in this License. If You distribute the Executable
-version under a different license You must make it absolutely clear that any
-terms which differ from this License are offered by You alone, not by the
-Initial Developer or any Contributor. You hereby agree to indemnify the
-Initial Developer and every Contributor for any liability incurred by the
-Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code
-not governed by the terms of this License and distribute the Larger Work as a
-single product. In such a case, You must make sure the requirements of this
-License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Code due to statute,
-judicial order, or regulation then You must: (a) comply with the terms of this
-License to the maximum extent possible; and (b) describe the limitations and
-the code they affect. Such description must be included in the LEGAL file
-described in Section 3.4 and must be included with all distributions of the
-Source Code. Except to the extent prohibited by statute or regulation, such
-description must be sufficiently detailed for a recipient of ordinary skill to
-be able to understand it.
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached
-the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation ("Netscape") may publish revised
-and/or new versions of the License from time to time. Each version will be
-given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the
-License, You may always continue to use it under the terms of that version.
-You may also choose to use such Covered Code under the terms of any subsequent
-version of the License published by Netscape. No one other than Netscape has
-the right to modify the terms applicable to Covered Code created under this
-License.
-
-      6.3. Derivative Works.
-      If You create or use a modified version of this License (which you may
-only do in order to apply it to code which is not already Covered Code
-governed by this License), You must (a) rename Your license so that the
-phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" or
-any confusingly similar phrase do not appear in your license (except to note
-that your license differs from this License) and (b) otherwise make it clear
-that Your version of the license contains terms which differ from the Mozilla
-Public License and Netscape Public License. (Filling in the name of the
-Initial Developer, Original Code or Contributor in the notice described in
-Exhibit A shall not of themselves be deemed to be modifications of this
-License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,
-FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
-QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED
-CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
-OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
-CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-DISCLAIMER.
-
-8. TERMINATION.
-
-      8.1.  This License and the rights granted hereunder will terminate
-automatically if You fail to comply with terms herein and fail to cure such
-breach within 30 days of becoming aware of the breach. All sublicenses to the
-Covered Code which are properly granted shall survive any termination of this
-License. Provisions which, by their nature, must remain in effect beyond the
-termination of this License shall survive.
-
-      8.2.  If You initiate litigation by asserting a patent infringement
-claim (excluding declatory judgment actions) against Initial Developer or a
-Contributor (the Initial Developer or Contributor against whom You file such
-action is referred to as "Participant")  alleging that:
-
-      (a)  such Participant's Contributor Version directly or indirectly
-infringes any patent, then any and all rights granted by such Participant to
-You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
-from Participant terminate prospectively, unless if within 60 days after
-receipt of notice You either: (i)  agree in writing to pay Participant a
-mutually agreeable reasonable royalty for Your past and future use of
-Modifications made by such Participant, or (ii) withdraw Your litigation claim
-with respect to the Contributor Version against such Participant.  If within
-60 days of notice, a reasonable royalty and payment arrangement are not
-mutually agreed upon in writing by the parties or the litigation claim is not
-withdrawn, the rights granted by Participant to You under Sections 2.1 and/or
-2.2 automatically terminate at the expiration of the 60 day notice period
-specified above.
-
-      (b)  any software, hardware, or device, other than such Participant's
-Contributor Version, directly or indirectly infringes any patent, then any
-rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are
-revoked effective as of the date You first made, used, sold, distributed, or
-had made, Modifications made by that Participant.
-
-      8.3.  If You assert a patent infringement claim against Participant
-alleging that such Participant's Contributor Version directly or indirectly
-infringes any patent where such claim is resolved (such as by license or
-settlement) prior to the initiation of patent infringement litigation, then
-the reasonable value of the licenses granted by such Participant under
-Sections 2.1 or 2.2 shall be taken into account in determining the amount or
-value of any payment or license.
-
-      8.4.  In the event of termination under Sections 8.1 or 8.2 above,  all
-end user license agreements (excluding distributors and resellers) which have
-been validly granted by You or any distributor hereunder prior to termination
-shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY
-SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
-SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
-FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
-EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
-DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH
-OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
-EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a "commercial item," as that term is defined in 48
-C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and
-"commercial computer software documentation," as such terms are used in 48
-C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
-227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
-acquire Covered Code with only those rights set forth herein.
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter
-hereof. If any provision of this License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to make it
-enforceable. This License shall be governed by California law provisions
-(except to the extent applicable law, if any, provides otherwise), excluding
-its conflict-of-law provisions. With respect to disputes in which at least one
-party is a citizen of, or an entity chartered or registered to do business in
-the United States of America, any litigation relating to this License shall be
-subject to the jurisdiction of the Federal Courts of the Northern District of
-California, with venue lying in Santa Clara County, California, with the
-losing party responsible for costs, including without limitation, court costs
-and reasonable attorneys' fees and expenses. The application of the United
-Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation which provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-responsible for claims and damages arising, directly or indirectly, out of its
-utilization of rights under this License and You agree to work with Initial
-Developer and Contributors to distribute such responsibility on an equitable
-basis. Nothing herein is intended or shall be deemed to constitute any
-admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-      Initial Developer may designate portions of the Covered Code as
-Multiple-Licensed.  Multiple-Licensed means that the Initial Developer permits
-you to utilize portions of the Covered Code under Your choice of the MPL or
-the alternative licenses, if any, specified by the Initial Developer in the
-file described in Exhibit A.
-
-
-EXHIBIT A -Mozilla Public License.
-
-      ``The contents of this file are subject to the Mozilla Public License
-Version 1.1 (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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF
-      ANY KIND, either express or implied. See the License for the specific
-language governing rights and
-      limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________.
-Portions created by
-       ______________________ are Copyright (C) ______
-_______________________. All Rights
-      Reserved.
-
-      Contributor(s): ______________________________________.
-
-      Alternatively, the contents of this file may be used under the terms of
-the _____ license (the  [___] License), in which case the provisions of
-[______] License are applicable  instead of those above.  If you wish to allow
-use of your version of this file only under the terms of the [____] License
-and not to allow others to use your version of this file under the MPL,
-indicate your decision by deleting  the provisions above and replace  them
-with the notice and other provisions required by the [___] License.  If you do
-not delete the provisions above, a recipient may use your version of this file
-under either the MPL or the [___] License."
-
-      [NOTE: The text of this Exhibit A may differ slightly from the text of
-the notices in the Source Code files of the Original Code. You should use the
-text of this Exhibit A rather than the text found in the Original Code Source
-Code for Your Modifications.]
-
-
-===============================================================================
-
-For the JAX-WS Reference Implementation component:
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
diff --git a/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/NOTICE b/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index d48810c0ec..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,18 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Tuscany distribution.                  ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-This product also includes software developed by:
-- the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-- the Celtix project (http://celtix.objectweb.org/)
-- the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-- the GlassFish JAX-WS project (https://jax-ws.dev.java.net/)
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
diff --git a/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/README.txt b/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects. 
-
-While incubation status is not necessarily a reflection of the completeness or 
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list 
-or in the JIRA issue tracker.
-
-Mailing list subscription:
-    tuscany-dev-subscribe@ws.apache.org
-
-Jira:
-    http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team. 
-
diff --git a/branches/sca-java-M2/sca/tools/src/main/resources/RemotableInterfaceTemplate.xsl b/branches/sca-java-M2/sca/tools/src/main/resources/RemotableInterfaceTemplate.xsl
deleted file mode 100644
index e3da5da20f..0000000000
--- a/branches/sca-java-M2/sca/tools/src/main/resources/RemotableInterfaceTemplate.xsl
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-    <xsl:output method="text"/>

-

-     <!-- import the databinding template-->

-    <xsl:include href="databindsupporter"/>

-    <!-- import the other templates for databinding

-         Note  -  these names would be handled by a special

-         URI resolver during the xslt transformations

-     -->

-    <xsl:include href="externalTemplate"/>

-

-

-    <xsl:template match="/interface">

-    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>

-    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>

-    <xsl:variable name="callbackname"><xsl:value-of select="@callbackname"/></xsl:variable>

-    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>

-

-    /**

-     * <xsl:value-of select="@name"/>.java

-     *

-     * This file was auto-generated from WSDL

-     * by the Apache Axis2 version: #axisVersion# #today#

-     */

-    package <xsl:value-of select="$package"/>;

-

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

-    import org.apache.tuscany.api.annotation.DataType;

-    

-    /*

-     *  <xsl:value-of select="@name"/> java interface

-     */

-

-    @Remotable

-    @DataType(name="commonj.sdo.DataObject")

-    public interface <xsl:value-of select="@name"></xsl:value-of> {

-          <xsl:for-each select="method">

-            <!-- Code for in-out mep -->

-         <xsl:if test="@mep='12'">

-         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>

-

-        <!-- start of the sync block -->                                          

-         <xsl:if test="$isSync='1'">

-        /**

-         * Auto generated method signatures

-         <xsl:for-each select="input/param[@type!='']">* @param <xsl:value-of select="@name"></xsl:value-of></xsl:for-each>

-         */

-         public <xsl:choose><xsl:when test="$outputtype=''">void</xsl:when><xsl:otherwise><xsl:value-of select="$outputtype"/></xsl:otherwise></xsl:choose>

-        <xsl:text> </xsl:text><xsl:value-of select="@name"/>(

-         <xsl:for-each select="input/param[@type!='']">

-            <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>

-          </xsl:for-each>) throws java.rmi.RemoteException;

-        <!-- end of the sync block -->

-        </xsl:if>

-

-       <!-- start of the async block -->

-        <xsl:if test="$isAsync='1'">

-         /**

-          * Auto generated method signature

-          <xsl:for-each select="input/param"><xsl:if test="@type!=''">* @param <xsl:value-of select="@name"></xsl:value-of></xsl:if></xsl:for-each>

-          */

-

-        public void start<xsl:value-of select="@name"/>(

-         <xsl:variable name="paramCount"><xsl:value-of select="count(input/param[@type!=''])"></xsl:value-of></xsl:variable>

-               <xsl:for-each select="input/param">

-            <xsl:if test="@type!=''"><xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"></xsl:value-of></xsl:if></xsl:for-each>

-           <xsl:if test="$paramCount>0">,</xsl:if>final <xsl:value-of select="$package"/>.<xsl:value-of select="$callbackname"/> callback) throws java.rmi.RemoteException;

-        </xsl:if>

-<!-- end of async block-->

-

-     </xsl:if>

-        <!-- Code for in-only mep -->

-       <xsl:if test="@mep='10'">

-

-       <!-- For in-only meps there would not be any asynchronous methods since there is no output -->

-         /**

-         * Auto generated method signature

-         <xsl:for-each select="input/param">

-         <xsl:if test="@type!=''">*@param <xsl:value-of select="@name"></xsl:value-of><xsl:text>

-         </xsl:text></xsl:if></xsl:for-each>

-         */

-         public  void

-        <xsl:text> </xsl:text><xsl:value-of select="@name"/>(

-         <xsl:for-each select="input/param">

-            <xsl:if test="@type!=''"><xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>

-            </xsl:if>

-         </xsl:for-each>) throws java.rmi.RemoteException;

-

-        </xsl:if>

-       </xsl:for-each>

-

-       <!-- Apply other templates --> 

-       //<xsl:apply-templates/>

-       }

-

-

-    </xsl:template>

-   </xsl:stylesheet>
\ No newline at end of file
diff --git a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
deleted file mode 100644
index e679496509..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
deleted file mode 100644
index 4b5a795f2c..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
deleted file mode 100644
index a72321c9b1..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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
-	 */
-	protected void setUp() throws Exception {
-		// System.out.println("inside setup");
-		super.setUp();
-	}
-
-	/**
-	 * @exception Exception
-	 */
-	protected void tearDown() throws Exception {
-		// System.out.println("inside tearDown");
-		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 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/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
deleted file mode 100644
index 84d59164ee..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
deleted file mode 100644
index a28399e7fe..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.java2wsdl.generate.customer;
-
-public class Customer {
-	private String name = "";
-
-	public int custType = 0;
-
-	public String getName() {
-		return name;
-	}
-}
-  
diff --git a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
deleted file mode 100644
index afc68a3217..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.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/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
deleted file mode 100644
index c3467cbabc..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.tools.wsdl2java.generate;
-
-import junit.framework.TestCase;
-
-/**
- * Test case for WSDL2Java
- */
-public class WSDL2JavaGeneratorTestCase extends TestCase {
-
-    public void testAccountService() {
-        
-        String basedir = System.getProperty("basedir");
-        if (basedir == null)
-            basedir =".";
-        
-        
-        String[] args=new String[] { "-targetDirectory", basedir + "/target/wsdl2java-source",
-                "-javaPackage", "org.apache.tuscany.tools.wsdl2java.generate.account",
-                basedir + "/src/test/resources/AccountService.wsdl"};
-
-        WSDL2JavaGenerator.main(args);
-        
-    }
-    
-    
-}
diff --git a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/CreditReport.java b/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/CreditReport.java
deleted file mode 100644
index 7986ead297..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/CreditReport.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.example.creditscore.doclit;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Credit Report</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.example.creditscore.doclit.CreditReport#getScore <em>Score</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CreditReport extends DataObjectImpl
-{
-  /**
-   * The default value of the '{@link #getScore() <em>Score</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getScore()
-   * @generated
-   * @ordered
-   */
-  protected static final int SCORE_EDEFAULT = 0;
-
-  /**
-   * The cached value of the '{@link #getScore() <em>Score</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getScore()
-   * @generated
-   * @ordered
-   */
-  protected int score = SCORE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected CreditReport()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return DoclitPackage.Literals.CREDIT_REPORT;
-  }
-
-  /**
-   * Returns the value of the '<em><b>Score</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Score</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Score</em>' attribute.
-   * @see #setScore(int)
-   * @generated
-   */
-  public int getScore()
-  {
-    return score;
-  }
-
-  /**
-   * Sets the value of the '{@link org.example.creditscore.doclit.CreditReport#getScore <em>Score</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Score</em>' attribute.
-   * @see #getScore()
-   * @generated
-   */
-  public void setScore(int newScore)
-  {
-    score = newScore;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CREDIT_REPORT__SCORE:
-        return new Integer(getScore());
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CREDIT_REPORT__SCORE:
-        setScore(((Integer)newValue).intValue());
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CREDIT_REPORT__SCORE:
-        setScore(SCORE_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CREDIT_REPORT__SCORE:
-        return score != SCORE_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (score: ");
-    result.append(score);
-    result.append(')');
-    return result.toString();
-  }
-
-} // CreditReport
\ No newline at end of file
diff --git a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/Customer.java b/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/Customer.java
deleted file mode 100644
index 31ad797544..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/Customer.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.example.creditscore.doclit;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Customer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.example.creditscore.doclit.Customer#getSsn <em>Ssn</em>}</li>
- *   <li>{@link org.example.creditscore.doclit.Customer#getFirstName <em>First Name</em>}</li>
- *   <li>{@link org.example.creditscore.doclit.Customer#getLastName <em>Last Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Customer extends DataObjectImpl
-{
-  /**
-   * The default value of the '{@link #getSsn() <em>Ssn</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSsn()
-   * @generated
-   * @ordered
-   */
-  protected static final String SSN_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getSsn() <em>Ssn</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSsn()
-   * @generated
-   * @ordered
-   */
-  protected String ssn = SSN_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFirstName()
-   * @generated
-   * @ordered
-   */
-  protected static final String FIRST_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFirstName()
-   * @generated
-   * @ordered
-   */
-  protected String firstName = FIRST_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLastName()
-   * @generated
-   * @ordered
-   */
-  protected static final String LAST_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLastName()
-   * @generated
-   * @ordered
-   */
-  protected String lastName = LAST_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected Customer()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return DoclitPackage.Literals.CUSTOMER;
-  }
-
-  /**
-   * Returns the value of the '<em><b>Ssn</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Ssn</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Ssn</em>' attribute.
-   * @see #setSsn(String)
-   * @generated
-   */
-  public String getSsn()
-  {
-    return ssn;
-  }
-
-  /**
-   * Sets the value of the '{@link org.example.creditscore.doclit.Customer#getSsn <em>Ssn</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Ssn</em>' attribute.
-   * @see #getSsn()
-   * @generated
-   */
-  public void setSsn(String newSsn)
-  {
-    ssn = newSsn;
-  }
-
-  /**
-   * Returns the value of the '<em><b>First Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>First Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>First Name</em>' attribute.
-   * @see #setFirstName(String)
-   * @generated
-   */
-  public String getFirstName()
-  {
-    return firstName;
-  }
-
-  /**
-   * Sets the value of the '{@link org.example.creditscore.doclit.Customer#getFirstName <em>First Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>First Name</em>' attribute.
-   * @see #getFirstName()
-   * @generated
-   */
-  public void setFirstName(String newFirstName)
-  {
-    firstName = newFirstName;
-  }
-
-  /**
-   * Returns the value of the '<em><b>Last Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Last Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Last Name</em>' attribute.
-   * @see #setLastName(String)
-   * @generated
-   */
-  public String getLastName()
-  {
-    return lastName;
-  }
-
-  /**
-   * Sets the value of the '{@link org.example.creditscore.doclit.Customer#getLastName <em>Last Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Last Name</em>' attribute.
-   * @see #getLastName()
-   * @generated
-   */
-  public void setLastName(String newLastName)
-  {
-    lastName = newLastName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CUSTOMER__SSN:
-        return getSsn();
-      case DoclitPackage.CUSTOMER__FIRST_NAME:
-        return getFirstName();
-      case DoclitPackage.CUSTOMER__LAST_NAME:
-        return getLastName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CUSTOMER__SSN:
-        setSsn((String)newValue);
-        return;
-      case DoclitPackage.CUSTOMER__FIRST_NAME:
-        setFirstName((String)newValue);
-        return;
-      case DoclitPackage.CUSTOMER__LAST_NAME:
-        setLastName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CUSTOMER__SSN:
-        setSsn(SSN_EDEFAULT);
-        return;
-      case DoclitPackage.CUSTOMER__FIRST_NAME:
-        setFirstName(FIRST_NAME_EDEFAULT);
-        return;
-      case DoclitPackage.CUSTOMER__LAST_NAME:
-        setLastName(LAST_NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case DoclitPackage.CUSTOMER__SSN:
-        return SSN_EDEFAULT == null ? ssn != null : !SSN_EDEFAULT.equals(ssn);
-      case DoclitPackage.CUSTOMER__FIRST_NAME:
-        return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName);
-      case DoclitPackage.CUSTOMER__LAST_NAME:
-        return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (ssn: ");
-    result.append(ssn);
-    result.append(", firstName: ");
-    result.append(firstName);
-    result.append(", lastName: ");
-    result.append(lastName);
-    result.append(')');
-    return result.toString();
-  }
-
-} // Customer
\ No newline at end of file
diff --git a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/DoclitFactory.java b/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/DoclitFactory.java
deleted file mode 100644
index 9ba9ac4a82..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/DoclitFactory.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.example.creditscore.doclit;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DoclitFactory extends EFactoryImpl
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final DoclitFactory eINSTANCE = init();
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final DoclitFactory INSTANCE = org.example.creditscore.doclit.DoclitFactory.eINSTANCE;
-
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static DoclitFactory init()
-  {
-    try
-    {
-      DoclitFactory theDoclitFactory = (DoclitFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.example.org/creditscore/doclit/"); 
-      if (theDoclitFactory != null)
-      {
-        return theDoclitFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new DoclitFactory();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DoclitFactory()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case DoclitPackage.CREDIT_REPORT: return (EObject)createCreditReport();
-      case DoclitPackage.CUSTOMER: return (EObject)createCustomer();
-      case DoclitPackage.DOCUMENT_ROOT: return (EObject)createDocumentRoot();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public CreditReport createCreditReport()
-  {
-    CreditReport creditReport = new CreditReport();
-    return creditReport;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Customer createCustomer()
-  {
-    Customer customer = new Customer();
-    return customer;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject createDocumentRoot()
-  {
-    EObject documentRoot = super.create(DoclitPackage.Literals.DOCUMENT_ROOT);
-    return documentRoot;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DoclitPackage getDoclitPackage()
-  {
-    return (DoclitPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  public static DoclitPackage getPackage()
-  {
-    return DoclitPackage.eINSTANCE;
-  }
-
-} //DoclitFactory
diff --git a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/DoclitPackage.java b/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/DoclitPackage.java
deleted file mode 100644
index 1e1972d1e0..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/example/creditscore/doclit/DoclitPackage.java
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.example.creditscore.doclit;
-
-import org.apache.tuscany.sdo.impl.SDOPackageImpl;
-
-import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.example.creditscore.doclit.DoclitFactory
- * @generated
- */
-public class DoclitPackage extends EPackageImpl
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String eNAME = "doclit";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String eNS_URI = "http://www.example.org/creditscore/doclit/";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String eNS_PREFIX = "doclit";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final DoclitPackage eINSTANCE = org.example.creditscore.doclit.DoclitPackage.init();
-
-  /**
-   * The meta object id for the '{@link org.example.creditscore.doclit.CreditReport <em>Credit Report</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.example.creditscore.doclit.CreditReport
-   * @see org.example.creditscore.doclit.DoclitPackage#getCreditReport()
-   * @generated
-   */
-  public static final int CREDIT_REPORT = 0;
-
-  /**
-   * The feature id for the '<em><b>Score</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int CREDIT_REPORT__SCORE = 0;
-
-  /**
-   * The number of structural features of the '<em>Credit Report</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int CREDIT_REPORT_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.example.creditscore.doclit.Customer <em>Customer</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.example.creditscore.doclit.Customer
-   * @see org.example.creditscore.doclit.DoclitPackage#getCustomer()
-   * @generated
-   */
-  public static final int CUSTOMER = 1;
-
-  /**
-   * The feature id for the '<em><b>Ssn</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int CUSTOMER__SSN = 0;
-
-  /**
-   * The feature id for the '<em><b>First Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int CUSTOMER__FIRST_NAME = 1;
-
-  /**
-   * The feature id for the '<em><b>Last Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int CUSTOMER__LAST_NAME = 2;
-
-  /**
-   * The number of structural features of the '<em>Customer</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int CUSTOMER_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.example.creditscore.doclit.DocumentRoot <em>Document Root</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.example.creditscore.doclit.DocumentRoot
-   * @see org.example.creditscore.doclit.DoclitPackage#getDocumentRoot()
-   * @generated
-   */
-  public static final int DOCUMENT_ROOT = 2;
-
-  /**
-   * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__MIXED = 0;
-
-  /**
-   * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-  /**
-   * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-  /**
-   * The feature id for the '<em><b>Get Credit Score Request</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__GET_CREDIT_SCORE_REQUEST = 3;
-
-  /**
-   * The feature id for the '<em><b>Get Credit Score Response</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__GET_CREDIT_SCORE_RESPONSE = 4;
-
-  /**
-   * The number of structural features of the '<em>Document Root</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT_FEATURE_COUNT = 5;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass creditReportEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass customerEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass documentRootEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.example.creditscore.doclit.DoclitPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private DoclitPackage()
-  {
-    super(eNS_URI, ((EFactory)DoclitFactory.INSTANCE));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static DoclitPackage init()
-  {
-    if (isInited) return (DoclitPackage)EPackage.Registry.INSTANCE.getEPackage(DoclitPackage.eNS_URI);
-
-    // Obtain or create and register package
-    DoclitPackage theDoclitPackage = (DoclitPackage)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DoclitPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DoclitPackage());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    SDOPackageImpl.eINSTANCE.eClass();
-    ModelPackageImpl.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theDoclitPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theDoclitPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theDoclitPackage.freeze();
-
-    return theDoclitPackage;
-  }
-
-
-  /**
-   * Returns the meta object for class '{@link org.example.creditscore.doclit.CreditReport <em>Credit Report</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Credit Report</em>'.
-   * @see org.example.creditscore.doclit.CreditReport
-   * @generated
-   */
-  public EClass getCreditReport()
-  {
-    return creditReportEClass;
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link org.example.creditscore.doclit.CreditReport#getScore <em>Score</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Score</em>'.
-   * @see org.example.creditscore.doclit.CreditReport#getScore()
-   * @see #getCreditReport()
-   * @generated
-   */
-  public EAttribute getCreditReport_Score()
-  {
-    return (EAttribute)creditReportEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * Returns the meta object for class '{@link org.example.creditscore.doclit.Customer <em>Customer</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Customer</em>'.
-   * @see org.example.creditscore.doclit.Customer
-   * @generated
-   */
-  public EClass getCustomer()
-  {
-    return customerEClass;
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link org.example.creditscore.doclit.Customer#getSsn <em>Ssn</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Ssn</em>'.
-   * @see org.example.creditscore.doclit.Customer#getSsn()
-   * @see #getCustomer()
-   * @generated
-   */
-  public EAttribute getCustomer_Ssn()
-  {
-    return (EAttribute)customerEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link org.example.creditscore.doclit.Customer#getFirstName <em>First Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>First Name</em>'.
-   * @see org.example.creditscore.doclit.Customer#getFirstName()
-   * @see #getCustomer()
-   * @generated
-   */
-  public EAttribute getCustomer_FirstName()
-  {
-    return (EAttribute)customerEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link org.example.creditscore.doclit.Customer#getLastName <em>Last Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Last Name</em>'.
-   * @see org.example.creditscore.doclit.Customer#getLastName()
-   * @see #getCustomer()
-   * @generated
-   */
-  public EAttribute getCustomer_LastName()
-  {
-    return (EAttribute)customerEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.ecore.EObject <em>Document Root</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Document Root</em>'.
-   * @see org.eclipse.emf.ecore.EObject
-   * @generated
-   */
-  public EClass getDocumentRoot()
-  {
-    return documentRootEClass;
-  }
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.ecore.EObject#getMixed <em>Mixed</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Mixed</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getMixed()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EAttribute getDocumentRoot_Mixed()
-  {
-    return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * Returns the meta object for the map '{@link org.eclipse.emf.ecore.EObject#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getXMLNSPrefixMap()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EReference getDocumentRoot_XMLNSPrefixMap()
-  {
-    return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * Returns the meta object for the map '{@link org.eclipse.emf.ecore.EObject#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the map '<em>XSI Schema Location</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getXSISchemaLocation()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EReference getDocumentRoot_XSISchemaLocation()
-  {
-    return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.emf.ecore.EObject#getGetCreditScoreRequest <em>Get Credit Score Request</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Get Credit Score Request</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getGetCreditScoreRequest()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EReference getDocumentRoot_GetCreditScoreRequest()
-  {
-    return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.emf.ecore.EObject#getGetCreditScoreResponse <em>Get Credit Score Response</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Get Credit Score Response</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getGetCreditScoreResponse()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EReference getDocumentRoot_GetCreditScoreResponse()
-  {
-    return (EReference)documentRootEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  public DoclitFactory getDoclitFactory()
-  {
-    return (DoclitFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    creditReportEClass = createEClass(CREDIT_REPORT);
-    createEAttribute(creditReportEClass, CREDIT_REPORT__SCORE);
-
-    customerEClass = createEClass(CUSTOMER);
-    createEAttribute(customerEClass, CUSTOMER__SSN);
-    createEAttribute(customerEClass, CUSTOMER__FIRST_NAME);
-    createEAttribute(customerEClass, CUSTOMER__LAST_NAME);
-
-    documentRootEClass = createEClass(DOCUMENT_ROOT);
-    createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__GET_CREDIT_SCORE_REQUEST);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__GET_CREDIT_SCORE_RESPONSE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    ModelPackageImpl theModelPackageImpl = (ModelPackageImpl)EPackage.Registry.INSTANCE.getEPackage(ModelPackageImpl.eNS_URI);
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(creditReportEClass, CreditReport.class, "CreditReport", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCreditReport_Score(), theModelPackageImpl.getInt(), "score", null, 1, 1, CreditReport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCustomer_Ssn(), theModelPackageImpl.getString(), "ssn", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCustomer_FirstName(), theModelPackageImpl.getString(), "firstName", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCustomer_LastName(), theModelPackageImpl.getString(), "lastName", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(documentRootEClass, null, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDocumentRoot_GetCreditScoreRequest(), this.getCustomer(), null, "getCreditScoreRequest", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-    initEReference(getDocumentRoot_GetCreditScoreResponse(), this.getCreditReport(), null, "getCreditScoreResponse", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-
-    // Create annotations
-    // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-    createExtendedMetaDataAnnotations();
-  }
-
-  /**
-   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void createExtendedMetaDataAnnotations()
-  {
-    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
-    addAnnotation
-      (creditReportEClass, 
-       source, 
-       new String[] 
-       {
-       "name", "CreditReport",
-       "kind", "elementOnly"
-       });		
-    addAnnotation
-      (getCreditReport_Score(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "score"
-       });		
-    addAnnotation
-      (customerEClass, 
-       source, 
-       new String[] 
-       {
-       "name", "Customer",
-       "kind", "elementOnly"
-       });		
-    addAnnotation
-      (getCustomer_Ssn(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "ssn"
-       });		
-    addAnnotation
-      (getCustomer_FirstName(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "firstName"
-       });		
-    addAnnotation
-      (getCustomer_LastName(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "lastName"
-       });		
-    addAnnotation
-      (documentRootEClass, 
-       source, 
-       new String[] 
-       {
-       "name", "",
-       "kind", "mixed"
-       });		
-    addAnnotation
-      (getDocumentRoot_Mixed(), 
-       source, 
-       new String[] 
-       {
-       "kind", "elementWildcard",
-       "name", ":mixed"
-       });		
-    addAnnotation
-      (getDocumentRoot_XMLNSPrefixMap(), 
-       source, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xmlns:prefix"
-       });		
-    addAnnotation
-      (getDocumentRoot_XSISchemaLocation(), 
-       source, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xsi:schemaLocation"
-       });		
-    addAnnotation
-      (getDocumentRoot_GetCreditScoreRequest(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "getCreditScoreRequest",
-       "namespace", "##targetNamespace"
-       });		
-    addAnnotation
-      (getDocumentRoot_GetCreditScoreResponse(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "getCreditScoreResponse",
-       "namespace", "##targetNamespace"
-       });
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.example.creditscore.doclit.CreditReport <em>Credit Report</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.example.creditscore.doclit.CreditReport
-     * @see org.example.creditscore.doclit.DoclitPackage#getCreditReport()
-     * @generated
-     */
-    public static final EClass CREDIT_REPORT = eINSTANCE.getCreditReport();
-
-    /**
-     * The meta object literal for the '<em><b>Score</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute CREDIT_REPORT__SCORE = eINSTANCE.getCreditReport_Score();
-
-    /**
-     * The meta object literal for the '{@link org.example.creditscore.doclit.Customer <em>Customer</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.example.creditscore.doclit.Customer
-     * @see org.example.creditscore.doclit.DoclitPackage#getCustomer()
-     * @generated
-     */
-    public static final EClass CUSTOMER = eINSTANCE.getCustomer();
-
-    /**
-     * The meta object literal for the '<em><b>Ssn</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute CUSTOMER__SSN = eINSTANCE.getCustomer_Ssn();
-
-    /**
-     * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute CUSTOMER__FIRST_NAME = eINSTANCE.getCustomer_FirstName();
-
-    /**
-     * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute CUSTOMER__LAST_NAME = eINSTANCE.getCustomer_LastName();
-
-    /**
-     * The meta object literal for the '{@link org.example.creditscore.doclit.DocumentRoot <em>Document Root</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.example.creditscore.doclit.DocumentRoot
-     * @see org.example.creditscore.doclit.DoclitPackage#getDocumentRoot()
-     * @generated
-     */
-    public static final EClass DOCUMENT_ROOT = eINSTANCE.getDocumentRoot();
-
-    /**
-     * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute DOCUMENT_ROOT__MIXED = eINSTANCE.getDocumentRoot_Mixed();
-
-    /**
-     * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference DOCUMENT_ROOT__XMLNS_PREFIX_MAP = eINSTANCE.getDocumentRoot_XMLNSPrefixMap();
-
-    /**
-     * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getDocumentRoot_XSISchemaLocation();
-
-    /**
-     * The meta object literal for the '<em><b>Get Credit Score Request</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference DOCUMENT_ROOT__GET_CREDIT_SCORE_REQUEST = eINSTANCE.getDocumentRoot_GetCreditScoreRequest();
-
-    /**
-     * The meta object literal for the '<em><b>Get Credit Score Response</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference DOCUMENT_ROOT__GET_CREDIT_SCORE_RESPONSE = eINSTANCE.getDocumentRoot_GetCreditScoreResponse();
-
-  }
-
-} //DoclitPackage
diff --git a/branches/sca-java-M2/sca/tools/src/test/java/org/soapinterop/CreditScoreDocLit.java b/branches/sca-java-M2/sca/tools/src/test/java/org/soapinterop/CreditScoreDocLit.java
deleted file mode 100644
index e9e8aa882a..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.soapinterop;
-
-public interface CreditScoreDocLit {
-    public org.example.creditscore.doclit.CreditReport getCreditScore(
-       org.example.creditscore.doclit.Customer param0) throws java.rmi.RemoteException;
-   }
-
diff --git a/branches/sca-java-M2/sca/tools/src/test/resources/AccountService.wsdl b/branches/sca-java-M2/sca/tools/src/test/resources/AccountService.wsdl
deleted file mode 100644
index e7be3ce5ba..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/resources/AccountService.wsdl
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- -->

-<wsdl:definitions 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:8080/sample-account/services/AccountService"/>

-        </wsdl:port>

-    </wsdl:service>

-</wsdl:definitions>

diff --git a/branches/sca-java-M2/sca/tools/src/test/resources/helloworld.wsdl b/branches/sca-java-M2/sca/tools/src/test/resources/helloworld.wsdl
deleted file mode 100644
index 051f604bb2..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/resources/helloworld.wsdl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<wsdl:definitions targetNamespace="http://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/branches/sca-java-M2/sca/tools/src/test/resources/interopdoc.wsdl b/branches/sca-java-M2/sca/tools/src/test/resources/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/resources/interopdoc.wsdl
+++ /dev/null
@@ -1,180 +0,0 @@
-<?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/branches/sca-java-M2/sca/tools/src/test/resources/sequences.xsd b/branches/sca-java-M2/sca/tools/src/test/resources/sequences.xsd
deleted file mode 100644
index a565f3fa65..0000000000
--- a/branches/sca-java-M2/sca/tools/src/test/resources/sequences.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<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>